@luma.gl/shadertools 9.2.0-alpha.2 → 9.2.0-alpha.5

package/dist/dist.dev.js

@@ -8698,7 +8698,7 @@ fn getPointLightAttenuation(pointLight: PointLight, distance: f32) -> f32 {
       lightType: "i32",
       directionalLightCount: "i32",
       pointLightCount: "i32",
-      ambientLightColor: "vec3<f32>",
+      ambientColor: "vec3<f32>",
       // TODO define as arrays once we have appropriate uniformTypes
       lightColor0: "vec3<f32>",
       lightPosition0: "vec3<f32>",
@@ -8719,7 +8719,7 @@ fn getPointLightAttenuation(pointLight: PointLight, distance: f32) -> f32 {
       lightType: 0 /* POINT */,
       directionalLightCount: 0,
       pointLightCount: 0,
-      ambientLightColor: [0.1, 0.1, 0.1],
+      ambientColor: [0.1, 0.1, 0.1],
       lightColor0: [1, 1, 1],
       lightPosition0: [1, 1, 2],
       // TODO - could combine direction and attenuation
@@ -8768,7 +8768,7 @@ fn getPointLightAttenuation(pointLight: PointLight, distance: f32) -> f32 {
     directionalLights = []
   }) {
     const lightSourceUniforms = {};
-    lightSourceUniforms.ambientLightColor = convertColor(ambientLight);
+    lightSourceUniforms.ambientColor = convertColor(ambientLight);
     let currentLight = 0;
     for (const pointLight of pointLights) {
       lightSourceUniforms.lightType = 0 /* POINT */;
@@ -8913,7 +8913,7 @@ vec4 dirlight_filterColor(vec4 color) {
   );
   var PHONG_FS = (
     /* glsl */
-    `#define MAX_LIGHTS 1
+    `#define MAX_LIGHTS 3
 
 uniform phongMaterialUniforms {
   uniform float ambient;

package/dist/dist.min.js

@@ -1346,7 +1346,7 @@ fn getPointLightAttenuation(pointLight: PointLight, distance: f32) -> f32 {
        + pointLight.attenuation.y * distance
        + pointLight.attenuation.z * distance * distance;
 }
-`;var bs=5,xs=255,Ke;(function(a){a[a.POINT=0]="POINT",a[a.DIRECTIONAL=1]="DIRECTIONAL"})(Ke||(Ke={}));var te={props:{},uniforms:{},name:"lighting",defines:{},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:Ke.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]},source:pr,vs:pn,fs:pn,getUniforms:ys};function ys(a,e={}){if(a=a&&{...a},!a)return{...te.defaultUniforms};a.lights&&(a={...a,...ks(a.lights),lights:void 0});let{ambientLight:t,pointLights:n,directionalLights:r}=a||{};if(!(t||n&&n.length>0||r&&r.length>0))return{...te.defaultUniforms,enabled:0};let i={...te.defaultUniforms,...e,...ws({ambientLight:t,pointLights:n,directionalLights:r})};return a.enabled!==void 0&&(i.enabled=a.enabled?1:0),i}function ws({ambientLight:a,pointLights:e=[],directionalLights:t=[]}){let n={};n.ambientLightColor=dn(a);let r=0;for(let s of e){n.lightType=Ke.POINT;let i=r;n[`lightColor${i}`]=dn(s),n[`lightPosition${i}`]=s.position,n[`lightAttenuation${i}`]=s.attenuation||[1,0,0],r++}for(let s of t){n.lightType=Ke.DIRECTIONAL;let i=r;n[`lightColor${i}`]=dn(s),n[`lightDirection${i}`]=s.direction,r++}return r>bs&&dr.log.warn("MAX_LIGHTS exceeded")(),n.directionalLightCount=t.length,n.pointLightCount=e.length,n}function ks(a){let e={pointLights:[],directionalLights:[]};for(let t of a||[])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 dn(a={}){let{color:e=[0,0,0],intensity:t=1}=a;return e.map(n=>n*t/xs)}var Is=`  
+`;var bs=5,xs=255,Ke;(function(a){a[a.POINT=0]="POINT",a[a.DIRECTIONAL=1]="DIRECTIONAL"})(Ke||(Ke={}));var te={props:{},uniforms:{},name:"lighting",defines:{},uniformTypes:{enabled:"i32",lightType:"i32",directionalLightCount:"i32",pointLightCount:"i32",ambientColor:"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:Ke.POINT,directionalLightCount:0,pointLightCount:0,ambientColor:[.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]},source:pr,vs:pn,fs:pn,getUniforms:ys};function ys(a,e={}){if(a=a&&{...a},!a)return{...te.defaultUniforms};a.lights&&(a={...a,...ks(a.lights),lights:void 0});let{ambientLight:t,pointLights:n,directionalLights:r}=a||{};if(!(t||n&&n.length>0||r&&r.length>0))return{...te.defaultUniforms,enabled:0};let i={...te.defaultUniforms,...e,...ws({ambientLight:t,pointLights:n,directionalLights:r})};return a.enabled!==void 0&&(i.enabled=a.enabled?1:0),i}function ws({ambientLight:a,pointLights:e=[],directionalLights:t=[]}){let n={};n.ambientColor=dn(a);let r=0;for(let s of e){n.lightType=Ke.POINT;let i=r;n[`lightColor${i}`]=dn(s),n[`lightPosition${i}`]=s.position,n[`lightAttenuation${i}`]=s.attenuation||[1,0,0],r++}for(let s of t){n.lightType=Ke.DIRECTIONAL;let i=r;n[`lightColor${i}`]=dn(s),n[`lightDirection${i}`]=s.direction,r++}return r>bs&&dr.log.warn("MAX_LIGHTS exceeded")(),n.directionalLightCount=t.length,n.pointLightCount=e.length,n}function ks(a){let e={pointLights:[],directionalLights:[]};for(let t of a||[])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 dn(a={}){let{color:e=[0,0,0],intensity:t=1}=a;return e.map(n=>n*t/xs)}var Is=`  
 struct dirlightUniforms {
   lightDirection: vec3<f32>,
 };
@@ -1394,7 +1394,7 @@ vec4 dirlight_filterColor(vec4 color) {
   uniform float shininess;
   uniform vec3  specularColor;
 } material;
-`,Ft=`#define MAX_LIGHTS 1
+`,Ft=`#define MAX_LIGHTS 3
 
 uniform phongMaterialUniforms {
   uniform float ambient;

package/dist/index.cjs

@@ -2730,7 +2730,7 @@ var lighting = {
     lightType: "i32",
     directionalLightCount: "i32",
     pointLightCount: "i32",
-    ambientLightColor: "vec3<f32>",
+    ambientColor: "vec3<f32>",
     // TODO define as arrays once we have appropriate uniformTypes
     lightColor0: "vec3<f32>",
     lightPosition0: "vec3<f32>",
@@ -2751,7 +2751,7 @@ var lighting = {
     lightType: LIGHT_TYPE.POINT,
     directionalLightCount: 0,
     pointLightCount: 0,
-    ambientLightColor: [0.1, 0.1, 0.1],
+    ambientColor: [0.1, 0.1, 0.1],
     lightColor0: [1, 1, 1],
     lightPosition0: [1, 1, 2],
     // TODO - could combine direction and attenuation
@@ -2796,7 +2796,7 @@ function getUniforms2(props, prevUniforms = {}) {
 }
 function getLightSourceUniforms({ ambientLight, pointLights = [], directionalLights = [] }) {
   const lightSourceUniforms = {};
-  lightSourceUniforms.ambientLightColor = convertColor(ambientLight);
+  lightSourceUniforms.ambientColor = convertColor(ambientLight);
   let currentLight = 0;
   for (const pointLight of pointLights) {
     lightSourceUniforms.lightType = LIGHT_TYPE.POINT;
@@ -2942,7 +2942,7 @@ var PHONG_VS = (
 );
 var PHONG_FS = (
   /* glsl */
-  `#define MAX_LIGHTS 1
+  `#define MAX_LIGHTS 3
 
 uniform phongMaterialUniforms {
   uniform float ambient;