@luma.gl/shadertools 9.0.20 → 9.0.23

package/dist/dist.dev.js

@@ -5213,15 +5213,15 @@ float getPointLightAttenuation(PointLight pointLight, float distance) {
       lightPosition0: [1, 1, 2],
       // TODO - could combine direction and attenuation
       lightDirection0: [1, 1, 1],
-      lightAttenuation0: [1, 1, 1],
+      lightAttenuation0: [1, 0, 0],
       lightColor1: [1, 1, 1],
       lightPosition1: [1, 1, 2],
       lightDirection1: [1, 1, 1],
-      lightAttenuation1: [1, 1, 1],
+      lightAttenuation1: [1, 0, 0],
       lightColor2: [1, 1, 1],
       lightPosition2: [1, 1, 2],
       lightDirection2: [1, 1, 1],
-      lightAttenuation2: [1, 1, 1]
+      lightAttenuation2: [1, 0, 0]
     }
   };
   function getUniforms2(props, prevUniforms = {}) {
@@ -5260,7 +5260,7 @@ float getPointLightAttenuation(PointLight pointLight, float distance) {
       const i = currentLight;
       lightSourceUniforms[`lightColor${i}`] = convertColor(pointLight);
       lightSourceUniforms[`lightPosition${i}`] = pointLight.position;
-      lightSourceUniforms[`lightAttenuation${i}`] = [pointLight.attenuation || 1, 0, 0];
+      lightSourceUniforms[`lightAttenuation${i}`] = pointLight.attenuation || [1, 0, 0];
       currentLight++;
     }
     for (const directionalLight of directionalLights) {
@@ -5429,7 +5429,11 @@ vec3 lighting_getLightColor(vec3 surfaceColor, vec3 cameraPosition, vec3 positio
       specularColor: [0.15, 0.15, 0.15]
     },
     getUniforms(props) {
-      return { ...gouraudMaterial.defaultUniforms, ...props };
+      const uniforms = { ...props };
+      if (uniforms.specularColor) {
+        uniforms.specularColor = uniforms.specularColor.map((x) => x / 255);
+      }
+      return { ...gouraudMaterial.defaultUniforms, ...uniforms };
     }
   };
 
@@ -5456,7 +5460,11 @@ vec3 lighting_getLightColor(vec3 surfaceColor, vec3 cameraPosition, vec3 positio
       specularColor: [0.15, 0.15, 0.15]
     },
     getUniforms(props) {
-      return { ...phongMaterial.defaultUniforms, ...props };
+      const uniforms = { ...props };
+      if (uniforms.specularColor) {
+        uniforms.specularColor = uniforms.specularColor.map((x) => x / 255);
+      }
+      return { ...phongMaterial.defaultUniforms, ...uniforms };
     }
   };
 

package/dist/dist.min.js

@@ -360,7 +360,7 @@ return pointLight.attenuation.x
 + pointLight.attenuation.y * distance
 + pointLight.attenuation.z * distance * distance;
 }
