Merge branch 'AcademySoftwareFoundation:main' into uri_for_viewer

Author: kwokcb

.github/workflows/main.yml

@@ -70,7 +70,7 @@ jobs:
         - name: MacOS_Xcode_15_Python311
           os: macos-15
           compiler: xcode
-          compiler_version: "15.4"
+          compiler_version: "16.1"
           python: 3.11
           test_shaders: ON
 
@@ -97,11 +97,11 @@ jobs:
           python: None
           cmake_config: -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=`xcrun --sdk iphoneos --show-sdk-path` -DCMAKE_OSX_ARCHITECTURES=arm64
 
-        - name: Windows_VS2019_Win32_Python39
-          os: windows-2019
+        - name: Windows_VS2022_Win32_Python39
+          os: windows-2022
           architecture: x86
           python: 3.9
-          cmake_config: -G "Visual Studio 16 2019" -A "Win32"
+          cmake_config: -G "Visual Studio 17 2022" -A "Win32"
 
         - name: Windows_VS2022_x64_Python311
           os: windows-2025

documents/Specification/MaterialX.PBRSpec.md

@@ -162,7 +162,7 @@ The PBS nodes also make use of the following standard MaterialX types:
 
 <a id="node-oren-nayar-diffuse-bsdf"> </a>
 
-* **`oren_nayar_diffuse_bsdf`**: Constructs a diffuse reflection BSDF based on the Oren-Nayar reflectance model. A `roughness` of 0.0 gives Lambertian reflectance. An `energy_compensation` boolean selects between classic Oren-Nayar behavior[^Oren1994] and the energy-compensated Oren-Nayar in OpenPBR[^Andersson2024].
+* **`oren_nayar_diffuse_bsdf`**: Constructs a diffuse reflection BSDF based on the Oren-Nayar reflectance model. A `roughness` of 0.0 gives Lambertian reflectance. An `energy_compensation` boolean selects between the Qualitative Oren-Nayar[^Oren1994] and Energy-Preserving Oren-Nayar[^Portsmouth2025] models of diffuse reflectance.
     * `weight` (float): Weight for this BSDF’s contribution, range [0.0, 1.0]. Defaults to 1.0.
     * `color` (color3): Diffuse reflectivity (albedo). Defaults to (0.18, 0.18, 0.18).
     * `roughness `(float): Surface roughness, range [0.0, 1.0]. Defaults to 0.0.
@@ -500,12 +500,14 @@ Path Tracing**, <https://media.disneyanimation.com/uploads/production/publicatio
 
 [^Marschner2003]: Stephen R. Marschner et al., **Light Scattering from Human Hair Fibers**, <http://www.graphics.stanford.edu/papers/hair/hair-sg03final.pdf>, 2003
 
-[^Oren1994]: Michael Oren, Shree K. Nayar, **Generalization of Lambert’s Reflectance Model**, <https://www1.cs.columbia.edu/CAVE/publications/pdfs/Oren_SIGGRAPH94.pdf>, 1994
+[^Oren1994]: Michael Oren, Shree K. Nayar, **Generalization of Lambert’s Reflectance Model**, <https://dl.acm.org/doi/10.1145/192161.192213>, 1994
 
 [^Pharr2023]: Matt Pharr et al., **Physically Based Rendering: From Theory To Implementation**, <https://www.pbr-book.org/>, 2023
 
 [^Pixar2019]: Pixar Animation Studios, **UsdPreviewSurface Specification**, <https://openusd.org/release/spec_usdpreviewsurface.html>, 2019.
 
+[^Portsmouth2025]: Portsmouth et al., **EON: A practical energy-preserving rough diffuse BRDF**, <https://www.jcgt.org/published/0014/01/06/>, 2025.
+
 [^Walter2007]: Bruce Walter et al., **Microfacet Models for Refraction through Rough Surfaces**, <https://www.graphics.cornell.edu/~bjw/microfacetbsdf.pdf>, 2007
 
 [^Zeltner2022]: Tizian Zeltner et al., **Practical Multiple-Scattering Sheen Using Linearly Transformed Cosines**, <https://tizianzeltner.com/projects/Zeltner2022Practical/>, 2022

