@luma.gl/gltf 9.2.6 → 9.3.0-alpha.2

package/dist/pbr/pbr-environment.js

@@ -1,11 +1,11 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { AsyncTexture } from '@luma.gl/engine';
+import { DynamicTexture } from '@luma.gl/engine';
 import { loadImageTexture } from '@loaders.gl/textures';
 /** Loads textures for PBR environment */
 export function loadPBREnvironment(device, props) {
-    const brdfLutTexture = new AsyncTexture(device, {
+    const brdfLutTexture = new DynamicTexture(device, {
         id: 'brdfLUT',
         sampler: {
             addressModeU: 'clamp-to-edge',
@@ -57,7 +57,7 @@ function makeCube(device, { id, getTextureForFace, sampler }) {
         // @ts-ignore TODO
         data[String(face)] = getTextureForFace(face);
     });
-    return new AsyncTexture(device, {
+    return new DynamicTexture(device, {
         id,
         dimension: 'cube',
         mipmaps: false,

package/dist/pbr/pbr-environment.js.map

@@ -1 +1 @@
-{"version":3,"file":"pbr-environment.js","sourceRoot":"","sources":["../../src/pbr/pbr-environment.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAgBtD,yCAAyC;AACzC,MAAM,UAAU,kBAAkB,CAAC,MAAc,EAAE,KAA0B;IAC3E,MAAM,cAAc,GAAG,IAAI,YAAY,CAAC,MAAM,EAAE;QAC9C,EAAE,EAAE,SAAS;QACb,OAAO,EAAE;YACP,YAAY,EAAE,eAAe;YAC7B,YAAY,EAAE,eAAe;YAC7B,SAAS,EAAE,QAAQ;YACnB,SAAS,EAAE,QAAQ;SACY;QACjC,2EAA2E;QAC3E,IAAI,EAAE,gBAAgB,CAAC,KAAK,CAAC,UAAU,CAAC;KACzC,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,EAAE;QACzC,EAAE,EAAE,mBAAmB;QACvB,iBAAiB,EAAE,GAAG,CAAC,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;QAC9E,OAAO,EAAE;YACP,YAAY,EAAE,eAAe;YAC7B,YAAY,EAAE,eAAe;YAC7B,SAAS,EAAE,QAAQ;YACnB,SAAS,EAAE,QAAQ;SACY;KAClC,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,QAAQ,CAAC,MAAM,EAAE;QAC1C,EAAE,EAAE,oBAAoB;QACxB,iBAAiB,EAAE,CAAC,GAAW,EAAE,EAAE;YACjC,MAAM,UAAU,GAAmB,EAAE,CAAC;YACtC,aAAa;YACb,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,KAAK,CAAC,iBAAiB,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC;gBAC5D,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;YAC3E,CAAC;YACD,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,OAAO,EAAE;YACP,YAAY,EAAE,eAAe;YAC7B,YAAY,EAAE,eAAe;YAC7B,SAAS,EAAE,QAAQ,EAAE,oDAAoD;YACzE,SAAS,EAAE,QAAQ;SACY;KAClC,CAAC,CAAC;IAEH,OAAO;QACL,cAAc;QACd,iBAAiB;QACjB,kBAAkB;KACnB,CAAC;AACJ,CAAC;AAED,4BAA4B;AAC5B,MAAM,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAEjC,SAAS,QAAQ,CACf,MAAc,EACd,EACE,EAAE,EACF,iBAAiB,EACjB,OAAO,EAKR;IAED,MAAM,IAAI,GAAG,EAAE,CAAC;IAChB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACnB,kBAAkB;QAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,YAAY,CAAC,MAAM,EAAE;QAC9B,EAAE;QACF,SAAS,EAAE,MAAM;QACjB,OAAO,EAAE,KAAK;QACd,OAAO;QACP,mBAAmB;QACnB,IAAI;KACL,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"pbr-environment.js","sourceRoot":"","sources":["../../src/pbr/pbr-environment.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAgBtD,yCAAyC;AACzC,MAAM,UAAU,kBAAkB,CAAC,MAAc,EAAE,KAA0B;IAC3E,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,MAAM,EAAE;QAChD,EAAE,EAAE,SAAS;QACb,OAAO,EAAE;YACP,YAAY,EAAE,eAAe;YAC7B,YAAY,EAAE,eAAe;YAC7B,SAAS,EAAE,QAAQ;YACnB,SAAS,EAAE,QAAQ;SACY;QACjC,2EAA2E;QAC3E,IAAI,EAAE,gBAAgB,CAAC,KAAK,CAAC,UAAU,CAAC;KACzC,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,EAAE;QACzC,EAAE,EAAE,mBAAmB;QACvB,iBAAiB,EAAE,GAAG,CAAC,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;QAC9E,OAAO,EAAE;YACP,YAAY,EAAE,eAAe;YAC7B,YAAY,EAAE,eAAe;YAC7B,SAAS,EAAE,QAAQ;YACnB,SAAS,EAAE,QAAQ;SACY;KAClC,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,QAAQ,CAAC,MAAM,EAAE;QAC1C,EAAE,EAAE,oBAAoB;QACxB,iBAAiB,EAAE,CAAC,GAAW,EAAE,EAAE;YACjC,MAAM,UAAU,GAAmB,EAAE,CAAC;YACtC,aAAa;YACb,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,KAAK,CAAC,iBAAiB,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC;gBAC5D,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;YAC3E,CAAC;YACD,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,OAAO,EAAE;YACP,YAAY,EAAE,eAAe;YAC7B,YAAY,EAAE,eAAe;YAC7B,SAAS,EAAE,QAAQ,EAAE,oDAAoD;YACzE,SAAS,EAAE,QAAQ;SACY;KAClC,CAAC,CAAC;IAEH,OAAO;QACL,cAAc;QACd,iBAAiB;QACjB,kBAAkB;KACnB,CAAC;AACJ,CAAC;AAED,4BAA4B;AAC5B,MAAM,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAEjC,SAAS,QAAQ,CACf,MAAc,EACd,EACE,EAAE,EACF,iBAAiB,EACjB,OAAO,EAKR;IAED,MAAM,IAAI,GAAG,EAAE,CAAC;IAChB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACnB,kBAAkB;QAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,cAAc,CAAC,MAAM,EAAE;QAChC,EAAE;QACF,SAAS,EAAE,MAAM;QACjB,OAAO,EAAE,KAAK;QACd,OAAO;QACP,mBAAmB;QACnB,IAAI;KACL,CAAC,CAAC;AACL,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/gltf",
-  "version": "9.2.6",
+  "version": "9.3.0-alpha.2",
   "description": "glTF support for luma.gl",
   "type": "module",
   "license": "MIT",
@@ -40,10 +40,10 @@
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "peerDependencies": {
-    "@luma.gl/constants": "~9.2.0",
-    "@luma.gl/core": "~9.2.0",
-    "@luma.gl/engine": "~9.2.0",
-    "@luma.gl/shadertools": "~9.2.0"
+    "@luma.gl/constants": "9.2.0-alpha.6",
+    "@luma.gl/core": "9.2.0-alpha.6",
+    "@luma.gl/engine": "9.2.0-alpha.6",
+    "@luma.gl/shadertools": "9.2.0-alpha.6"
   },
   "dependencies": {
     "@loaders.gl/core": "^4.2.0",
@@ -51,5 +51,5 @@
     "@loaders.gl/textures": "^4.2.0",
     "@math.gl/core": "^4.1.0"
   },
-  "gitHead": "9c7a3adc09c7b23800df3f916762445ebc1fa924"
+  "gitHead": "7fedf8d8902f58490a4ffca9a873daee3c732f24"
 }

package/src/gltf/create-scenegraph-from-gltf.ts

@@ -5,7 +5,9 @@
 import {Device} from '@luma.gl/core';
 import {GroupNode} from '@luma.gl/engine';
 import {GLTFPostprocessed} from '@loaders.gl/gltf';
+import {Light} from '@luma.gl/shadertools';
 import {parseGLTF, type ParseGLTFOptions} from '../parsers/parse-gltf';
+import {parseGLTFLights} from '../parsers/parse-gltf-lights';
 import {GLTFAnimator} from './gltf-animator';
 import {parseGLTFAnimations} from '../parsers/parse-gltf-animations';
 import {deepCopy} from '../utils/deep-copy';
@@ -17,11 +19,13 @@ export function createScenegraphsFromGLTF(
 ): {
   scenes: GroupNode[];
   animator: GLTFAnimator;
+  lights: Light[];
 } {
   gltf = deepCopy(gltf);
   const scenes = parseGLTF(device, gltf, options);
   // Note: There is a nasty dependency on injected nodes in the glTF
   const animations = parseGLTFAnimations(gltf);
   const animator = new GLTFAnimator({animations});
-  return {scenes, animator};
+  const lights = parseGLTFLights(gltf);
+  return {scenes, animator, lights};
 }

package/src/index.ts

@@ -4,6 +4,7 @@ export {loadPBREnvironment, type PBREnvironment} from './pbr/pbr-environment';
 export {type ParsedPBRMaterial} from './pbr/pbr-material';
 export {parsePBRMaterial, type ParsePBRMaterialOptions} from './parsers/parse-pbr-material';
 export {} from './pbr/pbr-environment';
+export {parseGLTFLights} from './parsers/parse-gltf-lights';
 
 // glTF Scenegraph Instantiator
 export {createScenegraphsFromGLTF} from './gltf/create-scenegraph-from-gltf';

package/src/parsers/parse-gltf-lights.ts

@@ -0,0 +1,91 @@
+import {Matrix4} from '@math.gl/core';
+import type {GLTFNodePostprocessed, GLTFPostprocessed} from '@loaders.gl/gltf';
+import type {DirectionalLight, Light, PointLight} from '@luma.gl/shadertools';
+
+/** Parse KHR_lights_punctual extension into luma.gl light definitions */
+export function parseGLTFLights(gltf: GLTFPostprocessed): Light[] {
+  const lightDefs = gltf.extensions?.['KHR_lights_punctual']?.['lights'];
+  if (!lightDefs || !Array.isArray(lightDefs) || lightDefs.length === 0) {
+    return [];
+  }
+
+  const lights: Light[] = [];
+
+  for (const node of gltf.nodes || []) {
+    const nodeLight = node.extensions?.KHR_lights_punctual;
+    if (!nodeLight || typeof nodeLight.light !== 'number') {
+      // eslint-disable-next-line no-continue
+      continue;
+    }
+    const gltfLight = lightDefs[nodeLight.light];
+    if (!gltfLight) {
+      // eslint-disable-next-line no-continue
+      continue;
+    }
+
+    const color = (gltfLight.color || [1, 1, 1]) as [number, number, number];
+    const intensity = gltfLight.intensity ?? 1;
+    const range = gltfLight.range;
+
+    switch (gltfLight.type) {
+      case 'directional':
+        lights.push(parseDirectionalLight(node, color, intensity));
+        break;
+      case 'point':
+        lights.push(parsePointLight(node, color, intensity, range));
+        break;
+      case 'spot':
+        lights.push(parsePointLight(node, color, intensity, range));
+        break;
+      default:
+        // Unsupported light type
+        break;
+    }
+  }
+
+  return lights;
+}
+
+function parsePointLight(
+  node: GLTFNodePostprocessed,
+  color: [number, number, number],
+  intensity: number,
+  range?: number
+): PointLight {
+  const position: Readonly<[number, number, number]> = node.translation
+    ? ([...node.translation] as [number, number, number])
+    : ([0, 0, 0] as [number, number, number]);
+
+  let attenuation: Readonly<[number, number, number]> = [1, 0, 0];
+  if (range !== undefined && range > 0) {
+    attenuation = [1, 0, 1 / (range * range)] as [number, number, number];
+  }
+
+  return {
+    type: 'point',
+    position,
+    color,
+    intensity,
+    attenuation
+  };
+}
+
+function parseDirectionalLight(
+  node: GLTFNodePostprocessed,
+  color: [number, number, number],
+  intensity: number
+): DirectionalLight {
+  let direction: [number, number, number] = [0, 0, -1];
+
+  if (node.rotation) {
+    const orientation = new Matrix4().fromQuaternion(node.rotation);
+    direction = orientation.transformDirection([0, 0, -1]) as [number, number, number];
+  }
+
+  return {
+    type: 'directional',
+    direction,
+    color,
+    intensity
+  };
+}

package/src/pbr/pbr-environment.ts

@@ -3,15 +3,15 @@
 // Copyright (c) vis.gl contributors
 
 import {Device, SamplerProps} from '@luma.gl/core';
-import {AsyncTexture} from '@luma.gl/engine';
+import {DynamicTexture} from '@luma.gl/engine';
 import {loadImageTexture} from '@loaders.gl/textures';
 
 /** Environment textures for PBR module */
 export type PBREnvironment = {
   /** Bi-directional Reflectance Distribution Function (BRDF) lookup table */
-  brdfLutTexture: AsyncTexture;
-  diffuseEnvSampler: AsyncTexture;
-  specularEnvSampler: AsyncTexture;
+  brdfLutTexture: DynamicTexture;
+  diffuseEnvSampler: DynamicTexture;
+  specularEnvSampler: DynamicTexture;
 };
 
 export type PBREnvironmentProps = {
@@ -22,7 +22,7 @@ export type PBREnvironmentProps = {
 
 /** Loads textures for PBR environment */
 export function loadPBREnvironment(device: Device, props: PBREnvironmentProps): PBREnvironment {
-  const brdfLutTexture = new AsyncTexture(device, {
+  const brdfLutTexture = new DynamicTexture(device, {
     id: 'brdfLUT',
     sampler: {
       addressModeU: 'clamp-to-edge',
@@ -84,13 +84,13 @@ function makeCube(
     getTextureForFace: (dir: number) => Promise<any> | Promise<any>[];
     sampler: SamplerProps;
   }
-): AsyncTexture {
+): DynamicTexture {
   const data = {};
   FACES.forEach(face => {
     // @ts-ignore TODO
     data[String(face)] = getTextureForFace(face);
   });
-  return new AsyncTexture(device, {
+  return new DynamicTexture(device, {
     id,
     dimension: 'cube',
     mipmaps: false,