@luma.gl/shadertools 9.3.0 → 9.3.2

package/dist/dist.dev.js

@@ -6253,7 +6253,7 @@ vec3 lighting_getLightColor(vec3 surfaceColor, vec3 light_direction, vec3 view_d
     specular = pow(specular_angle, material.shininess);
   }
   lambertian = max(lambertian, 0.0);
-  return (lambertian * material.diffuse * surfaceColor + specular * material.specularColor) * color;
+  return (lambertian * material.diffuse * surfaceColor + specular * floatColors_normalize(material.specularColor)) * color;
 }
 
 vec3 lighting_getLightColor(vec3 surfaceColor, vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {
@@ -6318,7 +6318,10 @@ fn lighting_getLightColor(surfaceColor: vec3<f32>, light_direction: vec3<f32>, v
     specular = pow(specular_angle, phongMaterial.shininess);
   }
   lambertian = max(lambertian, 0.0);
-  return (lambertian * phongMaterial.diffuse * surfaceColor + specular * phongMaterial.specularColor) * color;
+  return (
+    lambertian * phongMaterial.diffuse * surfaceColor +
+    specular * floatColors_normalize(phongMaterial.specularColor)
+  ) * color;
 }
 
 fn lighting_getLightColor2(surfaceColor: vec3<f32>, cameraPosition: vec3<f32>, position_worldspace: vec3<f32>, normal_worldspace: vec3<f32>) -> vec3<f32> {
@@ -6423,6 +6426,7 @@ fn lighting_getSpecularLightColor(cameraPosition: vec3<f32>, position_worldspace
   );
 
   // src/modules/lighting/gouraud-material/gouraud-material.ts
+  var DEFAULT_SPECULAR_COLOR = [38.25, 38.25, 38.25];
   var gouraudMaterial = {
     props: {},
     name: "gouraudMaterial",
@@ -6434,41 +6438,33 @@ fn lighting_getSpecularLightColor(cameraPosition: vec3<f32>, position_worldspace
     defines: {
       LIGHTING_VERTEX: true
     },
-    dependencies: [lighting],
+    dependencies: [lighting, floatColors],
     uniformTypes: {
       unlit: "i32",
       ambient: "f32",
       diffuse: "f32",
       shininess: "f32",
-      specularColor: "vec3<f32>",
-      useByteColors: "i32"
+      specularColor: "vec3<f32>"
     },
     defaultUniforms: {
       unlit: false,
       ambient: 0.35,
       diffuse: 0.6,
       shininess: 32,
-      specularColor: [0.15, 0.15, 0.15],
-      useByteColors: true
+      specularColor: DEFAULT_SPECULAR_COLOR
     },
     getUniforms(props) {
-      const uniforms = { ...props };
-      if (uniforms.specularColor) {
-        uniforms.specularColor = normalizeByteColor3(
-          uniforms.specularColor,
-          resolveUseByteColors(uniforms.useByteColors, true)
-        );
-      }
-      return { ...gouraudMaterial.defaultUniforms, ...uniforms };
+      return { ...gouraudMaterial.defaultUniforms, ...props };
     }
   };
 
   // src/modules/lighting/phong-material/phong-material.ts
+  var DEFAULT_SPECULAR_COLOR2 = [38.25, 38.25, 38.25];
   var phongMaterial = {
     name: "phongMaterial",
     firstBindingSlot: 0,
     bindingLayout: [{ name: "phongMaterial", group: 3 }],
-    dependencies: [lighting],
+    dependencies: [lighting, floatColors],
     // Note these are switched between phong and gouraud
     source: PHONG_WGSL,
     vs: PHONG_VS,
@@ -6481,26 +6477,17 @@ fn lighting_getSpecularLightColor(cameraPosition: vec3<f32>, position_worldspace
       ambient: "f32",
       diffuse: "f32",
       shininess: "f32",
-      specularColor: "vec3<f32>",
-      useByteColors: "i32"
+      specularColor: "vec3<f32>"
     },
     defaultUniforms: {
       unlit: false,
       ambient: 0.35,
       diffuse: 0.6,
       shininess: 32,
-      specularColor: [0.15, 0.15, 0.15],
-      useByteColors: true
+      specularColor: DEFAULT_SPECULAR_COLOR2
     },
     getUniforms(props) {
-      const uniforms = { ...props };
-      if (uniforms.specularColor) {
-        uniforms.specularColor = normalizeByteColor3(
-          uniforms.specularColor,
-          resolveUseByteColors(uniforms.useByteColors, true)
-        );
-      }
-      return { ...phongMaterial.defaultUniforms, ...uniforms };
+      return { ...phongMaterial.defaultUniforms, ...props };
     }
   };