-`;var Wn=rt(ke(),1),jn=3,Oo=255,be;(function(n){n[n.POINT=0]="POINT",n[n.DIRECTIONAL=1]="DIRECTIONAL"})(be||(be={}));var Q={name:"lighting",vs:jt,fs:jt,getUniforms(n,e){return Uo(n)},defines:{MAX_LIGHTS:jn},uniformTypes:{enabled:"i32",lightType:"i32",directionalLightCount:"i32",pointLightCount:"i32",ambientLightColor:"vec3<f32>",lightColor0:"vec3<f32>",lightPosition0:"vec3<f32>",lightDirection0:"vec3<f32>",lightAttenuation0:"vec3<f32>",lightColor1:"vec3<f32>",lightPosition1:"vec3<f32>",lightDirection1:"vec3<f32>",lightAttenuation1:"vec3<f32>",lightColor2:"vec3<f32>",lightPosition2:"vec3<f32>",lightDirection2:"vec3<f32>",lightAttenuation2:"vec3<f32>"},defaultUniforms:{enabled:1,lightType:be.POINT,directionalLightCount:0,pointLightCount:0,ambientLightColor:[.1,.1,.1],lightColor0:[1,1,1],lightPosition0:[1,1,2],lightDirection0:[1,1,1],lightAttenuation0:[1,1,1],lightColor1:[1,1,1],lightPosition1:[1,1,2],lightDirection1:[1,1,1],lightAttenuation1:[1,1,1],lightColor2:[1,1,1],lightPosition2:[1,1,2],lightDirection2:[1,1,1],lightAttenuation2:[1,1,1]}};function Uo(n,e={}){if(n=n&&{...n},!n)return{...Q.defaultUniforms};n.lights&&(n={...n,...Do(n.lights),lights:void 0});let{ambientLight:t,pointLights:r,directionalLights:o}=n||{};if(!(t||r&&r.length>0||o&&o.length>0))return{...Q.defaultUniforms,enabled:0};let a={...Q.defaultUniforms,...e,...zo({ambientLight:t,pointLights:r,directionalLights:o})};return n.enabled!==void 0&&(a.enabled=n.enabled?1:0),a}function zo({ambientLight:n,pointLights:e=[],directionalLights:t=[]}){let r={};r.ambientLightColor=$t(n);let o=0;for(let i of e){r.lightType=be.POINT;let a=o;r[`lightColor${a}`]=$t(i),r[`lightPosition${a}`]=i.position,r[`lightAttenuation${a}`]=[i.attenuation||1,0,0],o++}for(let i of t){r.lightType=be.DIRECTIONAL;let a=o;r[`lightColor${a}`]=$t(i),r[`lightDirection${a}`]=i.direction,o++}return o>jn&&Wn.log.warn("MAX_LIGHTS exceeded")(),r.directionalLightCount=t.length,r.pointLightCount=e.length,r}function Do(n){let e={pointLights:[],directionalLights:[]};for(let t of n||[])switch(t.type){case"ambient":e.ambientLight=t;break;case"directional":e.directionalLights?.push(t);break;case"point":e.pointLights?.push(t);break;default:}return e}function $t(n={}){let{color:e=[0,0,0],intensity:t=1}=n;return e.map(r=>r*t/Oo)}var Yo=`out vec3 dirlight_vNormal;
+`;var Wn=rt(ke(),1),jn=3,Oo=255,be;(function(n){n[n.POINT=0]="POINT",n[n.DIRECTIONAL=1]="DIRECTIONAL"})(be||(be={}));var Q={name:"lighting",vs:jt,fs:jt,getUniforms(n,e){return Uo(n)},defines:{MAX_LIGHTS:jn},uniformTypes:{enabled:"i32",lightType:"i32",directionalLightCount:"i32",pointLightCount:"i32",ambientLightColor:"vec3<f32>",lightColor0:"vec3<f32>",lightPosition0:"vec3<f32>",lightDirection0:"vec3<f32>",lightAttenuation0:"vec3<f32>",lightColor1:"vec3<f32>",lightPosition1:"vec3<f32>",lightDirection1:"vec3<f32>",lightAttenuation1:"vec3<f32>",lightColor2:"vec3<f32>",lightPosition2:"vec3<f32>",lightDirection2:"vec3<f32>",lightAttenuation2:"vec3<f32>"},defaultUniforms:{enabled:1,lightType:be.POINT,directionalLightCount:0,pointLightCount:0,ambientLightColor:[.1,.1,.1],lightColor0:[1,1,1],lightPosition0:[1,1,2],lightDirection0:[1,1,1],lightAttenuation0:[1,0,0],lightColor1:[1,1,1],lightPosition1:[1,1,2],lightDirection1:[1,1,1],lightAttenuation1:[1,0,0],lightColor2:[1,1,1],lightPosition2:[1,1,2],lightDirection2:[1,1,1],lightAttenuation2:[1,0,0]}};function Uo(n,e={}){if(n=n&&{...n},!n)return{...Q.defaultUniforms};n.lights&&(n={...n,...Do(n.lights),lights:void 0});let{ambientLight:t,pointLights:r,directionalLights:o}=n||{};if(!(t||r&&r.length>0||o&&o.length>0))return{...Q.defaultUniforms,enabled:0};let a={...Q.defaultUniforms,...e,...zo({ambientLight:t,pointLights:r,directionalLights:o})};return n.enabled!==void 0&&(a.enabled=n.enabled?1:0),a}function zo({ambientLight:n,pointLights:e=[],directionalLights:t=[]}){let r={};r.ambientLightColor=$t(n);let o=0;for(let i of e){r.lightType=be.POINT;let a=o;r[`lightColor${a}`]=$t(i),r[`lightPosition${a}`]=i.position,r[`lightAttenuation${a}`]=i.attenuation||[1,0,0],o++}for(let i of t){r.lightType=be.DIRECTIONAL;let a=o;r[`lightColor${a}`]=$t(i),r[`lightDirection${a}`]=i.direction,o++}return o>jn&&Wn.log.warn("MAX_LIGHTS exceeded")(),r.directionalLightCount=t.length,r.pointLightCount=e.length,r}function Do(n){let e={pointLights:[],directionalLights:[]};for(let t of n||[])switch(t.type){case"ambient":e.ambientLight=t;break;case"directional":e.directionalLights?.push(t);break;case"point":e.pointLights?.push(t);break;default:}return e}function $t(n={}){let{color:e=[0,0,0],intensity:t=1}=n;return e.map(r=>r*t/Oo)}var Yo=`out vec3 dirlight_vNormal;
 void dirlight_setNormal(vec3 normal) {
 dirlight_vNormal = normalize(normal);
 }
