@luma.gl/shadertools 9.1.5 → 9.1.6

package/dist/index.cjs

@@ -2679,7 +2679,7 @@ struct DirectionalLight {
 
 struct lightingUniforms {
   enabled: i32,
-  poightCount: i32,
+  pointLightCount: i32,
   directionalLightCount: i32,
 
   ambientColor: vec3<f32>,
@@ -2995,38 +2995,6 @@ vec3 lighting_getLightColor(vec3 surfaceColor, vec3 cameraPosition, vec3 positio
 `
 );
 
-// dist/modules/lighting/gouraud-material/gouraud-material.js
-var gouraudMaterial = {
-  props: {},
-  name: "gouraudMaterial",
-  // Note these are switched between phong and gouraud
-  vs: PHONG_FS.replace("phongMaterial", "gouraudMaterial"),
-  fs: PHONG_VS.replace("phongMaterial", "gouraudMaterial"),
-  defines: {
-    LIGHTING_VERTEX: 1
-  },
-  dependencies: [lighting],
-  uniformTypes: {
-    ambient: "f32",
-    diffuse: "f32",
-    shininess: "f32",
-    specularColor: "vec3<f32>"
-  },
-  defaultUniforms: {
-    ambient: 0.35,
-    diffuse: 0.6,
-    shininess: 32,
-    specularColor: [0.15, 0.15, 0.15]
-  },
-  getUniforms(props) {
-    const uniforms = { ...props };
-    if (uniforms.specularColor) {
-      uniforms.specularColor = uniforms.specularColor.map((x) => x / 255);
-    }
-    return { ...gouraudMaterial.defaultUniforms, ...uniforms };
-  }
-};
-
 // dist/modules/lighting/phong-material/phong-shaders-wgsl.js
 var PHONG_WGSL = (
   /* wgsl */
@@ -3037,7 +3005,7 @@ var PHONG_WGSL = (
   specularColor: vec3<f32>,
 };
 
-@binding(2) @group(0) var<uniform> material : phongMaterialUniforms;
+@binding(2) @group(0) var<uniform> phongMaterial : phongMaterialUniforms;
 
 fn lighting_getLightColor(surfaceColor: vec3<f32>, light_direction: vec3<f32>, view_direction: vec3<f32>, normal_worldspace: vec3<f32>, color: vec3<f32>) -> vec3<f32> {
   let halfway_direction: vec3<f32> = normalize(light_direction + view_direction);
@@ -3045,10 +3013,10 @@ fn lighting_getLightColor(surfaceColor: vec3<f32>, light_direction: vec3<f32>, v
   var specular: f32 = 0.0;
   if (lambertian > 0.0) {
     let specular_angle = max(dot(normal_worldspace, halfway_direction), 0.0);
-    specular = pow(specular_angle, material.shininess);
+    specular = pow(specular_angle, phongMaterial.shininess);
   }
   lambertian = max(lambertian, 0.0);
-  return (lambertian * material.diffuse * surfaceColor + specular * material.specularColor) * color;
+  return (lambertian * phongMaterial.diffuse * surfaceColor + specular * phongMaterial.specularColor) * color;
 }
 
 fn lighting_getLightColor2(surfaceColor: vec3<f32>, cameraPosition: vec3<f32>, position_worldspace: vec3<f32>, normal_worldspace: vec3<f32>) -> vec3<f32> {
@@ -3059,7 +3027,7 @@ fn lighting_getLightColor2(surfaceColor: vec3<f32>, cameraPosition: vec3<f32>, p
   }
 
   let view_direction: vec3<f32> = normalize(cameraPosition - position_worldspace);
-  lightColor = material.ambient * surfaceColor * lighting.ambientColor;
+  lightColor = phongMaterial.ambient * surfaceColor * lighting.ambientColor;
 
   if (lighting.lightType == 0) {
     let pointLight: PointLight  = lighting_getPointLight(0);
@@ -3118,6 +3086,39 @@ fn lighting_getSpecularLightColor(cameraPosition: vec3<f32>, position_worldspace
 `
 );
 
+// dist/modules/lighting/gouraud-material/gouraud-material.js
+var gouraudMaterial = {
+  props: {},
+  name: "gouraudMaterial",
+  // Note these are switched between phong and gouraud
+  vs: PHONG_FS.replace("phongMaterial", "gouraudMaterial"),
+  fs: PHONG_VS.replace("phongMaterial", "gouraudMaterial"),
+  source: PHONG_WGSL.replaceAll("phongMaterial", "gouraudMaterial"),
+  defines: {
+    LIGHTING_VERTEX: 1
+  },
+  dependencies: [lighting],
+  uniformTypes: {
+    ambient: "f32",
+    diffuse: "f32",
+    shininess: "f32",
+    specularColor: "vec3<f32>"
+  },
+  defaultUniforms: {
+    ambient: 0.35,
+    diffuse: 0.6,
+    shininess: 32,
+    specularColor: [0.15, 0.15, 0.15]
+  },
+  getUniforms(props) {
+    const uniforms = { ...props };
+    if (uniforms.specularColor) {
+      uniforms.specularColor = uniforms.specularColor.map((x) => x / 255);
+    }
+    return { ...gouraudMaterial.defaultUniforms, ...uniforms };
+  }
+};
+
 // dist/modules/lighting/phong-material/phong-material.js
 var phongMaterial = {
   name: "phongMaterial",