@woosh/meep-engine 2.109.6 → 2.109.8

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

@@ -36,11 +36,12 @@ export class DataType {
             && this.name === other.name;
     }
 
-    toJSON() {
-        return {...this};
-    }
-
-    fromJSON({id, name}) {
+    /**
+     *
+     * @param {number} id
+     * @param {string} name
+     */
+    set(id, name) {
         assert.isNonNegativeInteger(id, 'id');
         assert.isString(name, 'name');
 
@@ -48,6 +49,14 @@ export class DataType {
         this.name = name;
     }
 
+    toJSON() {
+        return { ...this };
+    }
+
+    fromJSON({ id, name }) {
+        this.set(id, name);
+    }
+
     /**
      *
      * @param {*} j
@@ -61,6 +70,7 @@ export class DataType {
         return r;
     }
 
+
     /**
      *
      * @param {number} id
@@ -68,13 +78,9 @@ export class DataType {
      * @returns {DataType}
      */
     static from(id, name) {
-        assert.isNonNegativeInteger(id, 'id');
-        assert.isString(name, 'name');
-
         const r = new DataType();
 
-        r.id = id;
-        r.name = name;
+        r.set(id, name);
 
         return r;
     }

package/src/core/model/node-graph/ParametricDataType.d.ts

@@ -0,0 +1,34 @@
+/**
+ * Loosely can be thought as implementing generics, allows creation of types that reference other types
+ * Useful for collection types, like lists
+ */
+export class ParametricDataType extends DataType {
+    /**
+     * @param {number} id
+     * @param {string} name
+     * @param {DataType[]} [parameters]
+     */
+    static from(id: number, name: string, parameters?: DataType[]): ParametricDataType;
+    /**
+     *
+     * @type {DataType[]}
+     */
+    parameters: DataType[];
+    /**
+     *
+     * @param {number} id
+     * @param {string} name
+     * @param {DataType[]} [parameters]
+     */
+    set(id: number, name: string, parameters?: DataType[]): void;
+    /**
+     *
+     * @param {ParametricDataType} other
+     * @returns {boolean}
+     */
+    equals(other: ParametricDataType): boolean;
+    toJSON(): void;
+    fromJSON(j: any): void;
+}
+import { DataType } from "./DataType.js";
+//# sourceMappingURL=ParametricDataType.d.ts.map

package/src/core/model/node-graph/ParametricDataType.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ParametricDataType.d.ts","sourceRoot":"","sources":["../../../../../src/core/model/node-graph/ParametricDataType.js"],"names":[],"mappings":"AAGA;;;GAGG;AACH;IAyCI;;;;OAIG;IACH,gBAJW,MAAM,QACN,MAAM,eACN,QAAQ,EAAE,sBAUpB;IArDD;;;OAGG;IACH,YAFU,QAAQ,EAAE,CAEJ;IAGhB;;;;;OAKG;IACH,QAJW,MAAM,QACN,MAAM,eACN,QAAQ,EAAE,QAMpB;IAED;;;;OAIG;IACH,cAHW,kBAAkB,GAChB,OAAO,CAQnB;IAED,eAEC;IAED,uBAEC;CAgBJ;yBA7DwB,eAAe"}

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

@@ -0,0 +1,63 @@
+import { isArrayEqual } from "../../collection/array/isArrayEqual.js";
+import { DataType } from "./DataType.js";
+
+/**
+ * Loosely can be thought as implementing generics, allows creation of types that reference other types
+ * Useful for collection types, like lists
+ */
+export class ParametricDataType extends DataType {
+    /**
+     *
+     * @type {DataType[]}
+     */
+    parameters = [];
+
+
+    /**
+     *
+     * @param {number} id
+     * @param {string} name
+     * @param {DataType[]} [parameters]
+     */
+    set(id, name, parameters = []) {
+        super.set(id, name);
+
+        this.parameters = parameters;
+    }
+
+    /**
+     *
+     * @param {ParametricDataType} other
+     * @returns {boolean}
+     */
+    equals(other) {
+        if (!(other instanceof ParametricDataType)) {
+            return false;
+        }
+
+        return super.equals(other) && isArrayEqual(this.parameters, other.parameters);
+    }
+
+    toJSON() {
+        throw new Error('Unsupported Operation');
+    }
+
+    fromJSON(j) {
+        throw new Error('Unsupported Operation');
+    }
+
+    /**
+     * @param {number} id
+     * @param {string} name
+     * @param {DataType[]} [parameters]
+     */
+    static from(id, name, parameters = []) {
+
+        const r = new ParametricDataType();
+
+        r.set(id, name, parameters);
+
+        return r;
+
+    }
+}

package/src/core/model/node-graph/json/serializeNodeGraphToJSON.d.ts

@@ -5,7 +5,11 @@
  * @param {Map<*,string>} [classNames]
  */
 export function serializeNodeGraphToJSON({ graph, serializers, classNames }: NodeGraph): {
-    nodes: any[];
+    nodes: {
+        id: any;
+        description: number;
+        parameters: {};
+    }[];
     connections: any[];
     descriptions: any[];
 };

package/src/core/model/node-graph/json/serializeNodeGraphToJSON.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serializeNodeGraphToJSON.d.ts","sourceRoot":"","sources":["../../../../../../src/core/model/node-graph/json/serializeNodeGraphToJSON.js"],"names":[],"mappings":"AA0BA;;;;;GAKG;AACH;;;;EAwEC"}
+{"version":3,"file":"serializeNodeGraphToJSON.d.ts","sourceRoot":"","sources":["../../../../../../src/core/model/node-graph/json/serializeNodeGraphToJSON.js"],"names":[],"mappings":"AA0BA;;;;;GAKG;AACH;;;;;;;;EA6EC"}

package/src/core/model/node-graph/json/serializeNodeGraphToJSON.js

@@ -49,7 +49,9 @@ export function serializeNodeGraphToJSON({ graph, serializers = new Map(), class
     const descriptions = [];
 
     // extract node descriptions
-    graph.traverseNodes(node => {
+    const node_instances = graph.getNodes();
+    for (let i = 0; i < node_instances.length; i++) {
+        const node = node_instances[i];
 
         const description = node.description;
 
@@ -57,7 +59,7 @@ export function serializeNodeGraphToJSON({ graph, serializers = new Map(), class
 
         if (index !== -1) {
             // already recorded
-            return;
+            continue;
         }
 
         index = description_objects.length;
@@ -66,19 +68,22 @@ export function serializeNodeGraphToJSON({ graph, serializers = new Map(), class
         description_to_index_map.set(description, index);
 
         descriptions[index] = abstractJSONSerializer(description, serializers, classNames);
-    });
+    }
 
     const nodes = [];
 
-    graph.traverseNodes(node => {
+    for (let i = 0; i < node_instances.length; i++) {
+        const node = node_instances[i];
+
+        const parameters = nodeParametersToJSON(node, serializers, classNames);
 
         nodes.push({
             id: node.id,
             description: description_to_index_map.get(node.description),
-            parameters: nodeParametersToJSON(node, serializers, classNames)
+            parameters: parameters
         });
 
-    });
+    }
 
     const connections = [];
 

package/src/engine/asset/loaders/AssetLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AssetLoader.d.ts","sourceRoot":"","sources":["../../../../../src/engine/asset/loaders/AssetLoader.js"],"names":[],"mappings":"AAAA;;;GAGG;AACH;IACI;;;OAGG;IACH,2BAAoB;IAEpB;;;OAGG;IACH,SAFU,GAAG,CAEE;IAEf;;;;OAIG;IACH,0CAFW,GAAG,iBAKb;IAED;;OAEG;IACH,wBAEC;IAED;;;;;;;OAOG;IACH,qCALW,MAAM,kBACG,KAAK,kDAMxB;CACJ"}
+{"version":3,"file":"AssetLoader.d.ts","sourceRoot":"","sources":["../../../../../src/engine/asset/loaders/AssetLoader.js"],"names":[],"mappings":"AAAA;;;GAGG;AACH;IACI;;;OAGG;IACH,2BAAoB;IAEpB;;;OAGG;IACH,SAFU,GAAG,CAEE;IAEf;;;;OAIG;IACH,0CAFW,GAAG,iBAKb;IAED;;OAEG;IACH,wBAEC;IAED;;;;;;;OAOG;IACH,qCALW,MAAM,wDAOhB;CACJ"}

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

@@ -36,7 +36,7 @@ export class AssetLoader {
      *
      * @param {AssetRequestScope} scope
      * @param {string} path
-     * @param {function(Asset)} success
+     * @param {function(asset:Asset)} success
      * @param {function} failure
      * @param {function(current:number, total:number)} progress
      */

package/src/engine/asset/loaders/material/computeTextureEquality.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"computeTextureEquality.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/asset/loaders/material/computeTextureEquality.js"],"names":[],"mappings":"AAMA;;;;;GAKG;AACH,gEAFa,OAAO,CAoDnB;AAGD;;;;;GAKG;AACH,sCAJW,8DAAM,EAAE,GAAC;IAAC,KAAK,EAAC,MAAM,CAAC;IAAC,MAAM,EAAC,MAAM,CAAA;CAAC,KACtC,8DAAM,EAAE,GAAC;IAAC,KAAK,EAAC,MAAM,CAAC;IAAC,MAAM,EAAC,MAAM,CAAA;CAAC,GACpC,OAAO,CA8DnB"}
+{"version":3,"file":"computeTextureEquality.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/asset/loaders/material/computeTextureEquality.js"],"names":[],"mappings":"AAMA;;;;;GAKG;AACH,gEAFa,OAAO,CAoDnB;AAGD;;;;;GAKG;AACH,sCAJW,8DAAM,EAAE,GAAC;IAAC,KAAK,EAAC,MAAM,CAAC;IAAC,MAAM,EAAC,MAAM,CAAA;CAAC,KACtC,8DAAM,EAAE,GAAC;IAAC,KAAK,EAAC,MAAM,CAAC;IAAC,MAAM,EAAC,MAAM,CAAA;CAAC,GACpC,OAAO,CAmEnB"}

package/src/engine/asset/loaders/material/computeTextureEquality.js

@@ -93,7 +93,12 @@ export function textureImagesEqual(a, b) {
         return false;
     }
 
-    if (a instanceof ImageBitmap && b instanceof ImageBitmap) {
+    if (
+        // check that browser/environment has the class at all to avoid potential exceptions
+        // Required for Safari below version 15.6
+        ImageBitmap !== undefined
+        && (a instanceof ImageBitmap && b instanceof ImageBitmap)
+    ) {
         return computeImageBitmapEquality(a, b);
     }
 

package/src/engine/asset/loaders/material/computeTextureHash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"computeTextureHash.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/asset/loaders/material/computeTextureHash.js"],"names":[],"mappings":"AAuBA;;;;GAIG;AACH;;WAHoD,MAAM;YAAQ,MAAM;IAC5D,MAAM,CAkCjB;AA4CD;;;;GAIG;AACH,sCAHW,UAAQ,MAAM,OAAO,GACnB,MAAM,CAiClB"}
+{"version":3,"file":"computeTextureHash.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/asset/loaders/material/computeTextureHash.js"],"names":[],"mappings":"AAuBA;;;;GAIG;AACH;;WAHoD,MAAM;YAAQ,MAAM;IAC5D,MAAM,CAuCjB;AA4CD;;;;GAIG;AACH,sCAHW,UAAQ,MAAM,OAAO,GACnB,MAAM,CAiClB"}

package/src/engine/asset/loaders/material/computeTextureHash.js

@@ -1,8 +1,8 @@
-import { computeImageBitmapHash } from "./computeImageBitmapHash.js";
 import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
-import { computeHashFloat } from "../../../../core/primitives/numbers/computeHashFloat.js";
 import { murmur3_32 } from "../../../../core/math/hash/murmur3_32.js";
+import { computeHashFloat } from "../../../../core/primitives/numbers/computeHashFloat.js";
 import { computeStringHash } from "../../../../core/primitives/strings/computeStringHash.js";
+import { computeImageBitmapHash } from "./computeImageBitmapHash.js";
 
 /**
  *
@@ -35,7 +35,12 @@ export function computeImageDataHash(image) {
 
     let result = 0;
 
-    if (image instanceof ImageBitmap) {
+    if (
+        // check that browser/environment has the class at all to avoid potential exceptions
+        // Required for Safari below version 15.6
+        ImageBitmap !== undefined
+        && (image instanceof ImageBitmap)
+    ) {
         result = computeImageBitmapHash(image);
     } else if (image instanceof HTMLImageElement) {
         result = computeStringHash(image.src);

package/src/engine/graphics/geometry/instancing/InstancedMeshGroup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InstancedMeshGroup.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/geometry/instancing/InstancedMeshGroup.js"],"names":[],"mappings":"AAsCA;IA4iBI;;;;;OAKG;IACH,sBAJW,oBAAoB,uBAElB,kBAAkB,CAS9B;IAnjBG;;;;OAIG;IACH,wBAA2B;IAE3B;;;;OAIG;IACH,gCAAmC;IAEnC;;;OAGG;IACH,cAAc;IAEd;;;OAGG;IACH,UAFU,MAAM,CAEC;IAEjB;;;OAGG;IACH,YAFU,MAAM,CAEK;IACrB;;;OAGG;IACH,cAFU,MAAM,CAEM;IAEtB;;;OAGG;IACH,cAFU,MAAM,CAEO;IAEvB;;;OAGG;IACH,gBAFU,MAAM,CAEQ;IAExB;;;;OAIG;IACH,6BAAgC;IAEhC;;;;OAIG;IACH,kCAAqC;IAGrC;;;;;OAKG;IACH,yBAA4B;IAE5B;;;;OAIG;IACH,8BAAiC;IAEjC;;;;OAIG;IACH,wBAAuC;IAEvC;;;;OAIG;IACH,mBAAsB;IAEtB,eAAiB;IACjB,kBAAoB;IAEpB;;;;OAIG;IACH,oBAAqC;IAErC,kFAAqC;IAErC,mBAAqB;IAGzB,qBA8BC;IAED;;;OAGG;IACH,6BAUC;IAED;;;OAGG;IACH,+BAcC;IAED;;;OAGG;IACH,4BAEC;IAED,gBAIC;IAED;;;OAGG;IACH,sBAFW,oBAAoB,QAU9B;IA4CD;;;OAGG;IACH,4BAFW,MAAM,QAAQ,GAAC,MAAM,cAAc,QAS7C;IAED;;;OAGG;IACH,kBAFW,MAAM,QAWhB;IAED;;;OAGG;IACH,qBAFW,MAAM,QA6BhB;IAED;;;;OAIG;IACH,sBAHW,MAAM,aACN,MAAM,EAAE,GAAC,UAAU,MAAM,CAAC,GAAC,YAAY,QAIjD;IAED;;;;OAIG;IACH,kBAHW,MAAM,SACN,MAAM,EAAE,GAAC,UAAU,MAAM,CAAC,GAAC,YAAY,QAIjD;IAED;;;;;;;OAOG;IACH,6BANW,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,QAWhB;IAED,+BAMC;IAED;;;;OAIG;IACH,qCAEC;IAED;;;OAGG;IACH,0BAKC;IAED;;;OAGG;IACH,YAFY,MAAM,MAAI,CAIrB;IAED;;;;OAIG;IACH,yBAUC;IAED;;;;OAIG;IACH,sDAcC;IAED;;;OAGG;IACH,6BAoDC;IAED,cAwEC;;CAgBJ;;;;;+BAtlBM,OAAO;qBAAP,OAAO;yBAQW,+BAA+B"}
+{"version":3,"file":"InstancedMeshGroup.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/geometry/instancing/InstancedMeshGroup.js"],"names":[],"mappings":"AAuCA;IAqiBI;;;;;OAKG;IACH,sBAJW,oBAAoB,uBAElB,kBAAkB,CAS9B;IA5iBG;;;;OAIG;IACH,wBAA2B;IAE3B;;;;OAIG;IACH,gCAAmC;IAEnC;;;OAGG;IACH,cAAc;IAEd;;;OAGG;IACH,UAFU,MAAM,CAEC;IAEjB;;;OAGG;IACH,YAFU,MAAM,CAEK;IACrB;;;OAGG;IACH,cAFU,MAAM,CAEM;IAEtB;;;OAGG;IACH,cAFU,MAAM,CAEO;IAEvB;;;OAGG;IACH,gBAFU,MAAM,CAEQ;IAExB;;;;OAIG;IACH,6BAAgC;IAEhC;;;;OAIG;IACH,kCAAqC;IAGrC;;;;;OAKG;IACH,yBAA4B;IAE5B;;;;OAIG;IACH,8BAAiC;IAEjC;;;;OAIG;IACH,wBAAuC;IAEvC;;;;OAIG;IACH,mBAAsB;IAEtB,eAAiB;IACjB,kBAAoB;IAEpB;;;;OAIG;IACH,oBAAqC;IAErC,kFAAqC;IAErC,mBAAqB;IAGzB,qBA8BC;IAED;;;OAGG;IACH,6BAUC;IAED;;;OAGG;IACH,+BAcC;IAED;;;OAGG;IACH,4BAEC;IAED,gBAIC;IAED;;;OAGG;IACH,sBAFW,oBAAoB,QAU9B;IA4CD;;;OAGG;IACH,4BAFW,MAAM,QAAQ,GAAC,MAAM,cAAc,QAS7C;IAED;;;OAGG;IACH,kBAFW,MAAM,QAWhB;IAED;;;OAGG;IACH,qBAFW,MAAM,QA6BhB;IAED;;;;OAIG;IACH,sBAHW,MAAM,aACN,MAAM,EAAE,GAAC,UAAU,MAAM,CAAC,GAAC,YAAY,QAIjD;IAED;;;;OAIG;IACH,kBAHW,MAAM,SACN,MAAM,EAAE,GAAC,UAAU,MAAM,CAAC,GAAC,YAAY,QAIjD;IAED;;;;;;;OAOG;IACH,6BANW,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,QAWhB;IAED,+BAMC;IAED;;;;OAIG;IACH,qCAEC;IAED;;;OAGG;IACH,0BAKC;IAED;;;OAGG;IACH,YAFY,MAAM,MAAI,CAIrB;IAED;;;;OAIG;IACH,yBAUC;IAED;;;;OAIG;IACH,sDAcC;IAED;;;OAGG;IACH,6BAoDC;IAED,cAiEC;;CAgBJ;;;;;+BAhlBM,OAAO;qBAAP,OAAO;yBAQW,+BAA+B"}

package/src/engine/graphics/geometry/instancing/InstancedMeshGroup.js

@@ -9,17 +9,18 @@ import {
     MeshDepthMaterial,
     RGBADepthPacking
 } from 'three';
-import ThreeFactory from "../../three/ThreeFactory.js";
-import { StaticMaterialCache } from "../../../asset/loaders/material/StaticMaterialCache.js";
-import { composeCompile } from "../../material/composeCompile.js";
+import { Cache } from "../../../../core/cache/Cache.js";
+import { array_copy } from "../../../../core/collection/array/array_copy.js";
 import { typed_array_copy } from "../../../../core/collection/array/typed/typed_array_copy.js";
-import { rewriteMaterial } from "./rewriteMaterial.js";
 import { max3 } from "../../../../core/math/max3.js";
 import { min2 } from "../../../../core/math/min2.js";
-import { DrawMode } from "../../ecs/mesh-v2/DrawMode.js";
-import { array_copy } from "../../../../core/collection/array/array_copy.js";
-import { Cache } from "../../../../core/cache/Cache.js";
 import { computeMaterialHash } from "../../../asset/loaders/material/computeMaterialHash.js";
+import { StaticMaterialCache } from "../../../asset/loaders/material/StaticMaterialCache.js";
+import { DrawMode } from "../../ecs/mesh-v2/DrawMode.js";
+import { composeCompile } from "../../material/composeCompile.js";
+import ThreeFactory from "../../three/ThreeFactory.js";
+import { geometry_copy } from "./geometry_copy.js";
+import { rewriteMaterial } from "./rewriteMaterial.js";
 
 /**
  * @typedef {Object} CacheKey
@@ -533,14 +534,7 @@ export class InstancedMeshGroup {
         geometry.dynamic = true;
 
         //copy instance attributes
-        geometry.index = instance.index;
-        for (let attributeName in instance.attributes) {
-            if (!instance.attributes.hasOwnProperty(attributeName)) {
-                continue;
-            }
-
-            geometry.attributes[attributeName] = instance.attributes[attributeName];
-        }
+        geometry_copy(geometry, instance);
 
         //build instanced attributes
         const newTransformArray = new Float32Array(this.capacity * 16);

package/src/engine/graphics/geometry/instancing/geometry_copy.d.ts

@@ -0,0 +1,7 @@
+/**
+ *
+ * @param {BufferGeometry} target
+ * @param {BufferGeometry} source
+ */
+export function geometry_copy(target: BufferGeometry, source: BufferGeometry): void;
+//# sourceMappingURL=geometry_copy.d.ts.map

package/src/engine/graphics/geometry/instancing/geometry_copy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"geometry_copy.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/geometry/instancing/geometry_copy.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,oFASC"}

package/src/engine/graphics/geometry/instancing/geometry_copy.js

@@ -0,0 +1,15 @@
+/**
+ *
+ * @param {BufferGeometry} target
+ * @param {BufferGeometry} source
+ */
+export function geometry_copy(target, source) {
+    target.index = source.index;
+    for (let attributeName in source.attributes) {
+        if (!source.attributes.hasOwnProperty(attributeName)) {
+            continue;
+        }
+
+        target.attributes[attributeName] = source.attributes[attributeName];
+    }
+}

package/src/engine/graphics/impostors/octahedral/ImpostorBaker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ImpostorBaker.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/impostors/octahedral/ImpostorBaker.js"],"names":[],"mappings":";AAoBA;IAEI;;;;OAIG;IACH,kBAAiB;IAEjB;;;OAGG;IACH,iDAEC;IAGD;;;;;;;OAOG;IACH,yEANW,MAAM,EAAE,OAAK,uBAsOvB;IAED;;;;;;;OAOG;IACH,4CANW;QAAC,IAAI,iBAAgB;QAAC,WAAU,IAAI,CAAA;KAAC,EAAE,GAIrC,mBAAmB,CAqE/B;CACJ;oCAxVmC,0BAA0B;qBACnC,WAAW"}
+{"version":3,"file":"ImpostorBaker.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/impostors/octahedral/ImpostorBaker.js"],"names":[],"mappings":";AAoBA;IAEI;;;;OAIG;IACH,kBAAiB;IAEjB;;;OAGG;IACH,iDAEC;IAGD;;;;;;;OAOG;IACH,yEANW,MAAM,EAAE,OAAK,uBAgPvB;IAED;;;;;;;OAOG;IACH,4CANW;QAAC,IAAI,iBAAgB;QAAC,WAAU,IAAI,CAAA;KAAC,EAAE,GAIrC,mBAAmB,CAmE/B;CACJ;oCApVmC,0BAA0B;qBAhBnC,WAAW"}

package/src/engine/graphics/impostors/octahedral/ImpostorBaker.js

@@ -1,21 +1,21 @@
-import { ImpostorCaptureType } from "./ImpostorCaptureType.js";
-import { assert } from "../../../../core/assert.js";
-import { isPowerOfTwo } from "../../../../core/math/isPowerOrTwo.js";
-import { Mesh, OrthographicCamera, Scene, Vector4, WebGLMultipleRenderTargets } from "three";
-import { ImpostorDescription } from "./ImpostorDescription.js";
 import { mat4, vec3 } from "gl-matrix";
-import { BakeShaderStandard } from "./shader/BakeShaderStandard.js";
-import { Sampler2D } from "../../texture/sampler/Sampler2D.js";
-import Signal from "../../../../core/events/signal/Signal.js";
+import { Mesh, OrthographicCamera, Scene, Vector4, WebGLMultipleRenderTargets } from "three";
+import { assert } from "../../../../core/assert.js";
+import { collectIteratorValueToArray } from "../../../../core/collection/collectIteratorValueToArray.js";
 import { HashMap } from "../../../../core/collection/map/HashMap.js";
-import { computeMaterialHash } from "../../../asset/loaders/material/computeMaterialHash.js";
+import Signal from "../../../../core/events/signal/Signal.js";
+import { isPowerOfTwo } from "../../../../core/math/isPowerOrTwo.js";
 import { computeMaterialEquality } from "../../../asset/loaders/material/computeMaterialEquality.js";
-import { UvEncoder } from "./grid/UvEncoder.js";
-import { OctahedralUvEncoder } from "./grid/OctahedralUvEncoder.js";
-import { HemiOctahedralUvEncoder } from "./grid/HemiOctahedralUvEncoder.js";
-import { prepare_bake_material } from "./bake/prepare_bake_material.js";
-import { collectIteratorValueToArray } from "../../../../core/collection/collectIteratorValueToArray.js";
+import { computeMaterialHash } from "../../../asset/loaders/material/computeMaterialHash.js";
+import { Sampler2D } from "../../texture/sampler/Sampler2D.js";
 import { compute_bounding_sphere } from "./bake/compute_bounding_sphere.js";
+import { prepare_bake_material } from "./bake/prepare_bake_material.js";
+import { HemiOctahedralUvEncoder } from "./grid/HemiOctahedralUvEncoder.js";
+import { OctahedralUvEncoder } from "./grid/OctahedralUvEncoder.js";
+import { UvEncoder } from "./grid/UvEncoder.js";
+import { ImpostorCaptureType } from "./ImpostorCaptureType.js";
+import { ImpostorDescription } from "./ImpostorDescription.js";
+import { BakeShaderStandard } from "./shader/BakeShaderStandard.js";
 import { build_cutout_from_atlas_by_alpha } from "./util/build_cutout_from_atlas_by_alpha.js";
 
 export class ImpostorBaker {
@@ -62,6 +62,7 @@ export class ImpostorBaker {
 
         const cam = new OrthographicCamera();
         const rt = new WebGLMultipleRenderTargets(resolution, resolution, 3);
+
         rt.scissorTest = false;
         rt.stencilBuffer = false;
 
@@ -185,14 +186,14 @@ export class ImpostorBaker {
         const max_frame_index = frames - 1;
 
         for (let i = 0; i < frames; i++) {
-            const octahedron_u = max_frame_index > 0 ? (i / max_frame_index) : 0;
+            const frame_u = max_frame_index > 0 ? (i / max_frame_index) : 0;
 
             for (let j = 0; j < frames; j++) {
 
-                const octahedron_v = max_frame_index > 0 ? (j / max_frame_index) : 0;
+                const frame_v = max_frame_index > 0 ? (j / max_frame_index) : 0;
 
                 // compute vector direction where to place camera
-                encoder.uv_to_unit(unit_sphere_direction, [octahedron_u, octahedron_v]);
+                encoder.uv_to_unit(unit_sphere_direction, [frame_u, frame_v]);
 
                 // offset by the radius of the sphere
                 const camera_px = distance * unit_sphere_direction[0] + bounding_sphere[0];
@@ -206,6 +207,7 @@ export class ImpostorBaker {
                 cam.right = distance;
                 cam.top = distance;
                 cam.bottom = -distance;
+
                 cam.near = 0;
                 cam.far = distance * 2;
 
@@ -265,7 +267,15 @@ export class ImpostorBaker {
         id.rt = rt;
 
         // build cutout
-        id.cutout = build_cutout_from_atlas_by_alpha(id, renderer);
+        id.cutout = build_cutout_from_atlas_by_alpha({
+            impostor: id,
+            renderer,
+            vertex_limit: 5
+        });
+
+
+        id.sphere_radius = bounding_sphere[3];
+        vec3.copy(id.offset, bounding_sphere);
 
         return id;
     }
@@ -339,8 +349,6 @@ export class ImpostorBaker {
         });
 
         r.capture_type = type;
-        r.sphere_radius = bounding_sphere[3];
-        vec3.copy(r.offset, bounding_sphere);
 
         console.timeEnd('bake');
 

package/src/engine/graphics/impostors/octahedral/ImpostorCaptureType.d.ts

@@ -1,3 +1,4 @@
+export type ImpostorCaptureType = number;
 export namespace ImpostorCaptureType {
     let FullSphere: number;
     let Hemisphere: number;

package/src/engine/graphics/impostors/octahedral/ImpostorCaptureType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ImpostorCaptureType.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/impostors/octahedral/ImpostorCaptureType.js"],"names":[],"mappings":""}
+{"version":3,"file":"ImpostorCaptureType.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/impostors/octahedral/ImpostorCaptureType.js"],"names":[],"mappings":"kCAEU,MAAM"}

package/src/engine/graphics/impostors/octahedral/ImpostorCaptureType.js

@@ -1,3 +1,7 @@
+/**
+ *
+ * @enum {number}
+ */
 export const ImpostorCaptureType = {
     /**
      * Capture from all sides

package/src/engine/graphics/impostors/octahedral/grid/OctahedralUvEncoder.js

@@ -1,6 +1,6 @@
 import { vec3 } from "gl-matrix";
 import { v3_dot } from "../../../../../core/geom/vec3/v3_dot.js";
-import { sign } from "../../../../../core/math/sign.js";
+import { sign_not_zero } from "../../../../../core/math/sign_not_zero.js";
 import { UvEncoder } from "./UvEncoder.js";
 
 export class OctahedralUvEncoder extends UvEncoder {
@@ -13,8 +13,8 @@ export class OctahedralUvEncoder extends UvEncoder {
         const py = 1 - abs_x - abs_z;
 
         if (py < 0) {
-            px = sign(px) * (1 - abs_z);
-            pz = sign(pz) * (1 - abs_x);
+            px = sign_not_zero(px) * (1 - abs_z);
+            pz = sign_not_zero(pz) * (1 - abs_x);
         }
 
         output[0] = px;
@@ -30,9 +30,9 @@ export class OctahedralUvEncoder extends UvEncoder {
         const input_y = input[1];
         const input_z = input[2];
 
-        const octant_x = sign(input_x);
-        const octant_y = sign(input_y);
-        const octant_z = sign(input_z);
+        const octant_x = sign_not_zero(input_x);
+        const octant_y = sign_not_zero(input_y);
+        const octant_z = sign_not_zero(input_z);
 
         // |x| + |y| + |z| = 1
         const sum = v3_dot(input_x, input_y, input_z, octant_x, octant_y, octant_z);

package/src/engine/graphics/impostors/octahedral/prototypeBaker.js

@@ -38,7 +38,14 @@ async function main(engine) {
         engine,
         enableWater: false,
         cameraFieldOfView: 45,
-        showFps: false
+        showFps: false,
+        enableLights: false
+    });
+
+    await EngineHarness.buildLights({
+        engine,
+        sunIntensity: 0,
+        ambientIntensity: 1
     });
 
     const ecd = engine.entityManager.dataset;
@@ -47,13 +54,15 @@ async function main(engine) {
     const renderer = engine.graphics.renderer;
     baker.renderer = renderer;
 
-
     // const path = 'data/models/LowPolyTownshipSet/Small_house/Small_house.gltf';
+    // const path = 'data/models/samples/textured_unit_cube.gltf';
+    // const path = 'data/models/samples/teapot.gltf';
+    const path = 'data/models/samples/just_a_girl/scene.gltf';
     // const path = 'data/models/road_bike/road_bike.gltf'; //large CAD-type model
     // const path = 'data/models/LowPolyTownshipSet/Barrel/model.gltf';
     // const path = 'data/models/LowPolyTownshipSet/Town_Hall/model.gltf';
     // const path = 'data/models/RTS_Buildings_Humans/18/Building_R_18_out/Building_R_18.gltf';
-    const path = 'data/models/MOBA and Tower Defense/Tree_01.gltf';
+    // const path = 'data/models/MOBA and Tower Defense/Tree_01.gltf';
     // const path = 'data/models/samples/transform-hierarchy.glb';
     // const path = 'data/models/sponza-pbr/gltf/sponza.glb';
     // const path = 'data/models/snaps/cube_blue.gltf';
@@ -66,9 +75,9 @@ async function main(engine) {
     // console.profile('bake');
     const id = baker.bake({
         objects,
-        frames: 12,
+        frames: 8,
         resolution: 1024,
-        type: ImpostorCaptureType.Hemisphere
+        type: ImpostorCaptureType.FullSphere
     });
     // console.profileEnd('bake');
 
@@ -80,14 +89,14 @@ async function main(engine) {
         mode: 'diffuse'
     });
 
-    ctrl.scale.setScalar(0.5);
+    ctrl.scale.setScalar(1);
 
     new Entity()
         .add(ViewportPosition.fromJSON({
             offset: new Vector2(0, 0)
         }))
         .add(GUIElement.fromView(ctrl))
-    .build(ecd);
+        .build(ecd);
 
     // build out preview scene with impostor and the original
     const t0 = Transform.fromJSON({

package/src/engine/graphics/impostors/octahedral/util/build_cutout_from_atlas_by_alpha.d.ts

@@ -3,7 +3,8 @@
  *      A circle is a lot easier to quantize (as long as we make sure we place edges outside of the circle)
  * @param {ImpostorDescription} impostor
  * @param {THREE.WebGLRenderer} renderer
- * @returns {number}
+ * @param {number} vertex_limit how many vertices to use for the billboard, more vertices will provide better fit and lower area reducing overdraw at the cost of extra triangles. Prefer values between 4 and 16
+ * @returns {number[]}
  */
-export function build_cutout_from_atlas_by_alpha(impostor: ImpostorDescription, renderer: THREE.WebGLRenderer): number;
+export function build_cutout_from_atlas_by_alpha({ impostor, renderer, vertex_limit }: ImpostorDescription): number[];
 //# sourceMappingURL=build_cutout_from_atlas_by_alpha.d.ts.map

package/src/engine/graphics/impostors/octahedral/util/build_cutout_from_atlas_by_alpha.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build_cutout_from_atlas_by_alpha.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/impostors/octahedral/util/build_cutout_from_atlas_by_alpha.js"],"names":[],"mappings":"AAcA;;;;;;GAMG;AACH,0FAHW,MAAM,aAAa,GACjB,MAAM,CA4GlB"}
+{"version":3,"file":"build_cutout_from_atlas_by_alpha.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/impostors/octahedral/util/build_cutout_from_atlas_by_alpha.js"],"names":[],"mappings":"AAeA;;;;;;;GAOG;AACH,6GAFa,MAAM,EAAE,CAqHpB"}