Merge branch 'main' into python_packaging

.github/workflows/main.yml

@@ -47,18 +47,12 @@ jobs:
           cmake_config: -DMATERIALX_BUILD_SHARED_LIBS=ON
           static_analysis: ON
 
-        - name: Linux_Clang_13_Python39
-          os: ubuntu-22.04
-          compiler: clang
-          compiler_version: "13"
-          python: 3.9
-          test_render: ON
-
         - name: Linux_Clang_14_Python311
           os: ubuntu-22.04
           compiler: clang
           compiler_version: "14"
           python: 3.11
+          test_render: ON
           clang_format: ON
 
         - name: Linux_Clang_14_DynamicAnalysis

CMakeLists.txt

@@ -124,6 +124,7 @@ mark_as_advanced(MATERIALX_NAMESPACE_SUFFIX)
 mark_as_advanced(MATERIALX_LIBNAME_SUFFIX)
 mark_as_advanced(MATERIALX_PYTHON_LTO)
 mark_as_advanced(MATERIALX_INSTALL_PYTHON)
+mark_as_advanced(MATERIALX_INSTALL_RESOURCES)
 mark_as_advanced(MATERIALX_TEST_RENDER)
 mark_as_advanced(MATERIALX_WARNINGS_AS_ERRORS)
 mark_as_advanced(MATERIALX_DYNAMIC_ANALYSIS)

documents/Specification/MaterialX.Specification.md

@@ -656,6 +656,7 @@ Standard Texture nodes:
 <a id="node-image"> </a>
 
 * **`image`**: samples data from a single image, or from a layer within a multi-layer image.  When used in the context of rendering a geometry, the image is mapped onto the geometry based on geometry UV coordinates, with the lower-left corner of an image mapping to the (0,0) UV coordinate (or to the fractional (0,0) UV coordinate for tiled images).
+The type of the &lt;image> node determines the number of channels output, which may be less than the number of channels in the image file, outputting the first N channels from the image file.  So a `float` &lt;image> would return the Red channel of an RGB image, and a `color3` &lt;image> would return the RGB channels of an RGBA image.
     * `file` (uniform filename): the URI of an image file.  The filename can include one or more substitutions to change the file name (including frame number) that is accessed, as described in the [Filename Substitutions](#filename-substitutions) section above.
     * `layer` (uniform string): the name of the layer to extract from a multi-layer input file.  If no value for `layer` is provided and the input file has multiple layers, then the "default" layer will be used, or "rgba" if there is no "default" layer.  Note: the number of channels defined by the `type` of the `<image>` must match the number of channels in the named layer.
     * `default` (float or color<em>N</em> or vector<em>N</em>): a default value to use if the `file` reference can not be resolved (e.g. if a &lt;_geometry token_>, [_interface token_] or {_hostattr_} is included in the filename but no substitution value or default is defined, or if the resolved `file` URI cannot be read), or if the specified `layer` does not exist in the file.  The `default` value must be the same type as the `<image>` element itself.  If `default` is not defined, the default color value will be 0.0 in all channels.
@@ -2369,7 +2370,7 @@ An input with a shader-semantic type may be given a value of "" to indicate no s
 
 The Standard MaterialX Library defines the following nodes and node variants operating on "shader"-semantic types.  Standard library shaders do not respond to external illumination; please refer to the [**MaterialX Physically Based Shading Nodes**](./MaterialX.PBRSpec.md#materialx-pbs-library) document for definitions of additional nodes and shader constructors which do respond to illumination.
 
-<a id="node-surfaceunlit"> </a>
+<a id="node-surface-unlit"> </a>
 
 * **`surface_unlit`**: an unlit surface shader node, representing a surface that can emit and transmit light, but does not receive illumination from light sources or other surfaces.  Output type surfaceshader.
     * `emission` (float): the surface emission amount; default is 1.0

javascript/MaterialXView/package.json

@@ -11,8 +11,8 @@
   "license": "ISC",
   "dependencies": {
     "dat.gui": "^0.7.9",
-    "three": "^0.140.2",
-    "webpack": "^5.88.1"
+    "three": "^0.136.0",
+    "webpack": "^5.88.2"
   },
   "devDependencies": {
     "copy-webpack-plugin": "^8.1.1",

javascript/MaterialXView/source/viewer.js

@@ -777,7 +777,7 @@ export class Material
         Object.assign(uniforms, {
             u_numActiveLightSources: { value: lights.length },
             u_lightData: { value: lightData },
-            u_envMatrix: { value: new THREE.Matrix4().multiplyMatrices(getLightRotation(), new THREE.Matrix4().makeScale(1, -1, 1)) },
+            u_envMatrix: { value: getLightRotation() },
             u_envRadiance: { value: radianceTexture },
             u_envRadianceMips: { value: Math.trunc(Math.log2(Math.max(radianceTexture.image.width, radianceTexture.image.height))) + 1 },
             u_envRadianceSamples: { value: 16 },