@woosh/meep-engine 2.62.0 → 2.63.0

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

@@ -4,9 +4,19 @@
 
 
 import { BoxBufferGeometry, MeshLambertMaterial } from "three";
+import { assert } from "../../../../core/assert.js";
+import {
+    ExplicitBinaryBoundingVolumeHierarchy
+} from "../../../../core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy.js";
+import {
+    bvh_query_user_data_overlaps_frustum
+} from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_overlaps_frustum.js";
 import { SignalBinding } from "../../../../core/events/signal/SignalBinding.js";
 
 import Vector3 from "../../../../core/geom/Vector3.js";
+import { ResourceAccessKind } from "../../../../core/model/ResourceAccessKind.js";
+import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";
+import { GLTFAssetLoader } from "../../../asset/loaders/GLTFAssetLoader.js";
 import { System } from "../../../ecs/System.js";
 import { Transform } from "../../../ecs/transform/Transform.js";
 
@@ -15,26 +25,16 @@ import checkerTexture from "../../texture/CheckersTexture.js";
 import ThreeFactory from "../../three/ThreeFactory.js";
 import { assetTypeByPath } from "./assetTypeByPath.js";
 import Mesh, { MeshFlags } from "./Mesh.js";
-import { applyComponentPropertiesToThreeObject, setMesh } from "./setMesh.js";
-import { GLTFAssetLoader } from "../../../asset/loaders/GLTFAssetLoader.js";
 import { MeshEvents } from "./MeshEvents.js";
-import { assert } from "../../../../core/assert.js";
-import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";
-import { ResourceAccessKind } from "../../../../core/model/ResourceAccessKind.js";
-import {
-    ExplicitBinaryBoundingVolumeHierarchy
-} from "../../../../core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy.js";
-import {
-    bvh_query_user_data_overlaps_frustum
-} from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_overlaps_frustum.js";
+import { setMesh } from "./setMesh.js";
 
-const placeholderGeometry = new BoxBufferGeometry(1, 1, 1);
+const PLACEHOLDER_GEOMETRY = new BoxBufferGeometry(1, 1, 1);
 
-placeholderGeometry.computeBoundingSphere();
+PLACEHOLDER_GEOMETRY.computeBoundingSphere();
 
-const placeholderTexture = checkerTexture.create();
+const PLACEHOLDER_TEXTURE = checkerTexture.create();
 
-const placeholderMaterial = new MeshLambertMaterial({ map: placeholderTexture });
+const PLACEHOLDER_MATERIAL = new MeshLambertMaterial({ map: PLACEHOLDER_TEXTURE });
 
 const scratch_array = [];
 
@@ -134,13 +134,6 @@ export class MeshSystem extends System {
 
         component.setFlag(MeshFlags.Loaded);
 
-        // override
-        if (asset.override_mesh !== undefined) {
-            component.override_mesh = asset.override_mesh.clone();
-
-            applyComponentPropertiesToThreeObject(component, component.override_mesh, entity);
-        }
-
         setMesh(dataset, entity, component, mesh);
 
 
@@ -318,8 +311,6 @@ export class MeshSystem extends System {
             bScale
         ];
 
-        apply_transform();
-
         model.__bvh_leaf.link(this.__bvh_binary, entity);
     }
 
