Merge branch 'dev_1.39' into main

AcademySoftwareFoundation · Mar 15, 2024 · 13a090a · 13a090a
2 parents 76ba0b3 + c0e640e
commit 13a090a
Show file tree

Hide file tree

Showing 128 changed files with 1,350 additions and 1,714 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -64,9 +64,9 @@ jobs:
           clang_format: ON
 
         - name: Linux_Clang_DynamicAnalysis
-          os: ubuntu-22.04
+          os: ubuntu-20.04
           compiler: clang
-          compiler_version: "15"
+          compiler_version: "10"
           python: None
           cmake_config: -DMATERIALX_DYNAMIC_ANALYSIS=ON
           dynamic_analysis: ON
@@ -331,7 +331,7 @@ jobs:
       working-directory: javascript/MaterialXView
 
     - name: Deploy Web Viewer
-      if: matrix.build_javascript == 'ON' && github.ref == 'refs/heads/main'
+      if: matrix.build_javascript == 'ON' && github.event_name != 'pull_request'
       uses: JamesIves/github-pages-deploy-action@v4
       with:
         branch: gh-pages

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Change Log
 
+## [1.39.0] - Development
+
 ## [1.38.9] - 2024-02-26
 
 ### Added

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,12 +1,12 @@
 # MaterialX Version
 set(MATERIALX_MAJOR_VERSION 1)
-set(MATERIALX_MINOR_VERSION 38)
-set(MATERIALX_BUILD_VERSION 9)
+set(MATERIALX_MINOR_VERSION 39)
+set(MATERIALX_BUILD_VERSION 0)
 set(MATERIALX_LIBRARY_VERSION ${MATERIALX_MAJOR_VERSION}.${MATERIALX_MINOR_VERSION}.${MATERIALX_BUILD_VERSION})
 
 # Cmake setup
 cmake_minimum_required(VERSION 3.16)
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
 set(CMAKE_MACOSX_RPATH ON)
 enable_testing()

