@luma.gl/gltf 9.0.0-alpha.54 → 9.0.0-beta.10

package/dist/gltf/gltf-animator.js

@@ -1,224 +1,189 @@
 import { assert, log } from '@luma.gl/core';
 import { Matrix4, Quaternion } from '@math.gl/core';
+// TODO: import from loaders.gl?
 export const ATTRIBUTE_TYPE_TO_COMPONENTS = {
-  SCALAR: 1,
-  VEC2: 2,
-  VEC3: 3,
-  VEC4: 4,
-  MAT2: 4,
-  MAT3: 9,
-  MAT4: 16
+    SCALAR: 1,
+    VEC2: 2,
+    VEC3: 3,
+    VEC4: 4,
+    MAT2: 4,
+    MAT3: 9,
+    MAT4: 16
 };
 export const ATTRIBUTE_COMPONENT_TYPE_TO_ARRAY = {
-  5120: Int8Array,
-  5121: Uint8Array,
-  5122: Int16Array,
-  5123: Uint16Array,
-  5125: Uint32Array,
-  5126: Float32Array
+    5120: Int8Array,
+    5121: Uint8Array,
+    5122: Int16Array,
+    5123: Uint16Array,
+    5125: Uint32Array,
+    5126: Float32Array
 };
 class GLTFAnimation {
-  constructor(props) {
-    this.name = void 0;
-    this.startTime = 0;
-    this.playing = true;
-    this.speed = 1;
-    this.channels = [];
-    Object.assign(this, props);
-  }
-  animate(timeMs) {
-    if (!this.playing) {
-      return;
-    }
-    const absTime = timeMs / 1000;
-    const time = (absTime - this.startTime) * this.speed;
-    this.channels.forEach(_ref => {
-      let {
-        sampler,
-        target,
-        path
-      } = _ref;
-      interpolate(time, sampler, target, path);
-      applyTranslationRotationScale(target, target._node);
-    });
-  }
+    name;
+    startTime = 0;
+    playing = true;
+    speed = 1;
+    channels = [];
+    constructor(props) {
+        Object.assign(this, props);
+    }
+    animate(timeMs) {
+        if (!this.playing) {
+            return;
+        }
+        const absTime = timeMs / 1000;
+        const time = (absTime - this.startTime) * this.speed;
+        this.channels.forEach(({ sampler, target, path }) => {
+            interpolate(time, sampler, target, path);
+            applyTranslationRotationScale(target, target._node);
+        });
+    }
 }
 export class GLTFAnimator {
-  constructor(gltf) {
-    this.animations = void 0;
-    this.animations = gltf.animations.map((animation, index) => {
-      const name = animation.name || `Animation-${index}`;
-      const samplers = animation.samplers.map(_ref2 => {
-        let {
-          input,
-          interpolation = 'LINEAR',
-          output
-        } = _ref2;
-        return {
-          input: accessorToJsArray(gltf.accessors[input]),
-          interpolation,
-          output: accessorToJsArray(gltf.accessors[output])
-        };
-      });
-      const channels = animation.channels.map(_ref3 => {
-        let {
-          sampler,
-          target
-        } = _ref3;
-        return {
-          sampler: samplers[sampler],
-          target: gltf.nodes[target.node],
-          path: target.path
-        };
-      });
-      return new GLTFAnimation({
-        name,
-        channels
-      });
-    });
-  }
-  animate(time) {
-    this.setTime(time);
-  }
-  setTime(time) {
-    this.animations.forEach(animation => animation.animate(time));
-  }
-  getAnimations() {
-    return this.animations;
-  }
+    animations;
+    constructor(gltf) {
+        this.animations = gltf.animations.map((animation, index) => {
+            const name = animation.name || `Animation-${index}`;
+            const samplers = animation.samplers.map(({ input, interpolation = 'LINEAR', output }) => ({
+                input: accessorToJsArray(gltf.accessors[input]),
+                interpolation,
+                output: accessorToJsArray(gltf.accessors[output])
+            }));
+            const channels = animation.channels.map(({ sampler, target }) => ({
+                sampler: samplers[sampler],
+                target: gltf.nodes[target.node],
+                path: target.path
+            }));
+            return new GLTFAnimation({ name, channels });
+        });
+    }
+    /** @deprecated Use .setTime(). Will be removed (deck.gl is using this) */
+    animate(time) {
+        this.setTime(time);
+    }
+    setTime(time) {
+        this.animations.forEach(animation => animation.animate(time));
+    }
+    getAnimations() {
+        return this.animations;
+    }
 }
