Merge branch 'AcademySoftwareFoundation:main' into bhata/gooch

autodesk-forks · Jan 11, 2024 · 6df02c2 · 6df02c2
2 parents cae655e + 8489915
commit 6df02c2
Show file tree

Hide file tree

Showing 62 changed files with 612 additions and 1,001 deletions.
diff --git a/javascript/MaterialXView/index.ejs b/javascript/MaterialXView/index.ejs
@@ -10,6 +10,22 @@
         margin: 0;
         font-family: Arial
       }
+
+      /* Property editor item color */
+      .peditoritem {
+        background-color: #334444;
+      }
+      /* Property editor folder color */
+      .peditorfolder {
+        background-color: #333333;
+      }
+
+     .peditor_material_assigned {
+        background-color: #006cb8;
+      }
+      .peditor_material_assigned:hover {
+        background-color: #32adff;
+      }
     </style>
   </head>
   <body style="margin: 0px; overflow: hidden;">

diff --git a/javascript/MaterialXView/public/shader_ball.svg b/javascript/MaterialXView/public/shader_ball.svg
diff --git a/javascript/MaterialXView/public/shader_ball2.svg b/javascript/MaterialXView/public/shader_ball2.svg
diff --git a/javascript/MaterialXView/source/index.js b/javascript/MaterialXView/source/index.js
@@ -62,6 +62,13 @@ function init()
     // Set up renderer
     renderer = new THREE.WebGLRenderer({ canvas, context });
     renderer.setSize(window.innerWidth, window.innerHeight);
+    // Disable introspection for shader debugging for deployment. 
+    // - The code associated with getting program information can be very slow when 
+    //   dealing with shaders with lots of input uniforms (such as standard surface, openpbr shading models)
+    //   as each call is blocking.
+    // - Adding this avoids the chess set scene from "hanging" the Chrome browser on Windows to a few second load.
+    // - Documentation for this flag: https://threejs.org/docs/index.html#api/en/renderers/WebGLRenderer.debug
+    renderer.debug.checkShaderErrors = false;
 
     composer = new EffectComposer(renderer);
     const renderPass = new RenderPass(scene.getScene(), scene.getCamera());