diff --git a/documents/CMakeLists.txt b/documents/CMakeLists.txt
@@ -1,34 +1,45 @@
 set(DOXYGEN_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
 set(DOXYGEN_HTML_OUTPUT_DIR ${DOXYGEN_OUTPUT_DIR}/html)
-set(DOXYGEN_INPUT_LIST ${CMAKE_SOURCE_DIR}/documents/DeveloperGuide/MainPage.md
-                       ${CMAKE_SOURCE_DIR}/source/MaterialXCore
-                       ${CMAKE_SOURCE_DIR}/source/MaterialXFormat
-                       ${CMAKE_SOURCE_DIR}/source/MaterialXGenShader
-                       ${CMAKE_SOURCE_DIR}/source/MaterialXGenShader/Nodes
-                       ${CMAKE_SOURCE_DIR}/source/MaterialXGenGlsl
-                       ${CMAKE_SOURCE_DIR}/source/MaterialXGenGlsl/Nodes
-                       ${CMAKE_SOURCE_DIR}/source/MaterialXGenOsl
-                       ${CMAKE_SOURCE_DIR}/source/MaterialXGenMdl
-                       ${CMAKE_SOURCE_DIR}/source/MaterialXRender
-                       ${CMAKE_SOURCE_DIR}/source/MaterialXRenderHw
-                       ${CMAKE_SOURCE_DIR}/source/MaterialXRenderGlsl
-                       ${CMAKE_SOURCE_DIR}/source/MaterialXRenderOsl
-                       )
+set(DOXYGEN_INPUT_LIST ${CMAKE_CURRENT_BINARY_DIR}/MainPage.md)
+
+set(MATERIALX_DOXYGEN_SOURCE_FOLDERS
+    ${CMAKE_SOURCE_DIR}/source/MaterialXCore
+    ${CMAKE_SOURCE_DIR}/source/MaterialXFormat
+    ${CMAKE_SOURCE_DIR}/source/MaterialXGenShader
+    ${CMAKE_SOURCE_DIR}/source/MaterialXGenShader/Nodes
+    ${CMAKE_SOURCE_DIR}/source/MaterialXGenGlsl
+    ${CMAKE_SOURCE_DIR}/source/MaterialXGenGlsl/Nodes
+    ${CMAKE_SOURCE_DIR}/source/MaterialXGenOsl
+    ${CMAKE_SOURCE_DIR}/source/MaterialXGenMdl
+    ${CMAKE_SOURCE_DIR}/source/MaterialXRender
+    ${CMAKE_SOURCE_DIR}/source/MaterialXRenderHw
+    ${CMAKE_SOURCE_DIR}/source/MaterialXRenderGlsl
+    ${CMAKE_SOURCE_DIR}/source/MaterialXRenderOsl)
+
+find_package(Doxygen REQUIRED)
+
+foreach(FOLDER ${MATERIALX_DOXYGEN_SOURCE_FOLDERS})
+    file(GLOB FOLDER_HEADERS ${FOLDER}/*.h)
+    list(APPEND DOXYGEN_INPUT_LIST ${FOLDER_HEADERS})
+endforeach()
+
 string (REPLACE ";" " " DOXYGEN_INPUT_STR "${DOXYGEN_INPUT_LIST}")
 
-find_package(Doxygen)
-
-if(DOXYGEN_FOUND)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-    add_custom_target(MaterialXDocs ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-                      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                      COMMENT "Generating HTML documentation: ${DOXYGEN_HTML_OUTPUT_DIR}/index.html")
-    add_custom_command(TARGET MaterialXDocs PRE_BUILD
-                       COMMAND ${CMAKE_COMMAND} -E copy_directory
-                       ${CMAKE_SOURCE_DIR}/documents/DoxygenAwesome ${CMAKE_CURRENT_BINARY_DIR})
-    add_custom_command(TARGET MaterialXDocs PRE_BUILD
-                       COMMAND ${CMAKE_COMMAND} -E copy_directory
-                       ${CMAKE_SOURCE_DIR}/documents/Images ${CMAKE_CURRENT_BINARY_DIR})
-    install(DIRECTORY ${DOXYGEN_HTML_OUTPUT_DIR}
-            DESTINATION "documents" MESSAGE_NEVER)
-endif(DOXYGEN_FOUND)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/MainPage.md
+                   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/DeveloperGuide/MainPage.md ${CMAKE_CURRENT_BINARY_DIR}
+                   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+                   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/DeveloperGuide/MainPage.md)
+
+add_custom_command(OUTPUT ${DOXYGEN_HTML_OUTPUT_DIR}/index.html
+                   COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/DoxygenAwesome ${CMAKE_CURRENT_BINARY_DIR}
+                   COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/Images ${CMAKE_CURRENT_BINARY_DIR}
+                   COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+                   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+                   DEPENDS ${DOXYGEN_INPUT_LIST} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+                   COMMENT "Generating HTML documentation: ${DOXYGEN_HTML_OUTPUT_DIR}/index.html")
+add_custom_target(MaterialXDocs ALL DEPENDS ${DOXYGEN_HTML_OUTPUT_DIR}/index.html)
+
+install(DIRECTORY ${DOXYGEN_HTML_OUTPUT_DIR}
+        DESTINATION "documents" MESSAGE_NEVER)
diff --git a/documents/Specification/MaterialX.Specification.md b/documents/Specification/MaterialX.Specification.md
@@ -1154,7 +1154,7 @@ Math nodes have one or two spatially-varying inputs, and are used to perform a m
 
 <a id="node-atan2"> </a>
 
-* **`atan2`**: the arctangent of the expression (iny/inx); the output will be expressed in radians.  If both `in1` and `in2` are provided, they must be the same type.
+* **`atan2`**: the arctangent of the expression (iny/inx); the output will be expressed in radians.  If both `iny` and `inx` are provided, they must be the same type.
     * `iny` (float or vector<em>N</em>): the value or nodename for the "y" input; default is 0.0.
     * `inx` (float or vector<em>N</em>): the value or nodename for the "x" input; default is 1.0.
 

diff --git a/libraries/pbrlib/genglsl/lib/mx_microfacet.glsl b/libraries/pbrlib/genglsl/lib/mx_microfacet.glsl
@@ -6,6 +6,12 @@ float mx_pow5(float x)
     return mx_square(mx_square(x)) * x;
 }
 
+float mx_pow6(float x)
+{
+    float x2 = mx_square(x);
+    return mx_square(x2) * x2;
+}
+
 // Standard Schlick Fresnel
 float mx_fresnel_schlick(float cosTheta, float F0)
 {