+//
 function accessorToJsArray(accessor) {
-  if (!accessor._animation) {
-    const ArrayType = ATTRIBUTE_COMPONENT_TYPE_TO_ARRAY[accessor.componentType];
-    const components = ATTRIBUTE_TYPE_TO_COMPONENTS[accessor.type];
-    const length = components * accessor.count;
-    const {
-      buffer,
-      byteOffset
-    } = accessor.bufferView.data;
-    const array = new ArrayType(buffer, byteOffset + (accessor.byteOffset || 0), length);
-    if (components === 1) {
-      accessor._animation = Array.from(array);
-    } else {
-      const slicedArray = [];
-      for (let i = 0; i < array.length; i += components) {
-        slicedArray.push(Array.from(array.slice(i, i + components)));
-      }
-      accessor._animation = slicedArray;
-    }
-  }
-  return accessor._animation;
+    if (!accessor._animation) {
+        const ArrayType = ATTRIBUTE_COMPONENT_TYPE_TO_ARRAY[accessor.componentType];
+        const components = ATTRIBUTE_TYPE_TO_COMPONENTS[accessor.type];
+        const length = components * accessor.count;
+        const { buffer, byteOffset } = accessor.bufferView.data;
+        const array = new ArrayType(buffer, byteOffset + (accessor.byteOffset || 0), length);
+        if (components === 1) {
+            accessor._animation = Array.from(array);
+        }
+        else {
+            // Slice array
+            const slicedArray = [];
+            for (let i = 0; i < array.length; i += components) {
+                slicedArray.push(Array.from(array.slice(i, i + components)));
+            }
+            accessor._animation = slicedArray;
+        }
+    }
+    return accessor._animation;
 }
+// TODO: share with GLTFInstantiator
 const helperMatrix = new Matrix4();
 function applyTranslationRotationScale(gltfNode, node) {
-  node.matrix.identity();
-  if (gltfNode.translation) {
-    node.matrix.translate(gltfNode.translation);
-  }
-  if (gltfNode.rotation) {
-    const rotationMatrix = helperMatrix.fromQuaternion(gltfNode.rotation);
-    node.matrix.multiplyRight(rotationMatrix);
-  }
-  if (gltfNode.scale) {
-    node.matrix.scale(gltfNode.scale);
-  }
+    node.matrix.identity();
+    if (gltfNode.translation) {
+        node.matrix.translate(gltfNode.translation);
+    }
+    if (gltfNode.rotation) {
+        const rotationMatrix = helperMatrix.fromQuaternion(gltfNode.rotation);
+        node.matrix.multiplyRight(rotationMatrix);
+    }
+    if (gltfNode.scale) {
+        node.matrix.scale(gltfNode.scale);
+    }
 }
 const quaternion = new Quaternion();
 function linearInterpolate(target, path, start, stop, ratio) {
-  if (path === 'rotation') {
-    quaternion.slerp({
-      start,
-      target: stop,
-      ratio
-    });
-    for (let i = 0; i < quaternion.length; i++) {
-      target[path][i] = quaternion[i];
-    }
-  } else {
-    for (let i = 0; i < start.length; i++) {
-      target[path][i] = ratio * stop[i] + (1 - ratio) * start[i];
-    }
-  }
+    if (path === 'rotation') {
+        // SLERP when path is rotation
+        quaternion.slerp({ start, target: stop, ratio });
+        for (let i = 0; i < quaternion.length; i++) {
+            target[path][i] = quaternion[i];
+        }
+    }
+    else {
+        // regular interpolation
+        for (let i = 0; i < start.length; i++) {
+            target[path][i] = ratio * stop[i] + (1 - ratio) * start[i];
+        }
+    }
 }
