@woosh/meep-engine 2.47.42 → 2.48.0

package/src/core/geom/Quaternion.js

@@ -3,7 +3,6 @@
  */
 
 
-import { Matrix4 as ThreeMatrix4 } from "three";
 import { assert } from "../assert.js";
 import Signal from "../events/signal/Signal.js";
 import { clamp } from "../math/clamp.js";
@@ -15,82 +14,11 @@ import { computeHashFloat } from "../primitives/numbers/computeHashFloat.js";
 import { epsilonEquals } from "../math/epsilonEquals.js";
 import { EPSILON } from "../math/EPSILON.js";
 
-const matrix = new ThreeMatrix4();
 
 const forward = new Vector3();
 const up = new Vector3();
 const right = new Vector3();
 
-/**
- *
- * @param {number[]|Float32Array} out
- * @param {number} fx
- * @param {number} fy
- * @param {number} fz
- * @param {number} ux
- * @param {number} uy
- * @param {number} uz
- */
-export function quat_array_from_look(out, fx, fy, fz, ux, uy, uz) {
-    forward.set(fx, fy, fz);
-    forward.normalize();
-
-    right._crossVectors(ux, uy, uz, forward.x, forward.y, forward.z);
-    right.normalize();
-
-    up.crossVectors(forward, right);
-
-    var m00 = right.x;
-    var m01 = right.y;
-    var m02 = right.z;
-    var m10 = up.x;
-    var m11 = up.y;
-    var m12 = up.z;
-    var m20 = forward.x;
-    var m21 = forward.y;
-    var m22 = forward.z;
-
-
-    const num8 = (m00 + m11) + m22;
-
-    let _x, _y, _z, _w;
-
-    if (num8 > 0) {
-        let num = Math.sqrt(num8 + 1);
-        _w = num * 0.5;
-        num = 0.5 / num;
-        _x = (m12 - m21) * num;
-        _y = (m20 - m02) * num;
-        _z = (m01 - m10) * num;
-    } else if ((m00 >= m11) && (m00 >= m22)) {
-        var num7 = Math.sqrt(((1 + m00) - m11) - m22);
-        var num4 = 0.5 / num7;
-        _x = 0.5 * num7;
-        _y = (m01 + m10) * num4;
-        _z = (m02 + m20) * num4;
-        _w = (m12 - m21) * num4;
-    } else if (m11 > m22) {
-        var num6 = Math.sqrt(((1 + m11) - m00) - m22);
-        var num3 = 0.5 / num6;
-        _x = (m10 + m01) * num3;
-        _y = 0.5 * num6;
-        _z = (m21 + m12) * num3;
-        _w = (m20 - m02) * num3;
-    } else {
-        var num5 = Math.sqrt(((1 + m22) - m00) - m11);
-        var num2 = 0.5 / num5;
-        _x = (m20 + m02) * num2;
-        _y = (m21 + m12) * num2;
-        _z = 0.5 * num5;
-        _w = (m01 - m10) * num2;
-    }
-
-    out[0] = _x;
-    out[1] = _y;
-    out[2] = _z;
-    out[3] = _w;
-}
-
 /**
  * just in case you need that function also
  * @param {Vector3} axis
@@ -268,19 +196,6 @@ class Quaternion {
         this._lookRotation(vForward.x, vForward.y, vForward.z, vUp.x, vUp.y, vUp.z);
     }
 
-    /**
-     *
-     * @param {Euler} euler
-     * @return {void|Quaternion|Euler}
-     * @private
-     */
-    __setThreeEuler(euler) {
-
-        this.__setRotationMatrix(matrix.elements);
-
-        return euler.setFromRotationMatrix(matrix);
-    }
-
 
     /**
      *

package/src/core/graph/SquareMatrix.js

@@ -1,11 +1,11 @@
-import { DataType2TypedArrayConstructorMapping } from "../collection/table/DataType2TypedArrayConstructorMapping.js";
+import { DataType2TypedArrayConstructorMapping } from "../binary/type/DataType2TypedArrayConstructorMapping.js";
 import { assert } from "../assert.js";
 
 export class SquareMatrix {
     /**
      *
      * @param {number} size
-     * @param {DataType|string} type
+     * @param {BinaryDataType|string} type
      */
     constructor(size, type) {
         const TypedArray = DataType2TypedArrayConstructorMapping[type];
@@ -22,7 +22,7 @@ export class SquareMatrix {
 
         /**
          *
-         * @type {DataType}
+         * @type {BinaryDataType}
          */
         this.type = type;
 

package/src/core/graph/SquareMatrix.spec.js

@@ -1,8 +1,8 @@
 import { SquareMatrix } from "./SquareMatrix.js";
-import { DataType } from "../collection/table/DataType.js";
+import { BinaryDataType } from "../binary/type/BinaryDataType.js";
 
 test('set/get cell', () => {
-    const m = new SquareMatrix(2, DataType.Uint8);
+    const m = new SquareMatrix(2, BinaryDataType.Uint8);
 
     m.setCellValue(0, 0, 7);
     m.setCellValue(1, 0, 11);
@@ -17,7 +17,7 @@ test('set/get cell', () => {
 
 
 test('transpose', () => {
-    const m = new SquareMatrix(2, DataType.Uint8);
+    const m = new SquareMatrix(2, BinaryDataType.Uint8);
 
     m.setCellValue(0, 0, 7);
     m.setCellValue(1, 0, 11);
@@ -34,14 +34,14 @@ test('transpose', () => {
 
 
 test('copy', ()=>{
-    const m = new SquareMatrix(2, DataType.Uint8);
+    const m = new SquareMatrix(2, BinaryDataType.Uint8);
 
     m.setCellValue(0, 0, 7);
     m.setCellValue(1, 0, 11);
     m.setCellValue(0, 1, 13);
     m.setCellValue(1, 1, 19);
 
-    const b = new SquareMatrix(2,DataType.Uint8);
+    const b = new SquareMatrix(2,BinaryDataType.Uint8);
 
     b.copy(m);
 

package/src/core/graph/eigen/eigen.spec.js

@@ -1,5 +1,5 @@
 import { SquareMatrix } from "../SquareMatrix.js";
-import { DataType } from "../../collection/table/DataType.js";
+import { BinaryDataType } from "../../binary/type/BinaryDataType.js";
 import { matrix_eigenvalues_in_place } from "./eigen.js";
 
 function roughly_equal_array_vectors(actual, expected) {
@@ -13,7 +13,7 @@ function roughly_equal_array_vectors(actual, expected) {
 test("sample", () => {
 
 
-    const t = new SquareMatrix(3, DataType.Float32);
+    const t = new SquareMatrix(3, BinaryDataType.Float32);
     t.fromArray([
         4, -6, 5,
         -6, 3, 4,

package/src/core/graph/graph_k_means_cluster.js

@@ -1,7 +1,7 @@
 //
 import { seededRandom } from "../math/random/seededRandom.js";
 import { SquareMatrix } from "./SquareMatrix.js";
-import { DataType } from "../collection/table/DataType.js";
+import { BinaryDataType } from "../binary/type/BinaryDataType.js";
 import { BitSet } from "../binary/BitSet.js";
 import FastBinaryHeap from "../collection/heap/FastBinaryHeap.js";
 import { randomIntegerBetween } from "../math/random/randomIntegerBetween.js";
@@ -36,7 +36,7 @@ function node_distance(n0, n1, graph) {
 function build_distance_matrix(graph, node_array, targets, node_index_map) {
     const node_count = node_array.length;
 
-    const m_distances = new SquareMatrix(node_count, DataType.Float32);
+    const m_distances = new SquareMatrix(node_count, BinaryDataType.Float32);
 
     const flags = BitSet.fixedSize(node_count);
 

package/src/core/graph/graph_laplacian_matrix.js

@@ -1,6 +1,6 @@
 import { graph_degree_matrix } from "./graph_degree_matrix.js";
 import { SquareMatrix } from "./SquareMatrix.js";
-import { DataType } from "../collection/table/DataType.js";
+import { BinaryDataType } from "../binary/type/BinaryDataType.js";
 import { graph_adjacency_matrix } from "./graph_adjacency_matrix.js";
 
 /**
@@ -12,8 +12,8 @@ import { graph_adjacency_matrix } from "./graph_adjacency_matrix.js";
  * @param {Map<T,number>} node_indices
  */
 export function graph_laplacian_matrix(graph, result, node_indices) {
-    const degree = new SquareMatrix(result.size, DataType.Uint8);
-    const adjacency = new SquareMatrix(result.size, DataType.Uint8);
+    const degree = new SquareMatrix(result.size, BinaryDataType.Uint8);
+    const adjacency = new SquareMatrix(result.size, BinaryDataType.Uint8);
 
     graph_degree_matrix(graph, degree, node_indices);
     graph_adjacency_matrix(graph, adjacency, node_indices);

package/src/core/model/node-graph/node/NodeDescription.js

@@ -183,7 +183,7 @@ export class NodeDescription {
 
     /**
      *
-     * @param {DataType} type
+     * @param {BinaryDataType} type
      * @param {String} name
      * @param {PortDirection} direction
      */

package/src/engine/asset/loaders/GLTFAssetLoader.js

@@ -80,7 +80,7 @@ function transferRootTransform(root, result) {
 
     // record transformation matrix on the root
     root.updateMatrix();
-    result.fromThreeMatrix4(root.matrix);
+    result.fromMatrix4(root.matrix.elements);
 
     return true;
 }

package/src/engine/ecs/foliage/InstancedFoliage.js

@@ -4,7 +4,7 @@ import { LeafNode } from "../../../core/bvh2/LeafNode.js";
 import Vector4 from "../../../core/geom/Vector4.js";
 
 import { BufferGeometry } from 'three';
-import { DataType } from "../../../core/collection/table/DataType.js";
+import { BinaryDataType } from "../../../core/binary/type/BinaryDataType.js";
 import { RowFirstTableSpec } from "../../../core/collection/table/RowFirstTableSpec.js";
 import {
     serializeBinaryNodeToBinaryBuffer
@@ -26,9 +26,9 @@ import { compose_matrix4_array } from "../../../core/geom/3d/compose_matrix4_arr
  * @type {RowFirstTableSpec}
  */
 const dataSpec = new RowFirstTableSpec([
-    DataType.Float32, DataType.Float32, DataType.Float32, //position
-    DataType.Uint32, //rotation
-    DataType.Float32, DataType.Float32, DataType.Float32 //scale
+    BinaryDataType.Float32, BinaryDataType.Float32, BinaryDataType.Float32, //position
+    BinaryDataType.Uint32, //rotation
+    BinaryDataType.Float32, BinaryDataType.Float32, BinaryDataType.Float32 //scale
 ]);
 
 export class InstancedFoliage {

package/src/engine/ecs/fow/FogOfWar.js

@@ -11,7 +11,7 @@ import Vector4 from "../../../core/geom/Vector4.js";
 import Signal from "../../../core/events/signal/Signal.js";
 import { RowFirstTable } from "../../../core/collection/table/RowFirstTable.js";
 import { RowFirstTableSpec } from "../../../core/collection/table/RowFirstTableSpec.js";
-import { DataType } from "../../../core/collection/table/DataType.js";
+import { BinaryDataType } from "../../../core/binary/type/BinaryDataType.js";
 import { writeSample2DDataToDataTexture } from "../../graphics/texture/sampler/writeSampler2DDataToDataTexture.js";
 
 const samplePosition = [];
@@ -38,9 +38,9 @@ const INITIAL_FADE_VALUE = 254;
  * @type {RowFirstTableSpec}
  */
 const revealMaskTableSpec = new RowFirstTableSpec([
-    DataType.Int32, // Index
-    DataType.Float32, // Precise current value
-    DataType.Float32 // Fade speed
+    BinaryDataType.Int32, // Index
+    BinaryDataType.Float32, // Precise current value
+    BinaryDataType.Float32 // Fade speed
 ]);
 
 const fadeRow = [];

package/src/engine/ecs/terrain/ecs/PromiseSamplerHeight.js

@@ -1,5 +1,5 @@
 import { BinaryBuffer } from "../../../../core/binary/BinaryBuffer.js";
-import { deserializeTexture } from "../../../graphics/texture/sampler/TextureBinaryBufferSerializer.js";
+import { deserializeTexture } from "../../../graphics/texture/sampler/serialization/TextureBinaryBufferSerializer.js";
 import { Sampler2D } from "../../../graphics/texture/sampler/Sampler2D.js";
 import { GameAssetType } from "../../../asset/GameAssetType.js";
 import rgbaData2valueSampler2D from "../../../graphics/texture/sampler/rgbaData2valueSampler2D.js";

package/src/engine/ecs/transform/Transform.d.ts

@@ -6,6 +6,8 @@ export class Transform {
     public readonly rotation: Quaternion
     public readonly scale: Vector3
 
+    public readonly matrix:ArrayLike<number>
+
     public lookAt(target: Vector3): void
 
     static fromJSON(json: {

package/src/engine/ecs/transform/Transform.js

@@ -5,63 +5,69 @@
 import Vector3 from "../../../core/geom/Vector3.js";
 import Quaternion from "../../../core/geom/Quaternion.js";
 import { decompose_matrix_4_array } from "../../../core/geom/3d/decompose_matrix_4_array.js";
-import { mat4 } from "gl-matrix";
 import { compose_matrix4_array } from "../../../core/geom/3d/compose_matrix4_array.js";
 import { TransformFlags } from "./TransformFlags.js";
 import { allocate_transform_m4 } from "../../graphics/ecs/mesh-v2/allocate_transform_m4.js";
 import { assert } from "../../../core/assert.js";
+import { m4_multiply } from "../../../core/geom/3d/matrix/m4_multiply.js";
 
-const scratch_buffer = new ArrayBuffer(16 * 4);
-
-const m4_0 = new Float32Array(scratch_buffer, 0, 16);
+/**
+ *
+ * @type {Float32Array}
+ */
+const scratch_matrix = new Float32Array(16);
 
+/**
+ * Default set of flags for any {@link Transform}
+ * @type {TransformFlags|number}
+ */
 const FLAGS_DEFAULT = TransformFlags.AutomaticChangeDetection;
 
 /**
  * @class
  */
 export class Transform {
+
+    /**
+     * World-space position
+     * @type {Vector3}
+     * @readonly
+     */
+    position = new Vector3(0, 0, 0);
+
+    /**
+     * World-space rotation
+     * @type {Quaternion}
+     * @readonly
+     */
+    rotation = new Quaternion(0, 0, 0, 1);
+
+    /**
+     * World-space scale
+     * @type {Vector3}
+     * @readonly
+     */
+    scale = new Vector3(1, 1, 1);
+
+    /**
+     * World-space transform matrix, position, rotation and scale must match, but shear can be different
+     * @readonly
+     * @type {Float32Array}
+     */
+    matrix = allocate_transform_m4();
+
+    /**
+     * Various bit flags, see {@link TransformFlags}
+     * @protected
+     * @type {number}
+     */
+    flags = FLAGS_DEFAULT;
+
     /**
      *
      * @constructor
      */
     constructor() {
-
-        /**
-         * World-space position
-         * @type {Vector3}
-         * @readonly
-         */
-        this.position = new Vector3(0, 0, 0);
-
-        /**
-         * World-space rotation
-         * @type {Quaternion}
-         * @readonly
-         */
-        this.rotation = new Quaternion(0, 0, 0, 1);
-
-        /**
-         * World-space scale
-         * @type {Vector3}
-         * @readonly
-         */
-        this.scale = new Vector3(1, 1, 1);
-
-        /**
-         * World-space transform matrix, position, rotation and scale must match, but shear can be different
-         * @readonly
-         * @type {Float32Array}
-         */
-        this.matrix = allocate_transform_m4();
-
-        /**
-         * Various bit flags, see {@link TransformFlags}
-         * @protected
-         * @type {number}
-         */
-        this.flags = FLAGS_DEFAULT;
-
         // watch changes
         this.subscribeAllChanges(this.__handle_component_change, this);
     }
@@ -138,6 +144,9 @@ export class Transform {
         return (this.flags & flag) === flag;
     }
 
+    /**
+     * Update {@link matrix} attribute from current position/rotation/scale
+     */
     updateMatrix() {
         compose_matrix4_array(this.matrix, this.position, this.rotation, this.scale);
     }
@@ -270,25 +279,9 @@ export class Transform {
      * @param {Transform} b
      */
     multiplyTransforms(a, b) {
-        mat4.multiply(m4_0, a.matrix, b.matrix);
+        m4_multiply(scratch_matrix, a.matrix, b.matrix);
 
-        this.fromMatrix4(m4_0);
-    }
-
-    /**
-     * @deprecated use `fromMatrix4` directly instead
-     * @param {THREE.Matrix4} matrix
-     */
-    fromThreeMatrix4(matrix) {
-        this.fromMatrix4(matrix.elements);
-    }
-
-    /**
-     * @deprecated use `toMatrix4` directly instead
-     * @param {Matrix4} matrix
-     */
-    toThreeMatrix(matrix) {
-        this.toMatrix4(matrix.elements);
+        this.fromMatrix4(scratch_matrix);
     }
 
     /**

package/src/engine/ecs/transform/Transform.spec.js

@@ -0,0 +1,22 @@
+import { Transform } from "./Transform.js";
+import Vector3 from "../../../core/geom/Vector3.js";
+import Quaternion from "../../../core/geom/Quaternion.js";
+import { MATRIX_4_IDENTITY } from "../../../core/geom/3d/matrix/MATRIX_4_IDENTITY.js";
+
+test("constructor does not throw", () => {
+
+    expect(() => new Transform()).not.toThrow();
+
+});
+
+test("new transform has identity transform", () => {
+
+    const t = new Transform();
+
+
+    expect(t.position.equals(Vector3.zero)).toBe(true);
+    expect(t.rotation.equals(Quaternion.identity)).toBe(true);
+    expect(t.scale.equals(Vector3.one)).toBe(true);
+
+    expect(t.matrix).toEqual(MATRIX_4_IDENTITY);
+});

package/src/engine/graphics/ecs/light/binding/three/applyRotation.js

@@ -8,7 +8,7 @@ import { threeUpdateTransform } from "../../../../util/threeUpdateTransform.js";
 export function applyRotation(component, r) {
     const l = component.__threeObject;
 
-    r.__setThreeEuler(l.rotation);
+    r.toEulerAnglesXYZ(l.rotation);
 
     if (l.target !== undefined) {
 

package/src/engine/graphics/ecs/mesh/applyTransformToThreeObject.js

@@ -7,7 +7,9 @@ import { rootObject3DFastMatrixUpdate } from "./rootObject3DFastMatrixUpdate.js"
  */
 export function applyTransformToThreeObject(m, t) {
     m.position.copy(t.position);
-    t.rotation.__setThreeEuler(m.rotation);
+
+    t.rotation.toEulerAnglesXYZ(m.rotation);
+
     m.scale.copy(t.scale);
 
     rootObject3DFastMatrixUpdate(m);

package/src/engine/graphics/ecs/mesh-v2/allocate_transform_m4.js

@@ -1,3 +1,5 @@
+import { MATRIX_4_IDENTITY } from "../../../../core/geom/3d/matrix/MATRIX_4_IDENTITY.js";
+
 /**
  * Larger bucket sizes provide better cache locality
  * Larger bucket sizes also cause more hanging GC references, as if one matrix element is still held - ENTIRE bucket is still referenced
@@ -19,17 +21,6 @@ let transform_bucket_cursor = TRANSFORM_ALLOCATOR_BUCKET_CAPACITY;
 
 const MATRIX_BYTE_SIZE = 4 * 16;
 
-/**
- *
- * @type {Float32Array}
- */
-const MATRIX_IDENTITY = new Float32Array([
-    1, 0, 0, 0,
-    0, 1, 0, 0,
-    0, 0, 1, 0,
-    0, 0, 0, 1
-]);
-
 /**
  * custom Float32Array allocator, allocated memory in continuous chunks
  * @returns {Float32Array}
@@ -43,7 +34,7 @@ export function allocate_transform_m4() {
     const result = new Float32Array(transform_bucket, transform_bucket_cursor * MATRIX_BYTE_SIZE, 16);
 
     // initialize matrix
-    result.set(MATRIX_IDENTITY);
+    result.set(MATRIX_4_IDENTITY);
 
     transform_bucket_cursor++;
 

package/src/engine/graphics/geometry/AttributeSpec.js

@@ -1,6 +1,6 @@
-import { DataType } from "../../../core/collection/table/DataType.js";
+import { BinaryDataType } from "../../../core/binary/type/BinaryDataType.js";
 import { computeStringHash } from "../../../core/primitives/strings/computeStringHash.js";
-import { DataTypeByteSizes } from "../../../core/collection/table/DataTypeByteSizes.js";
+import { DataTypeByteSizes } from "../../../core/binary/type/DataTypeByteSizes.js";
 import { assert } from "../../../core/assert.js";
 
 /**
@@ -17,9 +17,9 @@ export class AttributeSpec {
 
         /**
          * How the attribute is stored in memory and interpreted
-         * @type {DataType}
+         * @type {BinaryDataType}
          */
-        this.type = DataType.Float32;
+        this.type = BinaryDataType.Float32;
 
         /**
          * How many elements the attribute uses. This is cardinality of a vector.
@@ -54,7 +54,7 @@ export class AttributeSpec {
              }) {
 
         assert.isString(name, 'name');
-        assert.enum(type, DataType, 'type');
+        assert.enum(type, BinaryDataType, 'type');
 
         assert.isNumber(itemSize, 'itemSize');
         assert.isNonNegativeInteger(itemSize, 'itemSize');

package/src/engine/graphics/material/optimization/MaterialOptimizationContext.js

@@ -25,10 +25,10 @@ import {
     computeThreeTextureTypeFromDataType
 } from "../../render/forward_plus/data/computeThreeTextureTypeFromDataType.js";
 import { typedArrayToDataType } from "../../../../core/collection/array/typedArrayToDataType.js";
-import { DataType } from "../../../../core/collection/table/DataType.js";
+import { BinaryDataType } from "../../../../core/binary/type/BinaryDataType.js";
 import {
     compute_typed_array_constructor_from_data_type
-} from "../../../../core/collection/table/DataType2TypedArrayConstructorMapping.js";
+} from "../../../../core/binary/type/DataType2TypedArrayConstructorMapping.js";
 import { copy_Sampler2D_channel_data } from "../../texture/sampler/copy_Sampler2D_channel_data.js";
 import { channelCountToThreeTextureFormat } from "../../texture/channelCountToThreeTextureFormat.js";
 import { prepare_atlas_texture } from "./prepare_atlas_texture.js";
@@ -325,7 +325,7 @@ function compute_default_texture_value(destination, source_material, texture_nam
 /**
  *
  * @param {string} texture_name
- * @returns {{type:DataType,itemSize:number, default_value:[]}}
+ * @returns {{type:BinaryDataType,itemSize:number, default_value:[]}}
  */
 function build_atlas_sampler_options_texture_name(texture_name) {
     let type;
@@ -334,27 +334,27 @@ function build_atlas_sampler_options_texture_name(texture_name) {
 
     switch (texture_name) {
         case 'normal':
-            type = DataType.Uint8;
+            type = BinaryDataType.Uint8;
             itemSize = 3;
             default_value = [127, 127, 255];
             break;
         case 'ao':
-            type = DataType.Uint8;
+            type = BinaryDataType.Uint8;
             itemSize = 1;
             default_value = [255];
             break;
         case "metalness":
-            type = DataType.Uint8;
+            type = BinaryDataType.Uint8;
             itemSize = 1;
             default_value = [0];
             break;
         case "roughness":
-            type = DataType.Uint8;
+            type = BinaryDataType.Uint8;
             itemSize = 1;
             default_value = [255];
             break;
         default:
-            type = DataType.Uint8;
+            type = BinaryDataType.Uint8;
             itemSize = 4;
             default_value = [255, 255, 255, 255];
             break;

package/src/engine/graphics/micron/build/buildMicronGeometryFromBufferGeometry.js

@@ -4,7 +4,7 @@ import { MicronGeometry } from "../format/MicronGeometry.js";
 import { buildAbstractPatchHierarchy } from "./hierarchy/buildAbstractPatchHierarchy.js";
 import { AttributeSpec } from "../../geometry/AttributeSpec.js";
 import { typedArrayToDataType } from "../../../../core/collection/array/typedArrayToDataType.js";
-import { DataType } from "../../../../core/collection/table/DataType.js";
+import { BinaryDataType } from "../../../../core/binary/type/BinaryDataType.js";
 import { MicronGeometryPatch } from "../format/MicronGeometryPatch.js";
 import { build_clustering_info } from "./debug/build_clustering_info.js";
 import { build_graph_info } from "./debug/build_graph_info.js";
@@ -36,7 +36,7 @@ function current_time_millis() {
 function custom_attribute_format_normal(spec, source) {
     // compress normals
     spec.normalized = true;
-    spec.type = DataType.Int8;
+    spec.type = BinaryDataType.Int8;
 }
 
 /**
@@ -46,7 +46,7 @@ function custom_attribute_format_normal(spec, source) {
  */
 function custom_attribute_format_uv(spec, source) {
     // TODO make sure we only do this when source actually fits in half-float
-    spec.type = DataType.Float16;
+    spec.type = BinaryDataType.Float16;
 }
 
 /**
@@ -56,7 +56,7 @@ function custom_attribute_format_uv(spec, source) {
  */
 function custom_attribute_format_color(spec, source) {
     // crush color data to 8 bit
-    spec.type = DataType.Uint8;
+    spec.type = BinaryDataType.Uint8;
     spec.normalized = true;
 }