Merge branch 'AcademySoftwareFoundation:main' into downstream_traversal

AcademySoftwareFoundation · Jul 24, 2023 · 46c8fb2 · 46c8fb2
2 parents f5d8984 + 42e8b76
commit 46c8fb2
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 31 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,6 +49,7 @@ option(MATERIALX_BUILD_TESTS "Build unit tests." ON)
 option(MATERIALX_BUILD_SHARED_LIBS "Build MaterialX libraries as shared rather than static." OFF)
 option(MATERIALX_PYTHON_LTO "Enable link-time optimizations for MaterialX Python." ON)
 option(MATERIALX_INSTALL_PYTHON "Install the MaterialX Python package as a third-party library when the install target is built." ON)
+option(MATERIALX_INSTALL_RESOURCES "Install the resources folder when building render modules." ON)
 option(MATERIALX_TEST_RENDER "Run rendering tests for MaterialX Render module. GPU required for graphics validation." ON)
 option(MATERIALX_WARNINGS_AS_ERRORS "Interpret all compiler warnings as errors." OFF)
 option(MATERIALX_DYNAMIC_ANALYSIS "Build MaterialX libraries with dynamic analysis on supporting platforms." OFF)
@@ -276,7 +277,9 @@ if(MATERIALX_BUILD_RENDER)
     if(MATERIALX_BUILD_GRAPH_EDITOR)
         add_subdirectory(source/MaterialXGraphEditor)
     endif()
-    add_subdirectory(resources)
+    if(MATERIALX_INSTALL_RESOURCES)
+        add_subdirectory(resources)
+    endif()
 endif()
 
 # Add test subdirectory

diff --git a/cmake/modules/MaterialXConfig.cmake.in b/cmake/modules/MaterialXConfig.cmake.in
@@ -22,6 +22,8 @@ set_and_check(MATERIALX_STDLIB_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@/libraries")
 if(@MATERIALX_BUILD_PYTHON@ AND @MATERIALX_INSTALL_PYTHON@)
     set_and_check(MATERIALX_PYTHON_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@/python")
 endif()
-set_and_check(MATERIALX_RESOURCES_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@/resources")
+if(@MATERIALX_BUILD_RENDER@ AND @MATERIALX_INSTALL_RESOURCES@)
+    set_and_check(MATERIALX_RESOURCES_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@/resources")
+endif()
 
 check_required_components(@CMAKE_PROJECT_NAME@)
diff --git a/javascript/MaterialXView/package-lock.json b/javascript/MaterialXView/package-lock.json
diff --git a/javascript/MaterialXView/package.json b/javascript/MaterialXView/package.json
@@ -11,7 +11,7 @@
   "license": "ISC",
   "dependencies": {
     "dat.gui": "^0.7.9",
-    "three": "^0.135.0",
+    "three": "^0.140.2",
     "webpack": "^5.88.1"
   },
   "devDependencies": {

diff --git a/javascript/MaterialXView/source/helper.js b/javascript/MaterialXView/source/helper.js
@@ -20,8 +20,6 @@ const IMAGE_PATH_SEPARATOR = "/";
 export function prepareEnvTexture(texture, capabilities)
 {
     const rgbaTexture = RGBToRGBA_Float(texture);
-    // RGBELoader sets flipY to true by default
-    rgbaTexture.flipY = false;
     rgbaTexture.wrapS = THREE.RepeatWrapping;
     rgbaTexture.anisotropy = capabilities.getMaxAnisotropy();
     rgbaTexture.minFilter = THREE.LinearMipmapLinearFilter;

diff --git a/javascript/MaterialXView/source/viewer.js b/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: getLightRotation() },
+            u_envMatrix: { value: new THREE.Matrix4().multiplyMatrices(getLightRotation(), new THREE.Matrix4().makeScale(1, -1, 1)) },
             u_envRadiance: { value: radianceTexture },
             u_envRadianceMips: { value: Math.trunc(Math.log2(Math.max(radianceTexture.image.width, radianceTexture.image.height))) + 1 },
             u_envRadianceSamples: { value: 16 },

diff --git a/source/MaterialXGenMsl/MslShaderGenerator.cpp b/source/MaterialXGenMsl/MslShaderGenerator.cpp
@@ -43,6 +43,8 @@
 
 #include "MslResourceBindingContext.h"
 
+#include <cctype>
+
 MATERIALX_NAMESPACE_BEGIN
 
 const string MslShaderGenerator::TARGET = "genmsl";