javascript/MaterialXView/source/index.js

@@ -170,17 +170,19 @@ function onWindowResize()
 function animate()
 {
     requestAnimationFrame(animate);
+    const scene = viewer.getScene();
 
     if (turntableEnabled)
     {
         turntableStep = (turntableStep + 1) % 360;
         var turntableAngle = turntableStep * (360.0 / turntableSteps) / 180.0 * Math.PI;
-        viewer.getScene()._scene.rotation.y = turntableAngle;
-        viewer.getScene().setUpdateTransforms();
+        scene._scene.rotation.y = turntableAngle;
+        scene.setUpdateTransforms();
     }
 
-    renderer.render(viewer.getScene().getScene(), viewer.getScene().getCamera());
-    viewer.getScene().updateTransforms();
+    scene.updateUniforms();
+    renderer.render(scene.getScene(), scene.getCamera());
+    scene.updateTransforms();
 
     if (captureRequested)
     {

javascript/MaterialXView/source/viewer.js

@@ -43,7 +43,8 @@ export class Scene
         const cameraFarDist = 100.0;
         const cameraFOV = 60.0;
         this._camera = new THREE.PerspectiveCamera(cameraFOV, aspectRatio, cameraNearDist, cameraFarDist);
-
+        this._frame = 0;
+        
         this.#_gltfLoader = new GLTFLoader();
 
         this.#_normalMat = new THREE.Matrix3();
@@ -265,6 +266,37 @@ export class Scene
         });
     }
 
+    /**
+     * Update uniforms for all scene objects. This is called once per frame
+     * and updates time and frame count uniforms.
+     */
+    updateUniforms() {
+        this._frame++;
+
+        const scene = this.getScene();
+        const time = performance.now() / 1000.0;
+        const frame = this._frame;
+
+        scene.traverse((child) =>
+        {
+            if (child.isMesh && child.material && child.material.uniforms)
+            {
+                const uniforms = child.material.uniforms;
+                if (uniforms)
+                {
+                    if (uniforms.u_time)
+                    {
+                        uniforms.u_time.value = time;
+                    }
+                    if (uniforms.u_frame)
+                    {
+                        uniforms.u_frame.value = frame;
+                    }
+                }
+            }
+        });
+    }
+
     // Determine string DAG path based on individual node names.
     getDagPath(node)
     {
@@ -1414,6 +1446,40 @@ export class Material
                             break;
 
                         case 'color4':
+                            uniformToUpdate = material.uniforms[name];
+                            if (uniformToUpdate && value != null)
+                            {
+                                var dummy =
+                                {
+                                    color: 0xFF0000
+                                };
+                                // Extract RGB from the color4 value
+                                const color3 = new THREE.Color();
+                                color3.fromArray(material.uniforms[name].value);
+                                dummy.color = color3.getHex();
+                                let alphaValue = material.uniforms[name].value[3]; // Get alpha component
+                                
+                                // Add the RGB color picker as one item
+                                let colorPicker = currentFolder.addColor(dummy, 'color').name(path + '.rgb')
+                                    .onChange(function (value)
+                                    {
+                                        const color3 = new THREE.Color(value);
+                                        // Update RGB while preserving alpha
+                                        material.uniforms[name].value[0] = color3.r;
+                                        material.uniforms[name].value[1] = color3.g;
+                                        material.uniforms[name].value[2] = color3.b;
+                                    });
+                                colorPicker.domElement.classList.add('peditoritem');
+                                
+                                // Add the alpha slider as a separate item at the same level
+                                var alphaObj = { value: alphaValue };
+                                let alphaSlider = currentFolder.add(alphaObj, 'value', 0, 1, 0.01).name(path + '.alpha')
+                                    .onChange(function (value)
+                                    {
+                                        material.uniforms[name].value[3] = value;
+                                    });
+                                alphaSlider.domElement.classList.add('peditoritem');
+                            }
                             break;
 
                         case 'matrix33':