@@ -375,38 +366,6 @@ export class MeshSystem extends System {
 
         const dataset = em.dataset;
 
-        /**
-         *
-         * @param {Asset<Object3D>} asset
-         */
-        const assetLoaded = (asset) => {
-            if (!dataset.entityExists(entity)) {
-                //entity no longer exists, probably dataset has been switched, abort
-                return;
-            }
-
-            //check that component is still actual
-            const actualComponent = dataset.getComponent(entity, Mesh);
-
-            if (actualComponent === component) {
-                // scene.remove(component.mesh);
-                this.__set_mesh_from_asset(entity, dataset, asset, component);
-
-            } else {
-                //component is no longer in the manager. do nothing.
-                //console.warn("component is no longer in the manager");
-            }
-        }
-
-
-        function assetFailure(error) {
-            console.error("failed to load model " + component.url, error);
-
-            dataset.sendEvent(entity, MeshEvents.AssetLoadFailed, {
-                reason: error
-            });
-        }
-
         if (component.hasMesh()) {
             //do not re-run if mesh is set
             setMesh(dataset, entity, component, component.mesh);
@@ -425,28 +384,59 @@ export class MeshSystem extends System {
         if (asset !== null) {
             // asset is already loaded, use it
             this.__set_mesh_from_asset(entity, dataset, asset, component);
-        } else {
+            return;
+        }
+
+        // mesh was not found, use temp mesh and submit a request
+
+        if (this.__use_placeholder_mesh) {
+            // set placeholder mesh
+            const mesh = ThreeFactory.createMesh(PLACEHOLDER_GEOMETRY, PLACEHOLDER_MATERIAL);
+
+            setMesh(dataset, entity, component, mesh);
+        }
+
+        function assetFailure(error) {
+            console.error("failed to load model " + component.url, error);
+
+            dataset.sendEvent(entity, MeshEvents.AssetLoadFailed, {
+                reason: error
+            });
+        }
 
-            // mesh was not found, use temp mesh and submit a request
+        if (assetType === null) {
+            // couldn't figure out what the asset type is
+            assetFailure("no asset type deduced");
+            return;
+        }
 
-            if (this.__use_placeholder_mesh) {
-                // set placeholder mesh
-                const mesh = ThreeFactory.createMesh(placeholderGeometry, placeholderMaterial);
 
-                setMesh(dataset, entity, component, mesh);
+        /**
+         *
+         * @param {Asset<Object3D>} asset
+         */
+        const assetLoaded = (asset) => {
+            if (!dataset.entityExists(entity)) {
+                //entity no longer exists, probably dataset has been switched, abort
+                return;
             }
 
-            if (assetType === null) {
+            //check that component is still actual
+            const actualComponent = dataset.getComponent(entity, Mesh);
 
-                assetFailure("no asset type deduced");
+            if (actualComponent === component) {
+                // scene.remove(component.mesh);
+                this.__set_mesh_from_asset(entity, dataset, asset, component);
 
             } else {
-                // load the asset
-                am.get({ path: component.url, type: assetType, callback: assetLoaded, failure: assetFailure });
+                //component is no longer in the manager. do nothing.
+                //console.warn("component is no longer in the manager");
             }
         }
 
-        dataset.getComponentAsync(entity, Transform, component.internalApplyTransform, component);
+        // load the asset
+        am.get({ path: component.url, type: assetType, callback: assetLoaded, failure: assetFailure });
+
     }
 
     update(timeDelta) {

package/src/engine/grid/ORTHOGONAL_NEIGHBOURHOOD_MASK.js

@@ -0,0 +1,11 @@
+/**
+ * Up, down, left, right
+ * @readonly
+ * @type {number[]}
+ */
+export const ORTHOGONAL_NEIGHBOURHOOD_MASK = [
+    0, -1,
+    -1, 0,
+    1, 0,
+    0, 1
+];

package/src/core/binary/stringToByteArray.js

@@ -1,24 +0,0 @@
-/**
- * Turns a string into an array of bytes; a "byte" being a JS number in the
- * range 0-255.
- * @param {string} str String value to arrify.
- * @return {Uint8Array} Array of numbers corresponding to the
- *     UCS character codes of each character in str.
- */
-export function stringToByteArray(str) {
-    const length = str.length;
-
-    const output = [];
-    let p = 0;
-
-    for (let i = 0; i < length; i++) {
-        let c = str.charCodeAt(i);
-        while (c > 0xff) {
-            output[p++] = c & 0xff;
-            c >>= 8;
-        }
-        output[p++] = c;
-    }
-
-    return new Uint8Array(output);
-}

package/src/engine/save/storage/LocalStorage.js

@@ -1,148 +0,0 @@
-/**
- * Created by Alex on 22/02/2017.
- */
-
-
-import MsgPackCodec from './MsgPackCodec.js';
-
-import Storage from '../Storage.js';
-import { InMemoryLocalStorage } from "./InMemoryLocalStorage.js";
-import {stringToByteArray} from "../../../core/binary/stringToByteArray.js";
-import {byteArrayToString} from "../../../core/binary/byteArrayToString.js";
-
-
-class LocalStorage extends Storage {
-    constructor(namespace, services) {
-        super();
-        this.namespace = namespace;
-        this.services = services;
-
-        this.compressionLevel = 2;
-        this.compressionEnabled = false;
-
-        this.codec = new MsgPackCodec();
-
-        try {
-            console.log('Accessing Window.localStorage...');
-            this.localStorage = window.localStorage;
-            console.log('LocalStorage acquired');
-        } catch (e) {
-            console.error(`Failed to get localStorage:`, e);
-
-            // This fallback allows the system to continue functioning at least
-            this.localStorage = new InMemoryLocalStorage();
-
-            console.warn(`Falling back to in-memory storage`);
-        }
-
-        const item = this.localStorage.getItem(this.namespace + "-list");
-        let stored;
-
-        try {
-            stored = JSON.parse(item);
-        } catch (e) {
-            console.error('Failed to parse loaded item:', e, item);
-            console.warn('Ignoring previously stored data');
-            stored = null;
-        }
-
-        if (stored !== null && typeof stored === "object" && typeof stored.length === "number") {
-            this.__list = stored;
-        } else {
-            this.__list = [];
-        }
-    }
-
-    makeObjectId(key) {
-        return this.namespace + '-item-' + key;
-    }
-
-    storeBinary(key, value, resolve, reject, progress) {
-        const self = this;
-
-        function store(data) {
-            const compressedUint8Array = new Uint8Array(data.length);
-            compressedUint8Array.set(data, 0);
-
-            if (compressedUint8Array.length !== value.length) {
-                console.log("Compressed size:", compressedUint8Array.length, "bytes, original ", value.length, ".", (compressedUint8Array.length / value.length * 100).toFixed(2) + "% of the original");
-            }
-
-            const compressedString = byteArrayToString(compressedUint8Array);
-
-            self.localStorage.setItem(self.makeObjectId(key), compressedString);
-
-            if (self.__list.indexOf(key) === -1) {
-                //update the list
-                self.__list.push(key);
-                self.localStorage.setItem(self.namespace + "-list", JSON.stringify(self.__list));
-            }
-
-            if (typeof resolve === "function") {
-                resolve();
-            }
-        }
-
-        if (this.compressionEnabled) {
-            const compressionService = this.services.compression;
-
-            compressionService
-                .encode(value, this.compressionLevel)
-                .then(store, reject);
-        } else {
-            store(value);
-        }
-    }
-
-    store(key, value, resolve, reject, progress) {
-        const rawData = this.codec.encode(value);
-
-        this.storeBinary(key, rawData, resolve, reject, progress);
-    }
-
-    loadBinary(key, resolve, reject, progress) {
-
-        let compressedString = this.localStorage.getItem(this.makeObjectId(key));
-
-        if (compressedString === null) {
-            //no data
-            resolve(new ArrayBuffer(0));
-            return;
-        }
-
-        const uint8array = stringToByteArray(compressedString);
-
-        const data = uint8array.buffer;
-        // console.log("compressedBytes", compressedBytes);
-
-        if (this.compressionEnabled) {
-            const compressionService = this.services.compression;
-
-            compressionService.decode(data).then(resolve, reject);
-        } else {
-            resolve(data);
-        }
-    }
-
-    load(key, resolve, reject, progress) {
-        const codec = this.codec;
-
-        this.loadBinary(key, function (binary) {
-            let result;
-
-            try {
-                result = codec.decode(new Uint8Array(binary));
-            } catch (e) {
-                reject(e);
-            }
-
-            resolve(result);
-        }, reject, progress);
-    }
-
-    list(resolve, reject) {
-        resolve(this.__list);
-    }
-}
-
-export default LocalStorage;

package/src/engine/save/storage/MsgPackCodec.js

@@ -1,22 +0,0 @@
-/**
- * Created by Alex on 12/06/2017.
- */
-
-import msgpack from 'msgpack-lite';
-
-function MsgPackCodec() {
-
-}
-
-MsgPackCodec.prototype.encode = function (json) {
-    console.time("encoding of value");
-    const result = msgpack.encode(json);
-    console.timeEnd("encoding of value");
-    return result;
-};
-
-MsgPackCodec.prototype.decode = function (bytes) {
-    return msgpack.decode(bytes);
-};
-
-export default MsgPackCodec;