-function cubicsplineInterpolate(target, path, _ref4) {
-  let {
-    p0,
-    outTangent0,
-    inTangent1,
-    p1,
-    tDiff,
-    ratio: t
-  } = _ref4;
-  for (let i = 0; i < target[path].length; i++) {
-    const m0 = outTangent0[i] * tDiff;
-    const m1 = inTangent1[i] * tDiff;
-    target[path][i] = (2 * Math.pow(t, 3) - 3 * Math.pow(t, 2) + 1) * p0[i] + (Math.pow(t, 3) - 2 * Math.pow(t, 2) + t) * m0 + (-2 * Math.pow(t, 3) + 3 * Math.pow(t, 2)) * p1[i] + (Math.pow(t, 3) - Math.pow(t, 2)) * m1;
-  }
+function cubicsplineInterpolate(target, path, { p0, outTangent0, inTangent1, p1, tDiff, ratio: t }) {
+    // TODO: Quaternion might need normalization
+    for (let i = 0; i < target[path].length; i++) {
+        const m0 = outTangent0[i] * tDiff;
+        const m1 = inTangent1[i] * tDiff;
+        target[path][i] =
+            (2 * Math.pow(t, 3) - 3 * Math.pow(t, 2) + 1) * p0[i] +
+                (Math.pow(t, 3) - 2 * Math.pow(t, 2) + t) * m0 +
+                (-2 * Math.pow(t, 3) + 3 * Math.pow(t, 2)) * p1[i] +
+                (Math.pow(t, 3) - Math.pow(t, 2)) * m1;
+    }
 }
 function stepInterpolate(target, path, value) {
-  for (let i = 0; i < value.length; i++) {
-    target[path][i] = value[i];
-  }
+    for (let i = 0; i < value.length; i++) {
+        target[path][i] = value[i];
+    }
 }
-function interpolate(time, _ref5, target, path) {
-  let {
-    input,
-    interpolation,
-    output
-  } = _ref5;
-  const maxTime = input[input.length - 1];
-  const animationTime = time % maxTime;
-  const nextIndex = input.findIndex(t => t >= animationTime);
-  const previousIndex = Math.max(0, nextIndex - 1);
-  if (!Array.isArray(target[path])) {
-    switch (path) {
-      case 'translation':
-        target[path] = [0, 0, 0];
-        break;
-      case 'rotation':
-        target[path] = [0, 0, 0, 1];
-        break;
-      case 'scale':
-        target[path] = [1, 1, 1];
-        break;
-      default:
-        log.warn(`Bad animation path ${path}`)();
-    }
-  }
-  assert(target[path].length === output[previousIndex].length);
-  const previousTime = input[previousIndex];
-  const nextTime = input[nextIndex];
-  switch (interpolation) {
-    case 'STEP':
-      stepInterpolate(target, path, output[previousIndex]);
-      break;
-    case 'LINEAR':
-      if (nextTime > previousTime) {
-        const ratio = (animationTime - previousTime) / (nextTime - previousTime);
-        linearInterpolate(target, path, output[previousIndex], output[nextIndex], ratio);
-      }
-      break;
-    case 'CUBICSPLINE':
-      if (nextTime > previousTime) {
-        const ratio = (animationTime - previousTime) / (nextTime - previousTime);
-        const tDiff = nextTime - previousTime;
-        const p0 = output[3 * previousIndex + 1];
-        const outTangent0 = output[3 * previousIndex + 2];
-        const inTangent1 = output[3 * nextIndex + 0];
-        const p1 = output[3 * nextIndex + 1];
-        cubicsplineInterpolate(target, path, {
-          p0,
-          outTangent0,
-          inTangent1,
-          p1,
-          tDiff,
-          ratio
-        });
-      }
-      break;
-    default:
-      log.warn(`Interpolation ${interpolation} not supported`)();
-      break;
-  }
+function interpolate(time, { input, interpolation, output }, target, path) {
+    const maxTime = input[input.length - 1];
+    const animationTime = time % maxTime;
+    const nextIndex = input.findIndex(t => t >= animationTime);
+    const previousIndex = Math.max(0, nextIndex - 1);
+    if (!Array.isArray(target[path])) {
+        switch (path) {
+            case 'translation':
+                target[path] = [0, 0, 0];
+                break;
+            case 'rotation':
+                target[path] = [0, 0, 0, 1];
+                break;
+            case 'scale':
+                target[path] = [1, 1, 1];
+                break;
+            default:
+                log.warn(`Bad animation path ${path}`)();
+        }
+    }
+    assert(target[path].length === output[previousIndex].length);
+    const previousTime = input[previousIndex];
+    const nextTime = input[nextIndex];
+    switch (interpolation) {
+        case 'STEP':
+            stepInterpolate(target, path, output[previousIndex]);
+            break;
+        case 'LINEAR':
+            if (nextTime > previousTime) {
+                const ratio = (animationTime - previousTime) / (nextTime - previousTime);
+                linearInterpolate(target, path, output[previousIndex], output[nextIndex], ratio);
+            }
+            break;
+        case 'CUBICSPLINE':
+            if (nextTime > previousTime) {
+                const ratio = (animationTime - previousTime) / (nextTime - previousTime);
+                const tDiff = nextTime - previousTime;
+                const p0 = output[3 * previousIndex + 1];
+                const outTangent0 = output[3 * previousIndex + 2];
+                const inTangent1 = output[3 * nextIndex + 0];
+                const p1 = output[3 * nextIndex + 1];
+                cubicsplineInterpolate(target, path, { p0, outTangent0, inTangent1, p1, tDiff, ratio });
+            }
+            break;
+        default:
+            log.warn(`Interpolation ${interpolation} not supported`)();
+            break;
+    }
 }
-//# sourceMappingURL=gltf-animator.js.map

package/dist/gltf/gltf-instantiator.d.ts

@@ -1,8 +1,7 @@
 import { Device, Buffer, PrimitiveTopology } from '@luma.gl/core';
 import { Geometry, GroupNode, ModelNode, ModelProps } from '@luma.gl/engine';
-import { WebGLDevice } from '@luma.gl/webgl';
-import { GLTFAnimator } from './gltf-animator';
-import type { PBREnvironment } from '../pbr/pbr-environment';
+import { GLTFAnimator } from "./gltf-animator.js";
+import type { PBREnvironment } from "../pbr/pbr-environment.js";
 export type GLTFInstantiatorOptions = {
     modelOptions?: Partial<ModelProps>;
     pbrDebug?: boolean;
@@ -15,7 +14,7 @@ export type GLTFInstantiatorOptions = {
  * Walks the parsed and resolved glTF structure and builds a luma.gl scenegraph
  */
 export declare class GLTFInstantiator {
-    device: WebGLDevice;
+    device: Device;
     options: GLTFInstantiatorOptions;
     gltf: any;
     constructor(device: Device, options?: GLTFInstantiatorOptions);

package/dist/gltf/gltf-instantiator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gltf-instantiator.d.ts","sourceRoot":"","sources":["../../src/gltf/gltf-instantiator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAChE,OAAO,EAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAE3E,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAG3C,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAE7C,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,wBAAwB,CAAC;AAE3D,MAAM,MAAM,uBAAuB,GAAG;IACpC,YAAY,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IACnC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,6BAA6B,CAAC,EAAE,cAAc,CAAC;IAC/C,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB,CAAA;AAUD;;;GAGG;AACH,qBAAa,gBAAgB;IAE3B,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,EAAE,uBAAuB,CAAC;IACjC,IAAI,EAAE,GAAG,CAAC;gBAEE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,uBAA4B;IAKjE,WAAW,CAAC,IAAI,EAAE,GAAG,GAAG,SAAS,EAAE;IAMnC,cAAc,IAAI,YAAY;IAQ9B,WAAW,CAAC,SAAS,EAAE,GAAG,GAAG,SAAS;IAUtC,UAAU,CAAC,QAAQ,KAAA;IAuCnB,UAAU,CAAC,QAAQ,KAAA,GAAG,SAAS;IAiB/B,eAAe,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,KAAA,GAAG,SAAS;IAuBnE,cAAc,CAAC,UAAU,EAAE,GAAG;IAI9B,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,iBAAiB,GAAG,QAAQ;IAgBrF,YAAY,CAAC,SAAS,KAAA,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAuB9C,aAAa,CAAC,WAAW,KAAA;IAMzB,QAAQ,IAAI,OAAO;CAOpB;AAKD,aAAK,MAAM;IACT,MAAM,IAAM;IACZ,KAAK,IAAM;IACX,SAAS,IAAM;IACf,UAAU,IAAM;IAChB,SAAS,IAAM;IACf,cAAc,IAAM;IACpB,YAAY,IAAM;CACnB;AAED,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,YAAY,GAC7I,iBAAiB,CAWnB"}
+{"version":3,"file":"gltf-instantiator.d.ts","sourceRoot":"","sources":["../../src/gltf/gltf-instantiator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAChE,OAAO,EAAC,QAAQ,EAAqB,SAAS,EAAE,SAAS,EAAE,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAG9F,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAE7C,OAAO,KAAK,EAAC,cAAc,EAAC,kCAA+B;AAE3D,MAAM,MAAM,uBAAuB,GAAG;IACpC,YAAY,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IACnC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,6BAA6B,CAAC,EAAE,cAAc,CAAC;IAC/C,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAUF;;;GAGG;AACH,qBAAa,gBAAgB;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,uBAAuB,CAAC;IACjC,IAAI,EAAE,GAAG,CAAC;gBAEE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,uBAA4B;IAKjE,WAAW,CAAC,IAAI,EAAE,GAAG,GAAG,SAAS,EAAE;IAMnC,cAAc,IAAI,YAAY;IAQ9B,WAAW,CAAC,SAAS,EAAE,GAAG,GAAG,SAAS;IAUtC,UAAU,CAAC,QAAQ,KAAA;IAuCnB,UAAU,CAAC,QAAQ,KAAA,GAAG,SAAS;IAiB/B,eAAe,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,KAAA,GAAG,SAAS;IA0BnE,cAAc,CAAC,UAAU,EAAE,GAAG;IAI9B,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,iBAAiB,GAAG,QAAQ;IAgBrF,YAAY,CAAC,SAAS,KAAA,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAuB9C,aAAa,CAAC,WAAW,KAAA;IAMzB,QAAQ,IAAI,OAAO;CAOpB;AAKD,aAAK,MAAM;IACT,MAAM,IAAM;IACZ,KAAK,IAAM;IACX,SAAS,IAAM;IACf,UAAU,IAAM;IAChB,SAAS,IAAM;IACf,cAAc,IAAM;IACpB,YAAY,IAAM;CACnB;AAED,wBAAgB,2BAA2B,CACzC,QAAQ,EACJ,MAAM,CAAC,MAAM,GACb,MAAM,CAAC,KAAK,GACZ,MAAM,CAAC,UAAU,GACjB,MAAM,CAAC,SAAS,GAChB,MAAM,CAAC,SAAS,GAChB,MAAM,CAAC,cAAc,GACrB,MAAM,CAAC,YAAY,GACtB,iBAAiB,CAmBnB"}