@luma.gl/shadertools 9.0.17 → 9.0.19

package/dist/dist.dev.js

@@ -5112,15 +5112,16 @@ struct DirectionalLight {
 
 uniform lightingUniforms {
   int enabled;
-  int pointLightCount;
+  int lightType;
+
   int directionalLightCount;
+  int pointLightCount;
 
   vec3 ambientColor;
 
-  int lightType;
   vec3 lightColor;
-  vec3 lightDirection;
   vec3 lightPosition;
+  vec3 lightDirection;
   vec3 lightAttenuation;
 
   // AmbientLight ambientLight;
@@ -5160,11 +5161,13 @@ float getPointLightAttenuation(PointLight pointLight, float distance) {
     },
     uniformTypes: {
       enabled: "i32",
-      ambientLightColor: "vec3<f32>",
-      numberOfLights: "i32",
-      // , array: MAX_LIGHTS,
       lightType: "i32",
       // , array: MAX_LIGHTS,
+      directionalLightCount: "i32",
+      // , array: MAX_LIGHTS,
+      pointLightCount: "i32",
+      // , array: MAX_LIGHTS,
+      ambientLightColor: "vec3<f32>",
       lightColor: "vec3<f32>",
       // , array: MAX_LIGHTS,
       lightPosition: "vec3<f32>",
@@ -5177,9 +5180,10 @@ float getPointLightAttenuation(PointLight pointLight, float distance) {
     },
     defaultUniforms: {
       enabled: 1,
-      ambientLightColor: [0.1, 0.1, 0.1],
-      numberOfLights: 0,
       lightType: 0 /* POINT */,
+      directionalLightCount: 0,
+      pointLightCount: 0,
+      ambientLightColor: [0.1, 0.1, 0.1],
       lightColor: [1, 1, 1],
       lightPosition: [1, 1, 2],
       // TODO - could combine direction and attenuation
@@ -5238,7 +5242,8 @@ float getPointLightAttenuation(PointLight pointLight, float distance) {
       lightSourceUniforms.lightDirection = directionalLight.direction;
       currentLight++;
     }
-    lightSourceUniforms.numberOfLights = currentLight;
+    lightSourceUniforms.directionalLightCount = directionalLights.length;
+    lightSourceUniforms.pointLightCount = pointLights.length;
     return lightSourceUniforms;
   }
   function extractLightTypes(lights2) {
@@ -5314,15 +5319,7 @@ vec4 dirlight_filterColor(vec4 color) {
 
   // src/modules/lighting/gouraud-material/gouraud-shaders-glsl.ts
   var GOURAUD_VS = glsl`\
-uniform materialUniforms {
-  uniform float ambient;
-  uniform float diffuse;
-  uniform float shininess;
-  uniform vec3  specularColor;
-} material;
-`;
-  var GOURAUD_FS = glsl`\
-uniform materialUniforms {
+uniform gouraudMaterialUniforms {
   uniform float ambient;
   uniform float diffuse;
   uniform float shininess;
@@ -5344,39 +5341,41 @@ vec3 lighting_getLightColor(vec3 surfaceColor, vec3 light_direction, vec3 view_d
 vec3 lighting_getLightColor(vec3 surfaceColor, vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {
   vec3 lightColor = surfaceColor;
 
-  if (lighting.enabled) {
-    vec3 view_direction = normalize(cameraPosition - position_worldspace);
-    lightColor = material.ambient * surfaceColor * lighting.ambientColor;
+  if (lighting.enabled == 0) {
+    return lightColor;
+  }
 
-    if (lighting.lightType == 0) {
-      PointLight pointLight = lighting_getPointLight(0);
-      vec3 light_position_worldspace = pointLight.position;
-      vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-      lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
-    } else if (lighting.lightType == 1) {
-      DirectionalLight directionalLight = lighting_getDirectionalLight(0);
-      lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
-    }
-    /*
-    for (int i = 0; i < MAX_LIGHTS; i++) {
-      if (i >= lighting.pointLightCount) {
-        break;
-      }
-      PointLight pointLight = lighting.pointLight[i];
-      vec3 light_position_worldspace = pointLight.position;
-      vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-      lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
+  vec3 view_direction = normalize(cameraPosition - position_worldspace);
+  lightColor = material.ambient * surfaceColor * lighting.ambientColor;
+
+  if (lighting.lightType == 0) {
+    PointLight pointLight = lighting_getPointLight(0);
+    vec3 light_position_worldspace = pointLight.position;
+    vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
+    lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
+  } else if (lighting.lightType == 1) {
+    DirectionalLight directionalLight = lighting_getDirectionalLight(0);
+    lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
+  }
+  /*
+  for (int i = 0; i < MAX_LIGHTS; i++) {
+    if (i >= lighting.pointLightCount) {
+      break;
     }
+    PointLight pointLight = lighting.pointLight[i];
+    vec3 light_position_worldspace = pointLight.position;
+    vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
+    lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
+  }
 
-    for (int i = 0; i < MAX_LIGHTS; i++) {
-      if (i >= lighting.directionalLightCount) {
-        break;
-      }
-      DirectionalLight directionalLight = lighting.directionalLight[i];
-      lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
+  for (int i = 0; i < MAX_LIGHTS; i++) {
+    if (i >= lighting.directionalLightCount) {
+      break;
     }
-    */
+    DirectionalLight directionalLight = lighting.directionalLight[i];
+    lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
   }
+  */
   return lightColor;
 }
 
@@ -5384,30 +5383,41 @@ vec3 lighting_getSpecularLightColor(vec3 cameraPosition, vec3 position_worldspac
   vec3 lightColor = vec3(0, 0, 0);
   vec3 surfaceColor = vec3(0, 0, 0);
 
-  if (lighting.enabled) {
-    vec3 view_direction = normalize(cameraPosition - position_worldspace);
+  if (lighting.enabled == 0) {
+    return lightColor;
+  }
 
-    switch (lighting.lightType) {
-      case 0:
-        PointLight pointLight = lighting_getPointLight(0);
-        vec3 light_position_worldspace = pointLight.position;
-        vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-        lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
-        break;
+  vec3 view_direction = normalize(cameraPosition - position_worldspace);
 
-      case 1:
-        DirectionalLight directionalLight = lighting_getDirectionalLight(0);
-        lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
-        break;
-    }
+  switch (lighting.lightType) {
+    case 0:
+      PointLight pointLight = lighting_getPointLight(0);
+      vec3 light_position_worldspace = pointLight.position;
+      vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
+      lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
+      break;
+
+    case 1:
+      DirectionalLight directionalLight = lighting_getDirectionalLight(0);
+      lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
+      break;
   }
+
   return lightColor;
 }
+`;
+  var GOURAUD_FS = glsl`\
+uniform gouraudMaterialUniforms {
+  uniform float ambient;
+  uniform float diffuse;
+  uniform float shininess;
+  uniform vec3  specularColor;
+} material;
 `;
 
   // src/modules/lighting/gouraud-material/gouraud-material.ts
   var gouraudMaterial = {
-    name: "gouraud-lighting",
+    name: "gouraudMaterial",
     // Note these are switched between phong and gouraud
     vs: GOURAUD_VS,
     fs: GOURAUD_FS,
@@ -5508,21 +5518,23 @@ vec3 lighting_getSpecularLightColor(vec3 cameraPosition, vec3 position_worldspac
   vec3 surfaceColor = vec3(0, 0, 0);
 
   if (lighting.enabled == 0) {
-    vec3 view_direction = normalize(cameraPosition - position_worldspace);
+    return lightColor;
+  }
 
-    switch (lighting.lightType) {
-      case 0:
-        PointLight pointLight = lighting_getPointLight(0);
-        vec3 light_position_worldspace = pointLight.position;
-        vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-        lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
-        break;
+  vec3 view_direction = normalize(cameraPosition - position_worldspace);
 
-      case 1:
-        DirectionalLight directionalLight = lighting_getDirectionalLight(0);
-        lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
-        break;
-    }
+  switch (lighting.lightType) {
+    case 0:
+      PointLight pointLight = lighting_getPointLight(0);
+      vec3 light_position_worldspace = pointLight.position;
+      vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
+      lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
+      break;
+
+    case 1:
+      DirectionalLight directionalLight = lighting_getDirectionalLight(0);
+      lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
+      break;
   }
   return lightColor;
 }
@@ -5530,7 +5542,7 @@ vec3 lighting_getSpecularLightColor(vec3 cameraPosition, vec3 position_worldspac
 
   // src/modules/lighting/phong-material/phong-material.ts
   var phongMaterial = {
-    name: "phong-lighting",
+    name: "phongMaterial",
     // Note these are switched between phong and gouraud
     vs: PHONG_VS,
     fs: PHONG_FS,

package/dist/dist.min.js

@@ -316,13 +316,13 @@ vec3 direction;
 };
 uniform lightingUniforms {
 int enabled;
-int pointLightCount;
+int lightType;
 int directionalLightCount;
+int pointLightCount;
 vec3 ambientColor;
-int lightType;
 vec3 lightColor;
-vec3 lightDirection;
 vec3 lightPosition;
+vec3 lightDirection;
 vec3 lightAttenuation;
 } lighting;
 PointLight lighting_getPointLight(int index) {
@@ -336,7 +336,7 @@ return pointLight.attenuation.x
 + pointLight.attenuation.y * distance
 + pointLight.attenuation.z * distance * distance;
 }
-`;var Oo=5,Uo=255,be;(function(n){n[n.POINT=0]="POINT",n[n.DIRECTIONAL=1]="DIRECTIONAL"})(be||(be={}));var Q={name:"lighting",vs:Gt,fs:Gt,getUniforms(n,e){return zo(n)},defines:{MAX_LIGHTS:Oo},uniformTypes:{enabled:"i32",ambientLightColor:"vec3<f32>",numberOfLights:"i32",lightType:"i32",lightColor:"vec3<f32>",lightPosition:"vec3<f32>",lightDirection:"vec3<f32>",lightAttenuation:"vec3<f32>"},defaultUniforms:{enabled:1,ambientLightColor:[.1,.1,.1],numberOfLights:0,lightType:be.POINT,lightColor:[1,1,1],lightPosition:[1,1,2],lightDirection:[1,1,1],lightAttenuation:[1,1,1]}};function zo(n,e={}){if(n=n&&{...n},!n)return{...Q.defaultUniforms};n.lights&&(n={...n,...Yo(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,...Do({ambientLight:t,pointLights:r,directionalLights:o})};return n.enabled!==void 0&&(a.enabled=n.enabled?1:0),a}function Do({ambientLight:n,pointLights:e=[],directionalLights:t=[]}){let r={};r.ambientLightColor=Ht(n);let o=0;for(let i of e)r.lightType=be.POINT,r.lightColor=Ht(i),r.lightPosition=i.position,r.lightAttenuation=[i.attenuation||1,0,0],o++;for(let i of t)r.lightType=be.DIRECTIONAL,r.lightColor=Ht(i),r.lightPosition=i.position,r.lightDirection=i.direction,o++;return r.numberOfLights=o,r}function Yo(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 Ht(n={}){let{color:e=[0,0,0],intensity:t=1}=n;return e.map(r=>r*t/Uo)}var Xo=`out vec3 dirlight_vNormal;
+`;var Oo=5,Uo=255,be;(function(n){n[n.POINT=0]="POINT",n[n.DIRECTIONAL=1]="DIRECTIONAL"})(be||(be={}));var Q={name:"lighting",vs:Gt,fs:Gt,getUniforms(n,e){return zo(n)},defines:{MAX_LIGHTS:Oo},uniformTypes:{enabled:"i32",lightType:"i32",directionalLightCount:"i32",pointLightCount:"i32",ambientLightColor:"vec3<f32>",lightColor:"vec3<f32>",lightPosition:"vec3<f32>",lightDirection:"vec3<f32>",lightAttenuation:"vec3<f32>"},defaultUniforms:{enabled:1,lightType:be.POINT,directionalLightCount:0,pointLightCount:0,ambientLightColor:[.1,.1,.1],lightColor:[1,1,1],lightPosition:[1,1,2],lightDirection:[1,1,1],lightAttenuation:[1,1,1]}};function zo(n,e={}){if(n=n&&{...n},!n)return{...Q.defaultUniforms};n.lights&&(n={...n,...Yo(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,...Do({ambientLight:t,pointLights:r,directionalLights:o})};return n.enabled!==void 0&&(a.enabled=n.enabled?1:0),a}function Do({ambientLight:n,pointLights:e=[],directionalLights:t=[]}){let r={};r.ambientLightColor=Ht(n);let o=0;for(let i of e)r.lightType=be.POINT,r.lightColor=Ht(i),r.lightPosition=i.position,r.lightAttenuation=[i.attenuation||1,0,0],o++;for(let i of t)r.lightType=be.DIRECTIONAL,r.lightColor=Ht(i),r.lightPosition=i.position,r.lightDirection=i.direction,o++;return r.directionalLightCount=t.length,r.pointLightCount=e.length,r}function Yo(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 Ht(n={}){let{color:e=[0,0,0],intensity:t=1}=n;return e.map(r=>r*t/Uo)}var Xo=`out vec3 dirlight_vNormal;
 void dirlight_setNormal(vec3 normal) {
 dirlight_vNormal = normalize(normal);
 }
@@ -348,13 +348,7 @@ vec4 dirlight_filterColor(vec4 color) {
 float d = abs(dot(dirlight_vNormal, normalize(dirlight.lightDirection)));
 return vec4(color.rgb * d, color.a);
 }
-`,Wt={name:"dirlight",dependencies:[],vs:Xo,fs:Bo,uniformTypes:{lightDirection:"vec3<f32>"},defaultUniforms:{lightDirection:[1,1,2]},getUniforms:Qo};function Qo(n=Wt.defaultUniforms){let e={};return n.lightDirection&&(e.dirlight_uLightDirection=n.lightDirection),e}var Gn=`uniform materialUniforms {
-uniform float ambient;
-uniform float diffuse;
-uniform float shininess;
-uniform vec3  specularColor;
-} material;
-`,Hn=`uniform materialUniforms {
+`,Wt={name:"dirlight",dependencies:[],vs:Xo,fs:Bo,uniformTypes:{lightDirection:"vec3<f32>"},defaultUniforms:{lightDirection:[1,1,2]},getUniforms:Qo};function Qo(n=Wt.defaultUniforms){let e={};return n.lightDirection&&(e.dirlight_uLightDirection=n.lightDirection),e}var Gn=`uniform gouraudMaterialUniforms {
 uniform float ambient;
 uniform float diffuse;
 uniform float shininess;
@@ -373,7 +367,9 @@ return (lambertian * material.diffuse * surfaceColor + specular * material.specu
 }
 vec3 lighting_getLightColor(vec3 surfaceColor, vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {
 vec3 lightColor = surfaceColor;
-if (lighting.enabled) {
+if (lighting.enabled == 0) {
+return lightColor;
+}
 vec3 view_direction = normalize(cameraPosition - position_worldspace);
 lightColor = material.ambient * surfaceColor * lighting.ambientColor;
 if (lighting.lightType == 0) {
@@ -385,13 +381,14 @@ lightColor += lighting_getLightColor(surfaceColor, light_direction, view_directi
 DirectionalLight directionalLight = lighting_getDirectionalLight(0);
 lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
 }
-}
 return lightColor;
 }
 vec3 lighting_getSpecularLightColor(vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {
 vec3 lightColor = vec3(0, 0, 0);
 vec3 surfaceColor = vec3(0, 0, 0);
-if (lighting.enabled) {
+if (lighting.enabled == 0) {
+return lightColor;
+}
 vec3 view_direction = normalize(cameraPosition - position_worldspace);
 switch (lighting.lightType) {
 case 0:
@@ -405,10 +402,15 @@ DirectionalLight directionalLight = lighting_getDirectionalLight(0);
 lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
 break;
 }
-}
 return lightColor;
 }
-`;var jt={name:"gouraud-lighting",vs:Gn,fs:Hn,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{...jt.defaultUniforms,...n}}};var Wn=`uniform phongMaterialUniforms {
+`,Hn=`uniform gouraudMaterialUniforms {
+uniform float ambient;
+uniform float diffuse;
+uniform float shininess;
+uniform vec3  specularColor;
+} material;
+`;var jt={name:"gouraudMaterial",vs:Gn,fs:Hn,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{...jt.defaultUniforms,...n}}};var Wn=`uniform phongMaterialUniforms {
 uniform float ambient;
 uniform float diffuse;
 uniform float shininess;
@@ -453,6 +455,8 @@ vec3 lighting_getSpecularLightColor(vec3 cameraPosition, vec3 position_worldspac
 vec3 lightColor = vec3(0, 0, 0);
 vec3 surfaceColor = vec3(0, 0, 0);
 if (lighting.enabled == 0) {
+return lightColor;
+}
 vec3 view_direction = normalize(cameraPosition - position_worldspace);
 switch (lighting.lightType) {
 case 0:
@@ -466,10 +470,9 @@ DirectionalLight directionalLight = lighting_getDirectionalLight(0);
 lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
 break;
 }
-}
 return lightColor;
 }
-`;var $t={name:"phong-lighting",vs:Wn,fs:jn,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{...$t.defaultUniforms,...n}}};var $n=`uniform projection {
+`;var $t={name:"phongMaterial",vs:Wn,fs:jn,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{...$t.defaultUniforms,...n}}};var $n=`uniform projection {
 mat4 u_MVPMatrix;
 mat4 u_ModelMatrix;
 mat4 u_NormalMatrix;

package/dist/index.cjs

@@ -1523,13 +1523,13 @@ vec3 direction;
 };
 uniform lightingUniforms {
 int enabled;
-int pointLightCount;
+int lightType;
 int directionalLightCount;
+int pointLightCount;
 vec3 ambientColor;
-int lightType;
 vec3 lightColor;
-vec3 lightDirection;
 vec3 lightPosition;
+vec3 lightDirection;
 vec3 lightAttenuation;
 } lighting;
 PointLight lighting_getPointLight(int index) {
@@ -1565,11 +1565,13 @@ var lighting = {
   },
   uniformTypes: {
     enabled: "i32",
-    ambientLightColor: "vec3<f32>",
-    numberOfLights: "i32",
-    // , array: MAX_LIGHTS,
     lightType: "i32",
     // , array: MAX_LIGHTS,
+    directionalLightCount: "i32",
+    // , array: MAX_LIGHTS,
+    pointLightCount: "i32",
+    // , array: MAX_LIGHTS,
+    ambientLightColor: "vec3<f32>",
     lightColor: "vec3<f32>",
     // , array: MAX_LIGHTS,
     lightPosition: "vec3<f32>",
@@ -1582,9 +1584,10 @@ var lighting = {
   },
   defaultUniforms: {
     enabled: 1,
-    ambientLightColor: [0.1, 0.1, 0.1],
-    numberOfLights: 0,
     lightType: LIGHT_TYPE.POINT,
+    directionalLightCount: 0,
+    pointLightCount: 0,
+    ambientLightColor: [0.1, 0.1, 0.1],
     lightColor: [1, 1, 1],
     lightPosition: [1, 1, 2],
     // TODO - could combine direction and attenuation
@@ -1639,7 +1642,8 @@ function getLightSourceUniforms({ ambientLight, pointLights = [], directionalLig
     lightSourceUniforms.lightDirection = directionalLight.direction;
     currentLight++;
   }
-  lightSourceUniforms.numberOfLights = currentLight;
+  lightSourceUniforms.directionalLightCount = directionalLights.length;
+  lightSourceUniforms.pointLightCount = pointLights.length;
   return lightSourceUniforms;
 }
 function extractLightTypes(lights2) {
@@ -1709,14 +1713,7 @@ function getUniforms3(opts = dirlight.defaultUniforms) {
 }
 
 // dist/modules/lighting/gouraud-material/gouraud-shaders-glsl.js
-var GOURAUD_VS = `uniform materialUniforms {
-uniform float ambient;
-uniform float diffuse;
-uniform float shininess;
-uniform vec3  specularColor;
-} material;
-`;
-var GOURAUD_FS = `uniform materialUniforms {
+var GOURAUD_VS = `uniform gouraudMaterialUniforms {
 uniform float ambient;
 uniform float diffuse;
 uniform float shininess;
@@ -1735,7 +1732,9 @@ return (lambertian * material.diffuse * surfaceColor + specular * material.specu
 }
 vec3 lighting_getLightColor(vec3 surfaceColor, vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {
 vec3 lightColor = surfaceColor;
-if (lighting.enabled) {
+if (lighting.enabled == 0) {
+return lightColor;
+}
 vec3 view_direction = normalize(cameraPosition - position_worldspace);
 lightColor = material.ambient * surfaceColor * lighting.ambientColor;
 if (lighting.lightType == 0) {
@@ -1747,13 +1746,14 @@ lightColor += lighting_getLightColor(surfaceColor, light_direction, view_directi
 DirectionalLight directionalLight = lighting_getDirectionalLight(0);
 lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
 }
-}
 return lightColor;
 }
 vec3 lighting_getSpecularLightColor(vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {
 vec3 lightColor = vec3(0, 0, 0);
 vec3 surfaceColor = vec3(0, 0, 0);
-if (lighting.enabled) {
+if (lighting.enabled == 0) {
+return lightColor;
+}
 vec3 view_direction = normalize(cameraPosition - position_worldspace);
 switch (lighting.lightType) {
 case 0:
@@ -1767,14 +1767,20 @@ DirectionalLight directionalLight = lighting_getDirectionalLight(0);
 lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
 break;
 }
-}
 return lightColor;
 }
 `;
+var GOURAUD_FS = `uniform gouraudMaterialUniforms {
+uniform float ambient;
+uniform float diffuse;
+uniform float shininess;
+uniform vec3  specularColor;
+} material;
+`;
 
 // dist/modules/lighting/gouraud-material/gouraud-material.js
 var gouraudMaterial = {
-  name: "gouraud-lighting",
+  name: "gouraudMaterial",
   // Note these are switched between phong and gouraud
   vs: GOURAUD_VS,
   fs: GOURAUD_FS,
@@ -1846,6 +1852,8 @@ vec3 lighting_getSpecularLightColor(vec3 cameraPosition, vec3 position_worldspac
 vec3 lightColor = vec3(0, 0, 0);
 vec3 surfaceColor = vec3(0, 0, 0);
 if (lighting.enabled == 0) {
+return lightColor;
+}
 vec3 view_direction = normalize(cameraPosition - position_worldspace);
 switch (lighting.lightType) {
 case 0:
@@ -1859,14 +1867,13 @@ DirectionalLight directionalLight = lighting_getDirectionalLight(0);
 lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
 break;
 }
-}
 return lightColor;
 }
 `;
 
 // dist/modules/lighting/phong-material/phong-material.js
 var phongMaterial = {
-  name: "phong-lighting",
+  name: "phongMaterial",
   // Note these are switched between phong and gouraud
   vs: PHONG_VS,
   fs: PHONG_FS,