@luma.gl/shadertools 9.0.21 → 9.0.23

package/dist/dist.dev.js

@@ -5433,7 +5433,7 @@ vec3 lighting_getLightColor(vec3 surfaceColor, vec3 cameraPosition, vec3 positio
       if (uniforms.specularColor) {
         uniforms.specularColor = uniforms.specularColor.map((x) => x / 255);
       }
-      return { ...gouraudMaterial.defaultUniforms, ...props };
+      return { ...gouraudMaterial.defaultUniforms, ...uniforms };
     }
   };
 
@@ -5464,7 +5464,7 @@ vec3 lighting_getLightColor(vec3 surfaceColor, vec3 cameraPosition, vec3 positio
       if (uniforms.specularColor) {
         uniforms.specularColor = uniforms.specularColor.map((x) => x / 255);
       }
-      return { ...phongMaterial.defaultUniforms, ...props };
+      return { ...phongMaterial.defaultUniforms, ...uniforms };
     }
   };
 

package/dist/dist.min.js

@@ -416,7 +416,7 @@ lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction,
 }
 return lightColor;
 }
-`;var Zt={name:"gouraudMaterial",vs:We.replace("phongMaterial","gouraudMaterial"),fs:Ge.replace("phongMaterial","gouraudMaterial"),defines:{LIGHTING_VERTEX:1},dependencies:[Q],uniformTypes:{ambient:"f32",diffuse:"f32",shininess:"f32",specularColor:"vec3<f32>"},defaultUniforms:{ambient:.35,diffuse:.6,shininess:32,specularColor:[.15,.15,.15]},getUniforms(n){let e={...n};return e.specularColor&&(e.specularColor=e.specularColor.map(t=>t/255)),{...Zt.defaultUniforms,...n}}};var Jt={name:"phongMaterial",vs:Ge,fs:We,defines:{LIGHTING_FRAGMENT:1},dependencies:[Q],uniformTypes:{ambient:"f32",diffuse:"f32",shininess:"f32",specularColor:"vec3<f32>"},defaultUniforms:{ambient:.35,diffuse:.6,shininess:32,specularColor:[.15,.15,.15]},getUniforms(n){let e={...n};return e.specularColor&&(e.specularColor=e.specularColor.map(t=>t/255)),{...Jt.defaultUniforms,...n}}};var $n=`uniform projection {
+`;var Zt={name:"gouraudMaterial",vs:We.replace("phongMaterial","gouraudMaterial"),fs:Ge.replace("phongMaterial","gouraudMaterial"),defines:{LIGHTING_VERTEX:1},dependencies:[Q],uniformTypes:{ambient:"f32",diffuse:"f32",shininess:"f32",specularColor:"vec3<f32>"},defaultUniforms:{ambient:.35,diffuse:.6,shininess:32,specularColor:[.15,.15,.15]},getUniforms(n){let e={...n};return e.specularColor&&(e.specularColor=e.specularColor.map(t=>t/255)),{...Zt.defaultUniforms,...e}}};var Jt={name:"phongMaterial",vs:Ge,fs:We,defines:{LIGHTING_FRAGMENT:1},dependencies:[Q],uniformTypes:{ambient:"f32",diffuse:"f32",shininess:"f32",specularColor:"vec3<f32>"},defaultUniforms:{ambient:.35,diffuse:.6,shininess:32,specularColor:[.15,.15,.15]},getUniforms(n){let e={...n};return e.specularColor&&(e.specularColor=e.specularColor.map(t=>t/255)),{...Jt.defaultUniforms,...e}}};var $n=`uniform projection {
 mat4 u_MVPMatrix;
 mat4 u_ModelMatrix;
 mat4 u_NormalMatrix;

package/dist/index.cjs

@@ -1820,7 +1820,7 @@ var gouraudMaterial = {
     if (uniforms.specularColor) {
       uniforms.specularColor = uniforms.specularColor.map((x) => x / 255);
     }
-    return { ...gouraudMaterial.defaultUniforms, ...props };
+    return { ...gouraudMaterial.defaultUniforms, ...uniforms };
   }
 };
 
@@ -1851,7 +1851,7 @@ var phongMaterial = {
     if (uniforms.specularColor) {
       uniforms.specularColor = uniforms.specularColor.map((x) => x / 255);
     }
-    return { ...phongMaterial.defaultUniforms, ...props };
+    return { ...phongMaterial.defaultUniforms, ...uniforms };
   }
 };