@@ -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){return{...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){return{...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

@@ -1619,15 +1619,15 @@ var lighting = {
     lightPosition0: [1, 1, 2],
     // TODO - could combine direction and attenuation
     lightDirection0: [1, 1, 1],
-    lightAttenuation0: [1, 1, 1],
+    lightAttenuation0: [1, 0, 0],
     lightColor1: [1, 1, 1],
     lightPosition1: [1, 1, 2],
     lightDirection1: [1, 1, 1],
-    lightAttenuation1: [1, 1, 1],
+    lightAttenuation1: [1, 0, 0],
     lightColor2: [1, 1, 1],
     lightPosition2: [1, 1, 2],
     lightDirection2: [1, 1, 1],
-    lightAttenuation2: [1, 1, 1]
+    lightAttenuation2: [1, 0, 0]
   }
 };
 function getUniforms2(props, prevUniforms = {}) {
@@ -1662,7 +1662,7 @@ function getLightSourceUniforms({ ambientLight, pointLights = [], directionalLig
     const i = currentLight;
     lightSourceUniforms[`lightColor${i}`] = convertColor(pointLight);
     lightSourceUniforms[`lightPosition${i}`] = pointLight.position;
-    lightSourceUniforms[`lightAttenuation${i}`] = [pointLight.attenuation || 1, 0, 0];
+    lightSourceUniforms[`lightAttenuation${i}`] = pointLight.attenuation || [1, 0, 0];
     currentLight++;
   }
   for (const directionalLight of directionalLights) {
@@ -1816,7 +1816,11 @@ var gouraudMaterial = {
     specularColor: [0.15, 0.15, 0.15]
   },
   getUniforms(props) {
-    return { ...gouraudMaterial.defaultUniforms, ...props };
+    const uniforms = { ...props };
+    if (uniforms.specularColor) {
+      uniforms.specularColor = uniforms.specularColor.map((x) => x / 255);
+    }
+    return { ...gouraudMaterial.defaultUniforms, ...uniforms };
   }
 };
 
@@ -1843,7 +1847,11 @@ var phongMaterial = {
     specularColor: [0.15, 0.15, 0.15]
   },
   getUniforms(props) {
-    return { ...phongMaterial.defaultUniforms, ...props };
+    const uniforms = { ...props };
+    if (uniforms.specularColor) {
+      uniforms.specularColor = uniforms.specularColor.map((x) => x / 255);
+    }
+    return { ...phongMaterial.defaultUniforms, ...uniforms };
   }
 };