Update Sandcastle, minor cleanup

CesiumGS · May 9, 2024 · 90b3043 · 90b3043
1 parent 3913e71
commit 90b3043
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 24 deletions.
diff --git a/Apps/Sandcastle/gallery/development/glTF PBR Specular.html b/Apps/Sandcastle/gallery/development/glTF PBR Specular.html
@@ -34,7 +34,7 @@
               <input
                 type="range"
                 min="0.0"
-                max="2.0"
+                max="10.0"
                 step="0.01"
                 data-bind="value: luminanceAtZenith, valueUpdate: 'input'"
               />
@@ -315,32 +315,23 @@
           }
         );
 
-        const modelOptions = [
-          {
-            text: "Specular Test",
-            onselect: function () {
-              loadModel(
-                "../../SampleData/models/SpecularTest/glTF-Binary/SpecularTest.glb"
-              );
-            },
-          },
-          {
-            text: "Water Bottle",
-            onselect: function () {
-              loadModel(
-                "../../SampleData/models/SpecGlossVsMetalRough/glTF-Binary/SpecGlossVsMetalRough.glb"
-              );
-            },
-          },
-        ];
-        Sandcastle.addToolbarMenu(modelOptions);
+        let model;
         loadModel(
           "../../SampleData/models/SpecularTest/glTF-Binary/SpecularTest.glb"
         );
 
+        Sandcastle.addToggleButton(
+          "Enable KHR_materials_specular",
+          true,
+          function (checked) {
+            Cesium.ModelUtility.supportedExtensions.KHR_materials_specular = checked;
+            model.resetDrawCommands();
+          }
+        );
+
         async function loadModel(modelURL) {
           try {
-            const model = await Cesium.Model.fromGltfAsync({
+            model = await Cesium.Model.fromGltfAsync({
               url: modelURL,
               modelMatrix: modelMatrix,
               //minimumPixelSize: 128,

diff --git a/packages/engine/Source/Scene/GltfLoader.js b/packages/engine/Source/Scene/GltfLoader.js
@@ -194,7 +194,7 @@ function GltfLoader(options) {
   const {
     gltfResource,
     typedArray,
-    releaseGltfJson,
+    releaseGltfJson = false,
     asynchronous = true,
     incrementallyLoadTextures = true,
     upAxis = Axis.Y,

diff --git a/packages/engine/Source/Scene/Model/MaterialPipelineStage.js b/packages/engine/Source/Scene/Model/MaterialPipelineStage.js
@@ -24,6 +24,7 @@ const {
  * to render a primitive. This handles the following material types:
  * <ul>
  *   <li>Basic glTF materials (PBR metallic roughness model)</li>
+ *   <li>The `KHR_materials_specular` glTF extension</li>
  *   <li>The `KHR_materials_pbrSpecularGlossiness` glTF extension</li>
  *   <li>The `KHR_materials_unlit` glTF extension</li>
  * </ul>
@@ -96,7 +97,10 @@ MaterialPipelineStage.process = function (
       disableTextures
     );
   } else {
-    if (defined(material.specular)) {
+    if (
+      defined(material.specular) &&
+      ModelUtility.supportedExtensions.KHR_materials_specular === true
+    ) {
       processSpecularUniforms(
         material,
         uniformMap,

diff --git a/packages/engine/Source/Shaders/Model/ImageBasedLightingStageFS.glsl b/packages/engine/Source/Shaders/Model/ImageBasedLightingStageFS.glsl
@@ -134,7 +134,7 @@ vec3 textureIBL(
 ) {
     vec3 v = -positionEC;
     vec3 n = normalEC;
-    vec3 l = normalize(lightDirectionEC);	
+    vec3 l = normalize(lightDirectionEC);
     vec3 h = normalize(v + l);
 
     float NdotV = abs(dot(n, v)) + 0.001;