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

package/dist/modules/lighting/pbr-material/pbr-material.js

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { lighting } from "../lights/lighting.js";
-import { vs } from "./pbr-vertex-glsl.js";
-import { fs } from "./pbr-fragment-glsl.js";
+import { vs, fs } from "./pbr-material-glsl.js";
+import { source } from "./pbr-material-wgsl.js";
 import { pbrProjection } from "./pbr-projection.js";
 /**
  * An implementation of PBR (Physically-Based Rendering).
@@ -14,19 +14,19 @@ export const pbrMaterial = {
     uniforms: {},
     name: 'pbrMaterial',
     dependencies: [lighting, pbrProjection],
+    source,
     vs,
     fs,
     defines: {
-        LIGHTING_FRAGMENT: 1
-        // TODO defining these as 0 breaks shader
-        // HAS_NORMALMAP: 0
-        // HAS_EMISSIVEMAP: 0,
-        // HAS_OCCLUSIONMAP: 0,
-        // HAS_BASECOLORMAP: 0,
-        // HAS_METALROUGHNESSMAP: 0,
-        // ALPHA_CUTOFF: 0
-        // USE_IBL: 0
-        // PBR_DEBUG: 0
+        LIGHTING_FRAGMENT: true,
+        HAS_NORMALMAP: false,
+        HAS_EMISSIVEMAP: false,
+        HAS_OCCLUSIONMAP: false,
+        HAS_BASECOLORMAP: false,
+        HAS_METALROUGHNESSMAP: false,
+        ALPHA_CUTOFF: false,
+        USE_IBL: false,
+        PBR_DEBUG: false
     },
     getUniforms: props => props,
     uniformTypes: {

package/dist/modules/lighting/pbr-material/pbr-material.js.map

@@ -1 +1 @@
-{"version":3,"file":"pbr-material.js","sourceRoot":"","sources":["../../../../src/modules/lighting/pbr-material/pbr-material.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAepC,OAAO,EAAC,QAAQ,EAAC,8BAA2B;AAE5C,OAAO,EAAC,EAAE,EAAC,6BAA0B;AACrC,OAAO,EAAC,EAAE,EAAC,+BAA4B;AACvC,OAAO,EAAC,aAAa,EAAC,4BAAyB;AAmD/C;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,KAAK,EAAE,EAAsB;IAC7B,QAAQ,EAAE,EAAyB;IAEnC,IAAI,EAAE,aAAa;IACnB,YAAY,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC;IACvC,EAAE;IACF,EAAE;IAEF,OAAO,EAAE;QACP,iBAAiB,EAAE,CAAC;QACpB,yCAAyC;QACzC,mBAAmB;QACnB,sBAAsB;QACtB,uBAAuB;QACvB,uBAAuB;QACvB,4BAA4B;QAC5B,kBAAkB;QAClB,aAAa;QACb,eAAe;KAChB;IACD,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK;IAC3B,YAAY,EAAE;QACZ,oBAAoB;QACpB,KAAK,EAAE,KAAK;QAEZ,iBAAiB;QACjB,mBAAmB,EAAE,KAAK;QAC1B,eAAe,EAAE,WAAW;QAE5B,gBAAgB,EAAE,KAAK;QACvB,WAAW,EAAE,KAAK,EAAE,uBAAuB;QAE3C,kBAAkB,EAAE,KAAK;QACzB,cAAc,EAAE,WAAW,EAAE,yBAAyB;QAEtD,uBAAuB,EAAE,WAAW;QACpC,2BAA2B,EAAE,KAAK;QAElC,mBAAmB,EAAE,KAAK;QAC1B,iBAAiB,EAAE,KAAK,EAAE,0BAA0B;QAEpD,kBAAkB,EAAE,KAAK;QACzB,WAAW,EAAE,KAAK,EAAE,sBAAsB;QAE1C,MAAM;QACN,UAAU,EAAE,KAAK;QACjB,eAAe,EAAE,WAAW,EAAE,iBAAiB;QAE/C,uEAAuE;QACvE,mBAAmB;QACnB,eAAe,EAAE,WAAW;QAC5B,YAAY,EAAE,WAAW;KAC1B;CAC0F,CAAC"}
+{"version":3,"file":"pbr-material.js","sourceRoot":"","sources":["../../../../src/modules/lighting/pbr-material/pbr-material.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAepC,OAAO,EAAC,QAAQ,EAAC,8BAA2B;AAE5C,OAAO,EAAC,EAAE,EAAE,EAAE,EAAC,+BAA4B;AAC3C,OAAO,EAAC,MAAM,EAAC,+BAA4B;AAC3C,OAAO,EAAC,aAAa,EAAC,4BAAyB;AAmD/C;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,KAAK,EAAE,EAAsB;IAC7B,QAAQ,EAAE,EAAyB;IAEnC,IAAI,EAAE,aAAa;IACnB,YAAY,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC;IACvC,MAAM;IACN,EAAE;IACF,EAAE;IAEF,OAAO,EAAE;QACP,iBAAiB,EAAE,IAAI;QACvB,aAAa,EAAE,KAAK;QACpB,eAAe,EAAE,KAAK;QACtB,gBAAgB,EAAE,KAAK;QACvB,gBAAgB,EAAE,KAAK;QACvB,qBAAqB,EAAE,KAAK;QAC5B,YAAY,EAAE,KAAK;QACnB,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,KAAK;KACjB;IACD,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK;IAC3B,YAAY,EAAE;QACZ,oBAAoB;QACpB,KAAK,EAAE,KAAK;QAEZ,iBAAiB;QACjB,mBAAmB,EAAE,KAAK;QAC1B,eAAe,EAAE,WAAW;QAE5B,gBAAgB,EAAE,KAAK;QACvB,WAAW,EAAE,KAAK,EAAE,uBAAuB;QAE3C,kBAAkB,EAAE,KAAK;QACzB,cAAc,EAAE,WAAW,EAAE,yBAAyB;QAEtD,uBAAuB,EAAE,WAAW;QACpC,2BAA2B,EAAE,KAAK;QAElC,mBAAmB,EAAE,KAAK;QAC1B,iBAAiB,EAAE,KAAK,EAAE,0BAA0B;QAEpD,kBAAkB,EAAE,KAAK;QACzB,WAAW,EAAE,KAAK,EAAE,sBAAsB;QAE1C,MAAM;QACN,UAAU,EAAE,KAAK;QACjB,eAAe,EAAE,WAAW,EAAE,iBAAiB;QAE/C,uEAAuE;QACvE,mBAAmB;QACnB,eAAe,EAAE,WAAW;QAC5B,YAAY,EAAE,WAAW;KAC1B;CAC0F,CAAC"}

package/dist/modules/lighting/pbr-material/pbr-projection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pbr-projection.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/pbr-material/pbr-projection.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,YAAY,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AAE/D,OAAO,EAAC,YAAY,EAAC,oDAAiD;AAWtE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,yBAAyB,EAAE,aAAa,CAAC;IACzC,WAAW,EAAE,aAAa,CAAC;IAC3B,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,kBAAkB,CAY1D,CAAC"}
+{"version":3,"file":"pbr-projection.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/pbr-material/pbr-projection.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AAE/D,OAAO,EAAC,YAAY,EAAC,oDAAiD;AAWtE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,yBAAyB,EAAE,aAAa,CAAC;IACzC,WAAW,EAAE,aAAa,CAAC;IAC3B,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,kBAAkB,CAY1D,CAAC"}

package/dist/modules/lighting/pbr-material/pbr-projection.js.map

@@ -1 +1 @@
-{"version":3,"file":"pbr-projection.js","sourceRoot":"","sources":["../../../../src/modules/lighting/pbr-material/pbr-projection.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAQpC,MAAM,YAAY,GAAG,UAAU,CAAC;;;;;;;CAO/B,CAAC;AASF,MAAM,CAAC,MAAM,aAAa,GAAqC;IAC7D,IAAI,EAAE,eAAe;IACrB,EAAE,EAAE,YAAY;IAChB,EAAE,EAAE,YAAY;IAChB,2BAA2B;IAC3B,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK;IAC3B,YAAY,EAAE;QACZ,yBAAyB,EAAE,aAAa;QACxC,WAAW,EAAE,aAAa;QAC1B,YAAY,EAAE,aAAa;QAC3B,MAAM,EAAE,WAAW;KACpB;CACF,CAAC"}
+{"version":3,"file":"pbr-projection.js","sourceRoot":"","sources":["../../../../src/modules/lighting/pbr-material/pbr-projection.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAMpC,MAAM,YAAY,GAAG,UAAU,CAAC;;;;;;;CAO/B,CAAC;AASF,MAAM,CAAC,MAAM,aAAa,GAAqC;IAC7D,IAAI,EAAE,eAAe;IACrB,EAAE,EAAE,YAAY;IAChB,EAAE,EAAE,YAAY;IAChB,2BAA2B;IAC3B,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK;IAC3B,YAAY,EAAE;QACZ,yBAAyB,EAAE,aAAa;QACxC,WAAW,EAAE,aAAa;QAC1B,YAAY,EAAE,aAAa;QAC3B,MAAM,EAAE,WAAW;KACpB;CACF,CAAC"}

package/dist/modules/lighting/phong-material/phong-material.js

@@ -13,7 +13,7 @@ export const phongMaterial = {
     vs: PHONG_VS,
     fs: PHONG_FS,
     defines: {
-        LIGHTING_FRAGMENT: 1
+        LIGHTING_FRAGMENT: true
     },
     uniformTypes: {
         ambient: 'f32',

package/dist/modules/lighting/phong-material/phong-material.js.map

@@ -1 +1 @@
-{"version":3,"file":"phong-material.js","sourceRoot":"","sources":["../../../../src/modules/lighting/phong-material/phong-material.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,OAAO,EAAC,QAAQ,EAAC,8BAA2B;AAC5C,OAAO,EAAC,UAAU,EAAC,gCAA6B;AAChD,OAAO,EAAC,QAAQ,EAAE,QAAQ,EAAC,gCAA6B;AAUxD,wIAAwI;AACxI,MAAM,CAAC,MAAM,aAAa,GAAqC;IAC7D,IAAI,EAAE,eAAe;IACrB,YAAY,EAAE,CAAC,QAAQ,CAAC;IACxB,oDAAoD;IACpD,MAAM,EAAE,UAAU;IAClB,EAAE,EAAE,QAAQ;IACZ,EAAE,EAAE,QAAQ;IACZ,OAAO,EAAE;QACP,iBAAiB,EAAE,CAAC;KACrB;IACD,YAAY,EAAE;QACZ,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,KAAK;QAChB,aAAa,EAAE,WAAW;KAC3B;IACD,eAAe,EAAE;QACf,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,GAAG;QACZ,SAAS,EAAE,EAAE;QACb,aAAa,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;KAClC;IACD,WAAW,CAAC,KAA0B;QACpC,MAAM,QAAQ,GAAG,EAAC,GAAG,KAAK,EAAC,CAAC;QAC5B,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;YAC3B,QAAQ,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,CAAiB,CAAC;QACpF,CAAC;QACD,OAAO,EAAC,GAAG,aAAa,CAAC,eAAe,EAAE,GAAG,QAAQ,EAAC,CAAC;IACzD,CAAC;CACF,CAAC"}
+{"version":3,"file":"phong-material.js","sourceRoot":"","sources":["../../../../src/modules/lighting/phong-material/phong-material.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,OAAO,EAAC,QAAQ,EAAC,8BAA2B;AAC5C,OAAO,EAAC,UAAU,EAAC,gCAA6B;AAChD,OAAO,EAAC,QAAQ,EAAE,QAAQ,EAAC,gCAA6B;AAUxD,wIAAwI;AACxI,MAAM,CAAC,MAAM,aAAa,GAAqC;IAC7D,IAAI,EAAE,eAAe;IACrB,YAAY,EAAE,CAAC,QAAQ,CAAC;IACxB,oDAAoD;IACpD,MAAM,EAAE,UAAU;IAClB,EAAE,EAAE,QAAQ;IACZ,EAAE,EAAE,QAAQ;IACZ,OAAO,EAAE;QACP,iBAAiB,EAAE,IAAI;KACxB;IACD,YAAY,EAAE;QACZ,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,KAAK;QAChB,aAAa,EAAE,WAAW;KAC3B;IACD,eAAe,EAAE;QACf,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,GAAG;QACZ,SAAS,EAAE,EAAE;QACb,aAAa,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;KAClC;IACD,WAAW,CAAC,KAA0B;QACpC,MAAM,QAAQ,GAAG,EAAC,GAAG,KAAK,EAAC,CAAC;QAC5B,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;YAC3B,QAAQ,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,CAAiB,CAAC;QACpF,CAAC;QACD,OAAO,EAAC,GAAG,aAAa,CAAC,eAAe,EAAE,GAAG,QAAQ,EAAC,CAAC;IACzD,CAAC;CACF,CAAC"}

package/dist/modules/lighting/phong-material/phong-shaders-glsl.d.ts

@@ -1,3 +1,3 @@
 export declare const PHONG_VS = "uniform phongMaterialUniforms {\n  uniform float ambient;\n  uniform float diffuse;\n  uniform float shininess;\n  uniform vec3  specularColor;\n} material;\n";
-export declare const PHONG_FS = "uniform phongMaterialUniforms {\n  uniform float ambient;\n  uniform float diffuse;\n  uniform float shininess;\n  uniform vec3  specularColor;\n} material;\n\nvec3 lighting_getLightColor(vec3 surfaceColor, vec3 light_direction, vec3 view_direction, vec3 normal_worldspace, vec3 color) {\n  vec3 halfway_direction = normalize(light_direction + view_direction);\n  float lambertian = dot(light_direction, normal_worldspace);\n  float specular = 0.0;\n  if (lambertian > 0.0) {\n    float specular_angle = max(dot(normal_worldspace, halfway_direction), 0.0);\n    specular = pow(specular_angle, material.shininess);\n  }\n  lambertian = max(lambertian, 0.0);\n  return (lambertian * material.diffuse * surfaceColor + specular * material.specularColor) * color;\n}\n\nvec3 lighting_getLightColor(vec3 surfaceColor, vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {\n  vec3 lightColor = surfaceColor;\n\n  if (lighting.enabled == 0) {\n    return lightColor;\n  }\n\n  vec3 view_direction = normalize(cameraPosition - position_worldspace);\n  lightColor = material.ambient * surfaceColor * lighting.ambientColor;\n\n  for (int i = 0; i < lighting.pointLightCount; i++) {\n    PointLight pointLight = lighting_getPointLight(i);\n    vec3 light_position_worldspace = pointLight.position;\n    vec3 light_direction = normalize(light_position_worldspace - position_worldspace);\n    float light_attenuation = getPointLightAttenuation(pointLight, distance(light_position_worldspace, position_worldspace));\n    lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color / light_attenuation);\n  }\n\n  int totalLights = min(MAX_LIGHTS, lighting.pointLightCount + lighting.directionalLightCount);\n  for (int i = lighting.pointLightCount; i < totalLights; i++) {\n    DirectionalLight directionalLight = lighting_getDirectionalLight(i);\n    lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);\n  }\n  \n  return lightColor;\n}\n";
+export declare const PHONG_FS = "#define MAX_LIGHTS 1\n\nuniform phongMaterialUniforms {\n  uniform float ambient;\n  uniform float diffuse;\n  uniform float shininess;\n  uniform vec3  specularColor;\n} material;\n\nvec3 lighting_getLightColor(vec3 surfaceColor, vec3 light_direction, vec3 view_direction, vec3 normal_worldspace, vec3 color) {\n  vec3 halfway_direction = normalize(light_direction + view_direction);\n  float lambertian = dot(light_direction, normal_worldspace);\n  float specular = 0.0;\n  if (lambertian > 0.0) {\n    float specular_angle = max(dot(normal_worldspace, halfway_direction), 0.0);\n    specular = pow(specular_angle, material.shininess);\n  }\n  lambertian = max(lambertian, 0.0);\n  return (lambertian * material.diffuse * surfaceColor + specular * material.specularColor) * color;\n}\n\nvec3 lighting_getLightColor(vec3 surfaceColor, vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {\n  vec3 lightColor = surfaceColor;\n\n  if (lighting.enabled == 0) {\n    return lightColor;\n  }\n\n  vec3 view_direction = normalize(cameraPosition - position_worldspace);\n  lightColor = material.ambient * surfaceColor * lighting.ambientColor;\n\n  for (int i = 0; i < lighting.pointLightCount; i++) {\n    PointLight pointLight = lighting_getPointLight(i);\n    vec3 light_position_worldspace = pointLight.position;\n    vec3 light_direction = normalize(light_position_worldspace - position_worldspace);\n    float light_attenuation = getPointLightAttenuation(pointLight, distance(light_position_worldspace, position_worldspace));\n    lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color / light_attenuation);\n  }\n\n  int totalLights = min(MAX_LIGHTS, lighting.pointLightCount + lighting.directionalLightCount);\n  for (int i = lighting.pointLightCount; i < totalLights; i++) {\n    DirectionalLight directionalLight = lighting_getDirectionalLight(i);\n    lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);\n  }\n  \n  return lightColor;\n}\n";
 //# sourceMappingURL=phong-shaders-glsl.d.ts.map

package/dist/modules/lighting/phong-material/phong-shaders-glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"phong-shaders-glsl.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/phong-material/phong-shaders-glsl.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,QAAQ,mKAOpB,CAAC;AAEF,eAAO,MAAM,QAAQ,gjEA8CpB,CAAC"}
+{"version":3,"file":"phong-shaders-glsl.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/phong-material/phong-shaders-glsl.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,QAAQ,mKAOpB,CAAC;AAEF,eAAO,MAAM,QAAQ,wkEAgDpB,CAAC"}

package/dist/modules/lighting/phong-material/phong-shaders-glsl.js

@@ -10,6 +10,8 @@ uniform phongMaterialUniforms {
 } material;
 `;
 export const PHONG_FS = /* glsl */ `\
+#define MAX_LIGHTS 1
+
 uniform phongMaterialUniforms {
   uniform float ambient;
   uniform float diffuse;

package/dist/modules/lighting/phong-material/phong-shaders-glsl.js.map

@@ -1 +1 @@
-{"version":3,"file":"phong-shaders-glsl.js","sourceRoot":"","sources":["../../../../src/modules/lighting/phong-material/phong-shaders-glsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC;;;;;;;CAOlC,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8ClC,CAAC"}
+{"version":3,"file":"phong-shaders-glsl.js","sourceRoot":"","sources":["../../../../src/modules/lighting/phong-material/phong-shaders-glsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC;;;;;;;CAOlC,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgDlC,CAAC"}

package/dist/modules/math/random/random.d.ts

@@ -1,6 +1,7 @@
 /** Quick random generator for fragment shaders */
 export declare const random: {
     readonly name: "random";
+    readonly source: "fn random(scale: vec3f, seed: float) -> f32 {\n  /* use the fragment position for a different seed per-pixel */\n  return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);\n}\n";
     readonly fs: "float random(vec3 scale, float seed) {\n  /* use the fragment position for a different seed per-pixel */\n  return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);\n}\n";
 };
 //# sourceMappingURL=random.d.ts.map

package/dist/modules/math/random/random.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"random.d.ts","sourceRoot":"","sources":["../../../../src/modules/math/random/random.ts"],"names":[],"mappings":"AAaA,kDAAkD;AAClD,eAAO,MAAM,MAAM;;;CAGsB,CAAC"}
+{"version":3,"file":"random.d.ts","sourceRoot":"","sources":["../../../../src/modules/math/random/random.ts"],"names":[],"mappings":"AAoBA,kDAAkD;AAClD,eAAO,MAAM,MAAM;;;;CAIsB,CAAC"}

package/dist/modules/math/random/random.js

@@ -1,6 +1,12 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
+const source = /* wgsl */ `\
+fn random(scale: vec3f, seed: float) -> f32 {
+  /* use the fragment position for a different seed per-pixel */
+  return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);
+}
+`;
 const fs = /* glsl */ `\
 float random(vec3 scale, float seed) {
   /* use the fragment position for a different seed per-pixel */
@@ -10,6 +16,7 @@ float random(vec3 scale, float seed) {
 /** Quick random generator for fragment shaders */
 export const random = {
     name: 'random',
+    source,
     fs
 };
 //# sourceMappingURL=random.js.map

package/dist/modules/math/random/random.js.map

@@ -1 +1 @@
-{"version":3,"file":"random.js","sourceRoot":"","sources":["../../../../src/modules/math/random/random.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,MAAM,EAAE,GAAG,UAAU,CAAC;;;;;CAKrB,CAAC;AAEF,kDAAkD;AAClD,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,IAAI,EAAE,QAAQ;IACd,EAAE;CACqC,CAAC"}
+{"version":3,"file":"random.js","sourceRoot":"","sources":["../../../../src/modules/math/random/random.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,MAAM,MAAM,GAAG,UAAU,CAAC;;;;;CAKzB,CAAC;AAEF,MAAM,EAAE,GAAG,UAAU,CAAC;;;;;CAKrB,CAAC;AAEF,kDAAkD;AAClD,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,IAAI,EAAE,QAAQ;IACd,MAAM;IACN,EAAE;CACqC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/shadertools",
-  "version": "9.1.9",
+  "version": "9.2.0-alpha.2",
   "description": "Shader module system for luma.gl",
   "type": "module",
   "license": "MIT",
@@ -46,12 +46,12 @@
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "peerDependencies": {
-    "@luma.gl/core": "^9.1.0"
+    "@luma.gl/core": "9.2.0-alpha.1"
   },
   "dependencies": {
     "@math.gl/core": "^4.1.0",
     "@math.gl/types": "^4.1.0",
     "wgsl_reflect": "^1.2.0"
   },
-  "gitHead": "2d0d93f337120d670e03bd2d5141d90d0d582b44"
+  "gitHead": "dc1e71675ea19a4afbb59d3b9dcd3b01deea3cae"
 }

package/src/index.ts

@@ -90,20 +90,3 @@ export type {
 export type {PBRProjectionProps} from './modules/lighting/pbr-material/pbr-projection';
 
 export {pbrMaterial} from './modules/lighting/pbr-material/pbr-material';
-
-// DEPRECATED - v8 legacy shader modules (non-uniform buffer)
-
-// math libraries
-// export {fp64, fp64arithmetic} from './modules-webgl1/math/fp64/fp64';
-
-// projection and lighting
-export {geometry as geometry1} from './modules-webgl1/geometry/geometry';
-export {project as project1} from './modules-webgl1/project/project';
-
-export {lights as lights1} from './modules-webgl1/lighting/lights/lights';
-export {dirlight as dirlight1} from './modules-webgl1/lighting/dirlight/dirlight';
-export {
-  gouraudLighting,
-  phongLighting
-} from './modules-webgl1/lighting/phong-lighting/phong-lighting';
-export {pbr} from './modules-webgl1/lighting/pbr/pbr';

package/src/lib/shader-assembly/assemble-shaders.ts

@@ -14,9 +14,6 @@ import {ShaderHook, normalizeShaderHooks, getShaderHooks} from './shader-hooks';
 import {assert} from '../utils/assert';
 import {getShaderInfo} from '../glsl-utils/get-shader-info';
 
-/** Define map */
-export type ShaderDefine = string | number | boolean;
-
 const INJECT_SHADER_DECLARATIONS = `\n\n${DECLARATION_INJECT_MARKER}\n`;
 
 /**
@@ -48,7 +45,9 @@ export type AssembleShaderOptions = {
   /** Modules to be injected */
   modules?: ShaderModule[];
   /** Defines to be injected */
-  defines?: Record<string, ShaderDefine>;
+  defines?: Record<string, boolean>;
+  /** GLSL only: Overrides to be injected. In WGSL these are supplied during Pipeline creation time */
+  constants?: Record<string, number>;
   /** Hook functions */
   hookFunctions?: (ShaderHook | string)[];
   /** Code injections */
@@ -68,7 +67,9 @@ type AssembleStageOptions = {
   /** Modules to be injected */
   modules: any[];
   /** Defines to be injected */
-  defines?: Record<string, ShaderDefine>;
+  defines?: Record<string, boolean>;
+  /** GLSL only: Overrides to be injected. In WGSL these are supplied during Pipeline creation time */
+  constants?: Record<string, number>;
   /** Hook functions */
   hookFunctions?: (ShaderHook | string)[];
   /** Code injections */
@@ -280,7 +281,7 @@ function assembleShaderGLSL(
     language?: 'glsl' | 'wgsl';
     stage: 'vertex' | 'fragment';
     modules: ShaderModule[];
-    defines?: Record<string, ShaderDefine>;
+    defines?: Record<string, boolean>;
     hookFunctions?: any[];
     inject?: Record<string, string | ShaderInjection>;
     prologue?: boolean;
@@ -288,7 +289,6 @@ function assembleShaderGLSL(
   }
 ) {
   const {
-    id,
     source,
     stage,
     language = 'glsl',
@@ -331,7 +331,6 @@ function assembleShaderGLSL(
 ${sourceVersionDirective}
 
 // ----- PROLOGUE -------------------------
-${getShaderNameDefine({id, source, stage})}
 ${`#define SHADER_TYPE_${stage.toUpperCase()}`}
 
 ${getPlatformShaderDefines(platformInfo)}
@@ -443,11 +442,12 @@ export function assembleGetUniforms(modules: ShaderModule[]) {
 }
 
 /**
+ * NOTE: Removed as id injection defeated caching of shaders
+ * 
  * Generate "glslify-compatible" SHADER_NAME defines
  * These are understood by the GLSL error parsing function
  * If id is provided and no SHADER_NAME constant is present in source, create one
- */
-function getShaderNameDefine(options: {
+ unction getShaderNameDefine(options: {
   id?: string;
   source: string;
   stage: 'vertex' | 'fragment';
@@ -459,9 +459,10 @@ function getShaderNameDefine(options: {
 #define SHADER_NAME ${id}_${stage}`
     : '';
 }
+*/
 
 /** Generates application defines from an object of key value pairs */
-function getApplicationDefines(defines: Record<string, ShaderDefine> = {}): string {
+function getApplicationDefines(defines: Record<string, boolean> = {}): string {
   let sourceText = '';
   for (const define in defines) {
     const value = defines[define];

package/src/lib/shader-assembly/platform-info.ts

@@ -9,7 +9,7 @@
  */
 export type PlatformInfo = {
   /** Current Web GPU API backend */
-  type: 'webgl' | 'webgpu' | 'unknown';
+  type: 'webgl' | 'webgpu' | 'null' | 'unknown';
   /** Which shader language is supported */
   shaderLanguage: 'glsl' | 'wgsl';
   /** Which shader language version is preferred */

package/src/lib/shader-module/shader-module.ts

@@ -69,7 +69,7 @@ export type ShaderModule<
     prevUniforms?: UniformsT
   ) => Partial<UniformsT & BindingsT>;
 
-  defines?: Record<string, string | number>;
+  defines?: Record<string, boolean>;
   /** Injections */
   inject?: Record<string, string | {injection: string; order: number}>;
   dependencies?: ShaderModule<any, any>[];

package/src/lib/wgsl/get-shader-layout-wgsl.ts

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {ShaderAttributeType, ShaderLayout, log} from '@luma.gl/core';
-import {WgslReflect} from 'wgsl_reflect';
+import {AttributeShaderType, ShaderLayout, log} from '@luma.gl/core';
+import {TypeInfo, WgslReflect} from 'wgsl_reflect';
 
 /**
  * Parse a ShaderLayout from WGSL shader source code.
@@ -23,7 +23,8 @@ export function getShaderLayoutFromWGSL(source: string): ShaderLayout {
 
   for (const uniform of parsedWGSL.uniforms) {
     const members = [];
-    for (const attribute of (uniform.type as any)?.members || []) {
+    // @ts-expect-error
+    for (const attribute of uniform.type?.members || []) {
       members.push({
         name: attribute.name,
         type: getType(attribute.type)
@@ -80,8 +81,9 @@ export function getShaderLayoutFromWGSL(source: string): ShaderLayout {
 }
 
 /** Get a valid shader attribute type string from a wgsl-reflect type */
-function getType(type: any): ShaderAttributeType {
-  return type.format ? `${type.name}<${type.format.name}>` : type.name;
+function getType(type: TypeInfo | null): AttributeShaderType {
+  // @ts-expect-error WgslReflect type checks needed
+  return type?.format ? `${type.name}<${type.format.name}>` : type.name;
 }
 
 function parseWGSL(source: string): WgslReflect {

package/src/modules/engine/project/project.ts

@@ -44,7 +44,7 @@ function getUniforms(
   // viewInverseMatrix: view.invert(),
   // viewProjectionInverseMatrix: viewProjectionInverse
 
-  const uniforms: Record<string, any> = {};
+  const uniforms: ProjectionUniforms = {};
   if (opts.viewMatrix !== undefined) {
     uniforms.viewMatrix = opts.viewMatrix;
   }
@@ -54,11 +54,14 @@ function getUniforms(
   if (opts.cameraPositionWorld !== undefined) {
     uniforms.cameraPositionWorld = opts.cameraPositionWorld;
   }
+
   // COMPOSITE UNIFORMS
-  if (opts.projectionMatrix !== undefined || opts.viewMatrix !== undefined) {
-    uniforms.viewProjectionMatrix = new Matrix4(uniforms.projectionMatrix).multiplyRight(
-      uniforms.viewMatrix
-    );
+  if (opts.projectionMatrix !== undefined) {
+    if (opts.viewMatrix !== undefined) {
+      uniforms.viewProjectionMatrix = new Matrix4(uniforms.projectionMatrix).multiplyRight(
+        opts.viewMatrix
+      );
+    }
   }
 
   return uniforms;

package/src/modules/lighting/gouraud-material/gouraud-material.ts

@@ -26,7 +26,7 @@ export const gouraudMaterial: ShaderModule<GouraudMaterialProps> = {
   fs: PHONG_VS.replace('phongMaterial', 'gouraudMaterial'),
   source: PHONG_WGSL.replaceAll('phongMaterial', 'gouraudMaterial'),
   defines: {
-    LIGHTING_VERTEX: 1
+    LIGHTING_VERTEX: true
   },
   dependencies: [lighting],
   uniformTypes: {

package/src/modules/lighting/lights/lighting.ts

@@ -4,12 +4,12 @@
 
 import {log} from '@luma.gl/core';
 import {ShaderModule} from '../../../lib/shader-module/shader-module';
-import {lightingUniformsGLSL} from './lighting-uniforms-glsl';
-import {lightingUniformsWGSL} from './lighting-uniforms-wgsl';
+import {lightingUniformsGLSL} from './lighting-glsl';
+import {lightingUniformsWGSL} from './lighting-wgsl';
 import type {NumberArray3} from '@math.gl/core';
 
 /** Max number of supported lights (in addition to ambient light */
-const MAX_LIGHTS = 3;
+const MAX_LIGHTS = 5;
 
 /** Whether to divide */
 const COLOR_FACTOR = 255.0;
@@ -85,7 +85,7 @@ export const lighting = {
   name: 'lighting',
 
   defines: {
-    MAX_LIGHTS
+    // MAX_LIGHTS
   },
 
   uniformTypes: {

package/src/modules/lighting/no-material/dirlight.ts

@@ -91,10 +91,9 @@ export const dirlight = {
 } as const satisfies ShaderModule<DirlightProps, DirlightUniforms>;
 
 function getUniforms(opts: DirlightProps = dirlight.defaultUniforms): DirlightUniforms {
-  const uniforms: Record<string, unknown> = {};
+  const uniforms: DirlightUniforms = {};
   if (opts.lightDirection) {
-    // eslint-disable-next-line camelcase
-    uniforms.dirlight_uLightDirection = opts.lightDirection;
+    uniforms.lightDirection = opts.lightDirection;
   }
   return uniforms;
 }

package/src/modules/lighting/pbr-material/{pbr-fragment-glsl.ts → pbr-material-glsl.ts}

@@ -4,12 +4,47 @@
 
 // Attribution:
 // MIT license, Copyright (c) 2016-2017 Mohamad Moneimne and Contributors
-
 // This fragment shader defines a reference implementation for Physically Based Shading of
 // a microfacet surface material defined by a glTF model.
 
 // TODO - better do the checks outside of shader
 
+export const vs = /* glsl */ `\
+out vec3 pbr_vPosition;
+out vec2 pbr_vUV;
+
+#ifdef HAS_NORMALS
+# ifdef HAS_TANGENTS
+out mat3 pbr_vTBN;
+# else
+out vec3 pbr_vNormal;
+# endif
+#endif
+
+void pbr_setPositionNormalTangentUV(vec4 position, vec4 normal, vec4 tangent, vec2 uv)
+{
+  vec4 pos = pbrProjection.modelMatrix * position;
+  pbr_vPosition = vec3(pos.xyz) / pos.w;
+
+#ifdef HAS_NORMALS
+#ifdef HAS_TANGENTS
+  vec3 normalW = normalize(vec3(pbrProjection.normalMatrix * vec4(normal.xyz, 0.0)));
+  vec3 tangentW = normalize(vec3(pbrProjection.modelMatrix * vec4(tangent.xyz, 0.0)));
+  vec3 bitangentW = cross(normalW, tangentW) * tangent.w;
+  pbr_vTBN = mat3(tangentW, bitangentW, normalW);
+#else // HAS_TANGENTS != 1
+  pbr_vNormal = normalize(vec3(pbrProjection.modelMatrix * vec4(normal.xyz, 0.0)));
+#endif
+#endif
+
+#ifdef HAS_UV
+  pbr_vUV = uv;
+#else
+  pbr_vUV = vec2(0.,0.);
+#endif
+}
+`;
+
 export const fs = /* glsl */ `\
 precision highp float;