@luma.gl/gltf 9.0.0-beta.7 → 9.0.0-beta.8

package/dist/dist.dev.js

@@ -26,6 +26,7 @@ var __exports__ = (() => {
     }
     return to;
   };
+  var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
   var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
     // If the importer is in node compatibility mode or this is not an ESM
     // file that has been converted to a CommonJS file using a Babel-
@@ -50,21 +51,15 @@ var __exports__ = (() => {
     }
   });
 
-  // external-global-plugin:@luma.gl/shadertools
-  var require_shadertools = __commonJS({
-    "external-global-plugin:@luma.gl/shadertools"(exports, module) {
-      module.exports = globalThis.luma;
-    }
-  });
-
-  // src/index.ts
-  var src_exports = {};
-  __export(src_exports, {
+  // bundle.ts
+  var bundle_exports = {};
+  __export(bundle_exports, {
     GLTFAnimator: () => GLTFAnimator,
     createScenegraphsFromGLTF: () => createScenegraphsFromGLTF,
     loadPBREnvironment: () => loadPBREnvironment,
     parsePBRMaterial: () => parsePBRMaterial
   });
+  __reExport(bundle_exports, __toESM(require_core(), 1));
 
   // src/pbr/parse-pbr-material.ts
   var import_core = __toESM(require_core(), 1);
@@ -224,14 +219,29 @@ var __exports__ = (() => {
     parsedMaterial.generatedTextures.push(texture);
   }
 
-  // node_modules/@loaders.gl/loader-utils/dist/lib/env-utils/assert.js
+  // ../../node_modules/@loaders.gl/loader-utils/dist/lib/env-utils/assert.js
   function assert(condition, message) {
     if (!condition) {
       throw new Error(message || "loader assertion failed.");
     }
   }
 
-  // node_modules/@loaders.gl/loader-utils/dist/lib/path-utils/file-aliases.js
+  // ../../node_modules/@loaders.gl/loader-utils/dist/lib/env-utils/globals.js
+  var globals = {
+    self: typeof self !== "undefined" && self,
+    window: typeof window !== "undefined" && window,
+    global: typeof global !== "undefined" && global,
+    document: typeof document !== "undefined" && document
+  };
+  var self_ = globals.self || globals.window || globals.global || {};
+  var window_ = globals.window || globals.self || globals.global || {};
+  var global_ = globals.global || globals.self || globals.window || {};
+  var document_ = globals.document || {};
+  var isBrowser = Boolean(typeof process !== "object" || String(process) !== "[object process]" || process.browser);
+  var matches = typeof process !== "undefined" && process.version && /v([0-9]*)/.exec(process.version);
+  var nodeVersion = matches && parseFloat(matches[1]) || 0;
+
+  // ../../node_modules/@loaders.gl/loader-utils/dist/lib/path-utils/file-aliases.js
   var pathPrefix = "";
   var fileAliases = {};
   function resolvePath(filename) {
@@ -250,28 +260,6 @@ var __exports__ = (() => {
   // ../../node_modules/@loaders.gl/images/dist/lib/utils/version.js
   var VERSION = true ? "4.1.3" : "latest";
 
-  // ../../node_modules/@loaders.gl/images/node_modules/@loaders.gl/loader-utils/dist/lib/env-utils/assert.js
-  function assert2(condition, message) {
-    if (!condition) {
-      throw new Error(message || "loader assertion failed.");
-    }
-  }
-
-  // ../../node_modules/@loaders.gl/images/node_modules/@loaders.gl/loader-utils/dist/lib/env-utils/globals.js
-  var globals = {
-    self: typeof self !== "undefined" && self,
-    window: typeof window !== "undefined" && window,
-    global: typeof global !== "undefined" && global,
-    document: typeof document !== "undefined" && document
-  };
-  var self_ = globals.self || globals.window || globals.global || {};
-  var window_ = globals.window || globals.self || globals.global || {};
-  var global_ = globals.global || globals.self || globals.window || {};
-  var document_ = globals.document || {};
-  var isBrowser = Boolean(typeof process !== "object" || String(process) !== "[object process]" || process.browser);
-  var matches = typeof process !== "undefined" && process.version && /v([0-9]*)/.exec(process.version);
-  var nodeVersion = matches && parseFloat(matches[1]) || 0;
-
   // ../../node_modules/@loaders.gl/images/dist/lib/category-api/image-type.js
   var _globalThis$loaders;
   var parseImageNode = (_globalThis$loaders = globalThis.loaders) === null || _globalThis$loaders === void 0 ? void 0 : _globalThis$loaders.parseImageNode;
@@ -601,7 +589,7 @@ var __exports__ = (() => {
       mimeType
     } = getBinaryImageMetadata(arrayBuffer) || {};
     const parseImageNode2 = (_globalThis$loaders2 = globalThis.loaders) === null || _globalThis$loaders2 === void 0 ? void 0 : _globalThis$loaders2.parseImageNode;
-    assert2(parseImageNode2);
+    assert(parseImageNode2);
     return await parseImageNode2(arrayBuffer, mimeType);
   }
 
@@ -626,7 +614,7 @@ var __exports__ = (() => {
         image = await parseToNodeImage(arrayBuffer, options);
         break;
       default:
-        assert2(false);
+        assert(false);
     }
     if (imageType === "data") {
       image = getImageData(image);
@@ -665,7 +653,7 @@ var __exports__ = (() => {
     options: DEFAULT_IMAGE_LOADER_OPTIONS
   };
 
-  // node_modules/@loaders.gl/textures/dist/lib/texture-api/generate-url.js
+  // ../../node_modules/@loaders.gl/textures/dist/lib/texture-api/generate-url.js
   function generateUrl(getUrl, options, urlOptions) {
     let url = typeof getUrl === "function" ? getUrl({
       ...options,
@@ -678,7 +666,7 @@ var __exports__ = (() => {
     return resolvePath(url);
   }
 
-  // node_modules/@loaders.gl/textures/dist/lib/texture-api/async-deep-map.js
+  // ../../node_modules/@loaders.gl/textures/dist/lib/texture-api/async-deep-map.js
   var isObject = (value) => value && typeof value === "object";
   async function asyncDeepMap(tree, func) {
     let options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
@@ -713,7 +701,7 @@ var __exports__ = (() => {
     return await Promise.all(promises);
   }
 
-  // node_modules/@loaders.gl/textures/dist/lib/texture-api/deep-load.js
+  // ../../node_modules/@loaders.gl/textures/dist/lib/texture-api/deep-load.js
   async function deepLoad(urlTree, load, options) {
     return await asyncDeepMap(urlTree, (url) => shallowLoad(url, load, options));
   }
@@ -723,7 +711,7 @@ var __exports__ = (() => {
     return await load(arrayBuffer, options);
   }
 
-  // node_modules/@loaders.gl/textures/dist/lib/texture-api/load-image.js
+  // ../../node_modules/@loaders.gl/textures/dist/lib/texture-api/load-image.js
   async function loadImageTexture(getUrl) {
     let options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
     const imageUrls = await getImageUrls(getUrl, options);
@@ -1133,7 +1121,7 @@ var __exports__ = (() => {
   }
 
   // ../../node_modules/@math.gl/core/dist/lib/assert.js
-  function assert3(condition, message) {
+  function assert2(condition, message) {
     if (!condition) {
       throw new Error("math.gl assertion ".concat(message));
     }
@@ -1222,11 +1210,11 @@ var __exports__ = (() => {
       return this.distanceSquared(vector);
     }
     getComponent(i) {
-      assert3(i >= 0 && i < this.ELEMENTS, "index is out of range");
+      assert2(i >= 0 && i < this.ELEMENTS, "index is out of range");
       return checkNumber(this[i]);
     }
     setComponent(i, value) {
-      assert3(i >= 0 && i < this.ELEMENTS, "index is out of range");
+      assert2(i >= 0 && i < this.ELEMENTS, "index is out of range");
       this[i] = value;
       return this.check();
     }
@@ -3379,9 +3367,577 @@ var __exports__ = (() => {
 
   // src/gltf/create-gltf-model.ts
   var import_core4 = __toESM(require_core(), 1);
-  var import_shadertools = __toESM(require_shadertools(), 1);
+
+  // ../shadertools/src/lib/glsl-utils/highlight.ts
+  var glsl = (x) => `${x}`;
+
+  // ../shadertools/src/modules-webgl1/lighting/lights/lights-glsl.ts
+  var lightingShader = glsl`\
+#if (defined(SHADER_TYPE_FRAGMENT) && defined(LIGHTING_FRAGMENT)) || (defined(SHADER_TYPE_VERTEX) && defined(LIGHTING_VERTEX))
+
+struct AmbientLight {
+ vec3 color;
+};
+
+struct PointLight {
+ vec3 color;
+ vec3 position;
+
+ // Constant-Linear-Exponential
+ vec3 attenuation;
+};
+
+struct DirectionalLight {
+  vec3 color;
+  vec3 direction;
+};
+
+uniform AmbientLight lighting_uAmbientLight;
+uniform PointLight lighting_uPointLight[MAX_LIGHTS];
+uniform DirectionalLight lighting_uDirectionalLight[MAX_LIGHTS];
+uniform int lighting_uPointLightCount;
+uniform int lighting_uDirectionalLightCount;
+
+uniform bool lighting_uEnabled;
+
+float getPointLightAttenuation(PointLight pointLight, float distance) {
+  return pointLight.attenuation.x
+       + pointLight.attenuation.y * distance
+       + pointLight.attenuation.z * distance * distance;
+}
+
+#endif
+`;
+
+  // ../shadertools/src/modules-webgl1/lighting/lights/lights.ts
+  var INITIAL_MODULE_OPTIONS = {
+    lightSources: {}
+  };
+  function convertColor(colorDef = {}) {
+    const { color = [0, 0, 0], intensity = 1 } = colorDef;
+    return color.map((component) => component * intensity / 255);
+  }
+  function getLightSourceUniforms({
+    ambientLight,
+    pointLights = [],
+    directionalLights = []
+  }) {
+    const lightSourceUniforms = {};
+    if (ambientLight) {
+      lightSourceUniforms["lighting_uAmbientLight.color"] = convertColor(ambientLight);
+    } else {
+      lightSourceUniforms["lighting_uAmbientLight.color"] = [0, 0, 0];
+    }
+    pointLights.forEach((pointLight, index) => {
+      lightSourceUniforms[`lighting_uPointLight[${index}].color`] = convertColor(pointLight);
+      lightSourceUniforms[`lighting_uPointLight[${index}].position`] = pointLight.position;
+      lightSourceUniforms[`lighting_uPointLight[${index}].attenuation`] = pointLight.attenuation || [
+        1,
+        0,
+        0
+      ];
+    });
+    lightSourceUniforms.lighting_uPointLightCount = pointLights.length;
+    directionalLights.forEach((directionalLight, index) => {
+      lightSourceUniforms[`lighting_uDirectionalLight[${index}].color`] = convertColor(directionalLight);
+      lightSourceUniforms[`lighting_uDirectionalLight[${index}].direction`] = directionalLight.direction;
+    });
+    lightSourceUniforms.lighting_uDirectionalLightCount = directionalLights.length;
+    return lightSourceUniforms;
+  }
+  function getUniforms(opts = INITIAL_MODULE_OPTIONS) {
+    if ("lightSources" in opts) {
+      const { ambientLight, pointLights, directionalLights } = opts.lightSources || {};
+      const hasLights = ambientLight || pointLights && pointLights.length > 0 || directionalLights && directionalLights.length > 0;
+      if (!hasLights) {
+        return { lighting_uEnabled: false };
+      }
+      return Object.assign(
+        {},
+        getLightSourceUniforms({ ambientLight, pointLights, directionalLights }),
+        {
+          lighting_uEnabled: true
+        }
+      );
+    }
+    if ("lights" in opts) {
+      const lightSources = { pointLights: [], directionalLights: [] };
+      for (const light of opts.lights || []) {
+        switch (light.type) {
+          case "ambient":
+            lightSources.ambientLight = light;
+            break;
+          case "directional":
+            lightSources.directionalLights?.push(light);
+            break;
+          case "point":
+            lightSources.pointLights?.push(light);
+            break;
+          default:
+        }
+      }
+      return getUniforms({ lightSources });
+    }
+    return {};
+  }
+  var lights = {
+    name: "lights",
+    vs: lightingShader,
+    fs: lightingShader,
+    getUniforms,
+    defines: {
+      MAX_LIGHTS: 3
+    }
+  };
+
+  // ../shadertools/src/modules-webgl1/lighting/pbr/pbr-vertex-glsl.ts
+  var vs = glsl`\
+uniform mat4 u_MVPMatrix;
+uniform mat4 u_ModelMatrix;
+uniform mat4 u_NormalMatrix;
+
+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 = u_ModelMatrix * position;
+  pbr_vPosition = vec3(pos.xyz) / pos.w;
+
+#ifdef HAS_NORMALS
+#ifdef HAS_TANGENTS
+  vec3 normalW = normalize(vec3(u_NormalMatrix * vec4(normal.xyz, 0.0)));
+  vec3 tangentW = normalize(vec3(u_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(u_ModelMatrix * vec4(normal.xyz, 0.0)));
+#endif
+#endif
+
+#ifdef HAS_UV
+  pbr_vUV = uv;
+#else
+  pbr_vUV = vec2(0.,0.);
+#endif
+}
+`;
+
+  // ../shadertools/src/modules-webgl1/lighting/pbr/pbr-fragment-glsl.ts
+  var fs = glsl`\
+#if defined(USE_TEX_LOD) && !defined(FEATURE_GLSL_TEXTURE_LOD)
+# error PBR fragment shader: Texture LOD is not available
+#endif
+
+#if !defined(HAS_TANGENTS) && !defined(FEATURE_GLSL_DERIVATIVES)
+# error PBR fragment shader: Derivatives are not available
+#endif
+
+precision highp float;
+
+uniform bool pbr_uUnlit;
+
+#ifdef USE_IBL
+uniform samplerCube u_DiffuseEnvSampler;
+uniform samplerCube u_SpecularEnvSampler;
+uniform sampler2D u_brdfLUT;
+uniform vec2 u_ScaleIBLAmbient;
+#endif
+
+#ifdef HAS_BASECOLORMAP
+uniform sampler2D u_BaseColorSampler;
+#endif
+#ifdef HAS_NORMALMAP
+uniform sampler2D u_NormalSampler;
+uniform float u_NormalScale;
+#endif
+#ifdef HAS_EMISSIVEMAP
+uniform sampler2D u_EmissiveSampler;
+uniform vec3 u_EmissiveFactor;
+#endif
+#ifdef HAS_METALROUGHNESSMAP
+uniform sampler2D u_MetallicRoughnessSampler;
+#endif
+#ifdef HAS_OCCLUSIONMAP
+uniform sampler2D u_OcclusionSampler;
+uniform float u_OcclusionStrength;
+#endif
+
+#ifdef ALPHA_CUTOFF
+uniform float u_AlphaCutoff;
+#endif
+
+uniform vec2 u_MetallicRoughnessValues;
+uniform vec4 u_BaseColorFactor;
+
+uniform vec3 u_Camera;
+
+// debugging flags used for shader output of intermediate PBR variables
+#ifdef PBR_DEBUG
+uniform vec4 u_ScaleDiffBaseMR;
+uniform vec4 u_ScaleFGDSpec;
+#endif
+
+in vec3 pbr_vPosition;
+
+in vec2 pbr_vUV;
+
+#ifdef HAS_NORMALS
+#ifdef HAS_TANGENTS
+in mat3 pbr_vTBN;
+#else
+in vec3 pbr_vNormal;
+#endif
+#endif
+
+// Encapsulate the various inputs used by the various functions in the shading equation
+// We store values in this struct to simplify the integration of alternative implementations
+// of the shading terms, outlined in the Readme.MD Appendix.
+struct PBRInfo
+{
+  float NdotL;                  // cos angle between normal and light direction
+  float NdotV;                  // cos angle between normal and view direction
+  float NdotH;                  // cos angle between normal and half vector
+  float LdotH;                  // cos angle between light direction and half vector
+  float VdotH;                  // cos angle between view direction and half vector
+  float perceptualRoughness;    // roughness value, as authored by the model creator (input to shader)
+  float metalness;              // metallic value at the surface
+  vec3 reflectance0;            // full reflectance color (normal incidence angle)
+  vec3 reflectance90;           // reflectance color at grazing angle
+  float alphaRoughness;         // roughness mapped to a more linear change in the roughness (proposed by [2])
+  vec3 diffuseColor;            // color contribution from diffuse lighting
+  vec3 specularColor;           // color contribution from specular lighting
+  vec3 n;                       // normal at surface point
+  vec3 v;                       // vector from surface point to camera
+};
+
+const float M_PI = 3.141592653589793;
+const float c_MinRoughness = 0.04;
+
+vec4 SRGBtoLINEAR(vec4 srgbIn)
+{
+#ifdef MANUAL_SRGB
+#ifdef SRGB_FAST_APPROXIMATION
+  vec3 linOut = pow(srgbIn.xyz,vec3(2.2));
+#else //SRGB_FAST_APPROXIMATION
+  vec3 bLess = step(vec3(0.04045),srgbIn.xyz);
+  vec3 linOut = mix( srgbIn.xyz/vec3(12.92), pow((srgbIn.xyz+vec3(0.055))/vec3(1.055),vec3(2.4)), bLess );
+#endif //SRGB_FAST_APPROXIMATION
+  return vec4(linOut,srgbIn.w);;
+#else //MANUAL_SRGB
+  return srgbIn;
+#endif //MANUAL_SRGB
+}
+
+// Find the normal for this fragment, pulling either from a predefined normal map
+// or from the interpolated mesh normal and tangent attributes.
+vec3 getNormal()
+{
+  // Retrieve the tangent space matrix
+#ifndef HAS_TANGENTS
+  vec3 pos_dx = dFdx(pbr_vPosition);
+  vec3 pos_dy = dFdy(pbr_vPosition);
+  vec3 tex_dx = dFdx(vec3(pbr_vUV, 0.0));
+  vec3 tex_dy = dFdy(vec3(pbr_vUV, 0.0));
+  vec3 t = (tex_dy.t * pos_dx - tex_dx.t * pos_dy) / (tex_dx.s * tex_dy.t - tex_dy.s * tex_dx.t);
+
+#ifdef HAS_NORMALS
+  vec3 ng = normalize(pbr_vNormal);
+#else
+  vec3 ng = cross(pos_dx, pos_dy);
+#endif
+
+  t = normalize(t - ng * dot(ng, t));
+  vec3 b = normalize(cross(ng, t));
+  mat3 tbn = mat3(t, b, ng);
+#else // HAS_TANGENTS
+  mat3 tbn = pbr_vTBN;
+#endif
+
+#ifdef HAS_NORMALMAP
+  vec3 n = texture(u_NormalSampler, pbr_vUV).rgb;
+  n = normalize(tbn * ((2.0 * n - 1.0) * vec3(u_NormalScale, u_NormalScale, 1.0)));
+#else
+  // The tbn matrix is linearly interpolated, so we need to re-normalize
+  vec3 n = normalize(tbn[2].xyz);
+#endif
+
+  return n;
+}
+
+// Calculation of the lighting contribution from an optional Image Based Light source.
+// Precomputed Environment Maps are required uniform inputs and are computed as outlined in [1].
+// See our README.md on Environment Maps [3] for additional discussion.
+#ifdef USE_IBL
+vec3 getIBLContribution(PBRInfo pbrInputs, vec3 n, vec3 reflection)
+{
+  float mipCount = 9.0; // resolution of 512x512
+  float lod = (pbrInputs.perceptualRoughness * mipCount);
+  // retrieve a scale and bias to F0. See [1], Figure 3
+  vec3 brdf = SRGBtoLINEAR(texture(u_brdfLUT,
+    vec2(pbrInputs.NdotV, 1.0 - pbrInputs.perceptualRoughness))).rgb;
+  vec3 diffuseLight = SRGBtoLINEAR(textureCube(u_DiffuseEnvSampler, n)).rgb;
+
+#ifdef USE_TEX_LOD
+  vec3 specularLight = SRGBtoLINEAR(textureCubeLod(u_SpecularEnvSampler, reflection, lod)).rgb;
+#else
+  vec3 specularLight = SRGBtoLINEAR(textureCube(u_SpecularEnvSampler, reflection)).rgb;
+#endif
+
+  vec3 diffuse = diffuseLight * pbrInputs.diffuseColor;
+  vec3 specular = specularLight * (pbrInputs.specularColor * brdf.x + brdf.y);
+
+  // For presentation, this allows us to disable IBL terms
+  diffuse *= u_ScaleIBLAmbient.x;
+  specular *= u_ScaleIBLAmbient.y;
+
+  return diffuse + specular;
+}
+#endif
+
+// Basic Lambertian diffuse
+// Implementation from Lambert's Photometria https://archive.org/details/lambertsphotome00lambgoog
+// See also [1], Equation 1
+vec3 diffuse(PBRInfo pbrInputs)
+{
+  return pbrInputs.diffuseColor / M_PI;
+}
+
+// The following equation models the Fresnel reflectance term of the spec equation (aka F())
+// Implementation of fresnel from [4], Equation 15
+vec3 specularReflection(PBRInfo pbrInputs)
+{
+  return pbrInputs.reflectance0 +
+    (pbrInputs.reflectance90 - pbrInputs.reflectance0) *
+    pow(clamp(1.0 - pbrInputs.VdotH, 0.0, 1.0), 5.0);
+}
+
+// This calculates the specular geometric attenuation (aka G()),
+// where rougher material will reflect less light back to the viewer.
+// This implementation is based on [1] Equation 4, and we adopt their modifications to
+// alphaRoughness as input as originally proposed in [2].
+float geometricOcclusion(PBRInfo pbrInputs)
+{
+  float NdotL = pbrInputs.NdotL;
+  float NdotV = pbrInputs.NdotV;
+  float r = pbrInputs.alphaRoughness;
+
+  float attenuationL = 2.0 * NdotL / (NdotL + sqrt(r * r + (1.0 - r * r) * (NdotL * NdotL)));
+  float attenuationV = 2.0 * NdotV / (NdotV + sqrt(r * r + (1.0 - r * r) * (NdotV * NdotV)));
+  return attenuationL * attenuationV;
+}
+
+// The following equation(s) model the distribution of microfacet normals across
+// the area being drawn (aka D())
+// Implementation from "Average Irregularity Representation of a Roughened Surface
+// for Ray Reflection" by T. S. Trowbridge, and K. P. Reitz
+// Follows the distribution function recommended in the SIGGRAPH 2013 course notes
+// from EPIC Games [1], Equation 3.
+float microfacetDistribution(PBRInfo pbrInputs)
+{
+  float roughnessSq = pbrInputs.alphaRoughness * pbrInputs.alphaRoughness;
+  float f = (pbrInputs.NdotH * roughnessSq - pbrInputs.NdotH) * pbrInputs.NdotH + 1.0;
+  return roughnessSq / (M_PI * f * f);
+}
+
+void PBRInfo_setAmbientLight(inout PBRInfo pbrInputs) {
+  pbrInputs.NdotL = 1.0;
+  pbrInputs.NdotH = 0.0;
+  pbrInputs.LdotH = 0.0;
+  pbrInputs.VdotH = 1.0;
+}
+
+void PBRInfo_setDirectionalLight(inout PBRInfo pbrInputs, vec3 lightDirection) {
+  vec3 n = pbrInputs.n;
+  vec3 v = pbrInputs.v;
+  vec3 l = normalize(lightDirection);             // Vector from surface point to light
+  vec3 h = normalize(l+v);                        // Half vector between both l and v
+
+  pbrInputs.NdotL = clamp(dot(n, l), 0.001, 1.0);
+  pbrInputs.NdotH = clamp(dot(n, h), 0.0, 1.0);
+  pbrInputs.LdotH = clamp(dot(l, h), 0.0, 1.0);
+  pbrInputs.VdotH = clamp(dot(v, h), 0.0, 1.0);
+}
+
+void PBRInfo_setPointLight(inout PBRInfo pbrInputs, PointLight pointLight) {
+  vec3 light_direction = normalize(pointLight.position - pbr_vPosition);
+  PBRInfo_setDirectionalLight(pbrInputs, light_direction);
+}
+
+vec3 calculateFinalColor(PBRInfo pbrInputs, vec3 lightColor) {
+  // Calculate the shading terms for the microfacet specular shading model
+  vec3 F = specularReflection(pbrInputs);
+  float G = geometricOcclusion(pbrInputs);
+  float D = microfacetDistribution(pbrInputs);
+
+  // Calculation of analytical lighting contribution
+  vec3 diffuseContrib = (1.0 - F) * diffuse(pbrInputs);
+  vec3 specContrib = F * G * D / (4.0 * pbrInputs.NdotL * pbrInputs.NdotV);
+  // Obtain final intensity as reflectance (BRDF) scaled by the energy of the light (cosine law)
+  return pbrInputs.NdotL * lightColor * (diffuseContrib + specContrib);
+}
+
+vec4 pbr_filterColor(vec4 colorUnused)
+{
+  // The albedo may be defined from a base texture or a flat color
+#ifdef HAS_BASECOLORMAP
+  vec4 baseColor = SRGBtoLINEAR(texture(u_BaseColorSampler, pbr_vUV)) * u_BaseColorFactor;
+#else
+  vec4 baseColor = u_BaseColorFactor;
+#endif
+
+#ifdef ALPHA_CUTOFF
+  if (baseColor.a < u_AlphaCutoff) {
+    discard;
+  }
+#endif
+
+  vec3 color = vec3(0, 0, 0);
+
+  if(pbr_uUnlit){
+    color.rgb = baseColor.rgb;
+  }
+  else{
+    // Metallic and Roughness material properties are packed together
+    // In glTF, these factors can be specified by fixed scalar values
+    // or from a metallic-roughness map
+    float perceptualRoughness = u_MetallicRoughnessValues.y;
+    float metallic = u_MetallicRoughnessValues.x;
+#ifdef HAS_METALROUGHNESSMAP
+    // Roughness is stored in the 'g' channel, metallic is stored in the 'b' channel.
+    // This layout intentionally reserves the 'r' channel for (optional) occlusion map data
+    vec4 mrSample = texture(u_MetallicRoughnessSampler, pbr_vUV);
+    perceptualRoughness = mrSample.g * perceptualRoughness;
+    metallic = mrSample.b * metallic;
+#endif
+    perceptualRoughness = clamp(perceptualRoughness, c_MinRoughness, 1.0);
+    metallic = clamp(metallic, 0.0, 1.0);
+    // Roughness is authored as perceptual roughness; as is convention,
+    // convert to material roughness by squaring the perceptual roughness [2].
+    float alphaRoughness = perceptualRoughness * perceptualRoughness;
+
+    vec3 f0 = vec3(0.04);
+    vec3 diffuseColor = baseColor.rgb * (vec3(1.0) - f0);
+    diffuseColor *= 1.0 - metallic;
+    vec3 specularColor = mix(f0, baseColor.rgb, metallic);
+
+    // Compute reflectance.
+    float reflectance = max(max(specularColor.r, specularColor.g), specularColor.b);
+
+    // For typical incident reflectance range (between 4% to 100%) set the grazing
+    // reflectance to 100% for typical fresnel effect.
+    // For very low reflectance range on highly diffuse objects (below 4%),
+    // incrementally reduce grazing reflecance to 0%.
+    float reflectance90 = clamp(reflectance * 25.0, 0.0, 1.0);
+    vec3 specularEnvironmentR0 = specularColor.rgb;
+    vec3 specularEnvironmentR90 = vec3(1.0, 1.0, 1.0) * reflectance90;
+
+    vec3 n = getNormal();                          // normal at surface point
+    vec3 v = normalize(u_Camera - pbr_vPosition);  // Vector from surface point to camera
+
+    float NdotV = clamp(abs(dot(n, v)), 0.001, 1.0);
+    vec3 reflection = -normalize(reflect(v, n));
+
+    PBRInfo pbrInputs = PBRInfo(
+      0.0, // NdotL
+      NdotV,
+      0.0, // NdotH
+      0.0, // LdotH
+      0.0, // VdotH
+      perceptualRoughness,
+      metallic,
+      specularEnvironmentR0,
+      specularEnvironmentR90,
+      alphaRoughness,
+      diffuseColor,
+      specularColor,
+      n,
+      v
+    );
+
+#ifdef USE_LIGHTS
+    // Apply ambient light
+    PBRInfo_setAmbientLight(pbrInputs);
+    color += calculateFinalColor(pbrInputs, lighting_uAmbientLight.color);
+
+    // Apply directional light
+    for(int i = 0, i < lighting_uDirectionalLightCount, i++) {
+      if (i < lighting_uDirectionalLightCount) {
+        PBRInfo_setDirectionalLight(pbrInputs, lighting_uDirectionalLight[i].direction);
+        color += calculateFinalColor(pbrInputs, lighting_uDirectionalLight[i].color);
+      }
+    }
+
+    // Apply point light
+    for(int i = 0, i < lighting_uPointLightCount, i++) {
+      if (i < lighting_uPointLightCount) {
+        PBRInfo_setPointLight(pbrInputs, lighting_uPointLight[i]);
+        float attenuation = getPointLightAttenuation(lighting_uPointLight[i], distance(lighting_uPointLight[i].position, pbr_vPosition));
+        color += calculateFinalColor(pbrInputs, lighting_uPointLight[i].color / attenuation);
+      }
+    }
+#endif
+
+    // Calculate lighting contribution from image based lighting source (IBL)
+#ifdef USE_IBL
+    color += getIBLContribution(pbrInputs, n, reflection);
+#endif
+
+    // Apply optional PBR terms for additional (optional) shading
+#ifdef HAS_OCCLUSIONMAP
+    float ao = texture(u_OcclusionSampler, pbr_vUV).r;
+    color = mix(color, color * ao, u_OcclusionStrength);
+#endif
+
+#ifdef HAS_EMISSIVEMAP
+    vec3 emissive = SRGBtoLINEAR(texture(u_EmissiveSampler, pbr_vUV)).rgb * u_EmissiveFactor;
+    color += emissive;
+#endif
+
+    // This section uses mix to override final color for reference app visualization
+    // of various parameters in the lighting equation.
+#ifdef PBR_DEBUG
+    // TODO: Figure out how to debug multiple lights
+
+    // color = mix(color, F, u_ScaleFGDSpec.x);
+    // color = mix(color, vec3(G), u_ScaleFGDSpec.y);
+    // color = mix(color, vec3(D), u_ScaleFGDSpec.z);
+    // color = mix(color, specContrib, u_ScaleFGDSpec.w);
+
+    // color = mix(color, diffuseContrib, u_ScaleDiffBaseMR.x);
+    color = mix(color, baseColor.rgb, u_ScaleDiffBaseMR.y);
+    color = mix(color, vec3(metallic), u_ScaleDiffBaseMR.z);
+    color = mix(color, vec3(perceptualRoughness), u_ScaleDiffBaseMR.w);
+#endif
+
+  }
+
+  return vec4(pow(color,vec3(1.0/2.2)), baseColor.a);
+}
+`;
+
+  // ../shadertools/src/modules-webgl1/lighting/pbr/pbr.ts
+  var pbr = {
+    name: "pbr",
+    vs,
+    fs,
+    defines: {
+      LIGHTING_FRAGMENT: 1
+    },
+    dependencies: [lights]
+  };
+
+  // src/gltf/create-gltf-model.ts
   var import_engine = __toESM(require_engine(), 1);
-  var vs = `
+  var vs2 = `
 #pragma vscode_glsllint_stage: vert
 #if (__VERSION__ < 300)
   #define _attr attribute
@@ -3427,7 +3983,7 @@ var __exports__ = (() => {
     gl_Position = u_MVPMatrix * positions;
   }
 `;
-  var fs = `
+  var fs2 = `
 #pragma vscode_glsllint_stage: frag
 #if (__VERSION__ < 300)
   #define fragmentColor gl_FragColor
@@ -3456,9 +4012,9 @@ var __exports__ = (() => {
       geometry,
       topology: geometry.topology,
       vertexCount,
-      modules: [import_shadertools.pbr],
-      vs: addVersionToShader(device, vs),
-      fs: addVersionToShader(device, fs),
+      modules: [pbr],
+      vs: addVersionToShader(device, vs2),
+      fs: addVersionToShader(device, fs2),
       ...modelOptions,
       bindings: { ...parsedMaterial.bindings, ...modelOptions.bindings },
       defines: { ...parsedMaterial.defines, ...modelOptions.defines },
@@ -3482,7 +4038,6 @@ ${source}`;
     useTangents: false
   };
   var GLTFInstantiator = class {
-    // TODO - replace with Device
     device;
     options;
     gltf;
@@ -3642,7 +4197,7 @@ ${source}`;
     const animator = instantiator.createAnimator();
     return { scenes, animator };
   }
-  return __toCommonJS(src_exports);
+  return __toCommonJS(bundle_exports);
 })();
       return __exports__;
       });