shadertools: Normalize specularColor (#2171)

visgl · Aug 9, 2024 · b672704 · b672704
1 parent 9d7d297
commit b672704
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/modules/shadertools/src/modules/lighting/gouraud-material/gouraud-material.ts b/modules/shadertools/src/modules/lighting/gouraud-material/gouraud-material.ts
@@ -42,6 +42,6 @@ export const gouraudMaterial: ShaderModule<GouraudMaterialProps> = {
     if (uniforms.specularColor) {
       uniforms.specularColor = uniforms.specularColor.map(x => x / 255) as NumberArray3;
     }
-    return {...gouraudMaterial.defaultUniforms, ...props};
+    return {...gouraudMaterial.defaultUniforms, ...uniforms};
   }
 };
diff --git a/modules/shadertools/src/modules/lighting/phong-material/phong-material.ts b/modules/shadertools/src/modules/lighting/phong-material/phong-material.ts
@@ -42,6 +42,6 @@ export const phongMaterial: ShaderModule<PhongMaterialProps> = {
     if (uniforms.specularColor) {
       uniforms.specularColor = uniforms.specularColor.map(x => x / 255) as NumberArray3;
     }
-    return {...phongMaterial.defaultUniforms, ...props};
+    return {...phongMaterial.defaultUniforms, ...uniforms};
   }
 };