Fix bugs related to KHR_materials_specular

CesiumGS · May 29, 2024 · d6db006 · d6db006
1 parent de8f670
commit d6db006
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/engine/Source/Scene/GltfLoader.js b/packages/engine/Source/Scene/GltfLoader.js
@@ -1543,9 +1543,9 @@ function loadMetallicRoughness(loader, metallicRoughnessInfo, frameState) {
 
 function loadSpecular(loader, specularInfo, frameState) {
   const {
-    specularFactor = Specular.DEFAULT_SPECULAR_FACTOR,
+    specularFactor,
     specularTexture,
-    specularColorFactor = Specular.DEFAULT_SPECULAR_COLOR_FACTOR,
+    specularColorFactor,
     specularColorTexture,
   } = specularInfo;
 
@@ -1616,7 +1616,7 @@ function loadMaterial(loader, gltfMaterial, frameState) {
       pbrSpecularGlossiness,
       frameState
     );
-  } else if (!material.unlit) {
+  } else {
     if (defined(pbrMetallicRoughness)) {
       material.metallicRoughness = loadMetallicRoughness(
         loader,

diff --git a/packages/engine/Source/Shaders/Model/MaterialStageFS.glsl b/packages/engine/Source/Shaders/Model/MaterialStageFS.glsl
@@ -293,7 +293,8 @@ void setSpecular(inout czm_modelMaterial material, in float metalness)
         #ifdef HAS_SPECULAR_COLOR_TEXTURE_TRANSFORM
             specularColorTexCoords = computeTextureTransform(specularColorTexCoords, u_specularColorTextureTransform);
         #endif
-        vec3 specularColorFactor = texture(u_specularColorTexture, specularColorTexCoords).rgb;
+        vec3 specularColorSample = texture(u_specularColorTexture, specularColorTexCoords).rgb;
+        vec3 specularColorFactor = czm_srgbToLinear(specularColorSample);
         #ifdef HAS_SPECULAR_COLOR_FACTOR
             specularColorFactor *= u_specularColorFactor;
         #endif