@woosh/meep-engine 2.56.1 → 2.58.0

package/src/view/minimap/gl/MarkerGL.js

@@ -1,4 +1,5 @@
 import { MarkerGLAttributes } from "./MarkerGLAttributes.js";
+import { Reference } from "../../../engine/reference/v2/Reference.js";
 
 function logPatchLoadError(e) {
     console.error('Failed to load patch:', e);
@@ -24,21 +25,23 @@ export function MarkerGL(marker, transform, entity, id, manager) {
 
     this.id = id;
 
-    this.patch = null;
+    /**
+     *
+     * @type {Reference<AtlasPatch>}
+     */
+    this.patch = Reference.NULL;
 
     this.manager = manager;
     this.particles = manager.particles;
 
     this.active = false;
 
-    const self = this;
-
-    this.updatePosition = function () {
+    this.updatePosition = () => {
 
         const position = transform.position;
 
-        self.particles.executeOperationWriteAttribute_Vector3(
-            self.id,
+        this.particles.executeOperationWriteAttribute_Vector3(
+            this.id,
             MarkerGLAttributes.AttributePosition,
             position.x,
             1,
@@ -48,26 +51,27 @@ export function MarkerGL(marker, transform, entity, id, manager) {
         manager.needsRender = true;
     };
 
-    this.updateIcon = function (newURL, oldURL) {
+    this.updateIcon = (newURL, oldURL) => {
         const atlasManager = manager.atlasManager;
 
-        if (oldURL !== null) {
-            atlasManager.release(oldURL);
-        }
+        this.patch.release();
 
         atlasManager
             .acquire(newURL)
-            .then(function (patch) {
+            .then((patch) => {
+                this.patch = patch;
+
                 //check if marker is still active
-                if (!self.active) {
+                if (!this.active) {
                     //marker is dead
                     return;
                 }
 
-                const patchUv = patch.uv;
 
-                self.particles.executeOperationWriteAttribute_Vector4(
-                    self.id,
+                const patchUv = patch.getValue().uv;
+
+                this.particles.executeOperationWriteAttribute_Vector4(
+                    this.id,
                     MarkerGLAttributes.AttributePatch,
                     patchUv.position.x,
                     patchUv.position.y,
@@ -76,8 +80,6 @@ export function MarkerGL(marker, transform, entity, id, manager) {
                 );
 
                 manager.needsRender = true;
-
-                self.patch = patch;
             }, logPatchLoadError);
     };
 }
@@ -110,5 +112,5 @@ MarkerGL.prototype.shutdown = function () {
     this.marker.iconURL.onChanged.remove(this.updateIcon);
 
     //release reference to icon
-    this.manager.atlasManager.release(this.marker.iconURL.getValue());
+    this.patch.release();
 };

package/src/view/minimap/gl/MinimapMarkersGL.js

@@ -225,7 +225,8 @@ export class MinimapMarkersGL extends MinimapWorldLayer {
     updateSprites() {
 
         this.markers.forEach((marker) => {
-            const patch = marker.patch;
+            const patch = marker.patch.getValue();
+
             if (patch !== null) {
                 /**
                  * @type {Rectangle}

package/editor/tools/FoliagePaintTool.js

@@ -1,168 +0,0 @@
-import Tool from "./engine/Tool.js";
-import Vector1 from "../../src/core/geom/Vector1.js";
-import ObservedValue from "../../src/core/model/ObservedValue.js";
-import Vector4 from "../../src/core/geom/Vector4.js";
-import loadSampler2D from "../../src/engine/graphics/texture/sampler/loadSampler2D.js";
-import convertSampler2D2Canvas from "../../src/engine/graphics/texture/sampler/Sampler2D2Canvas.js";
-import { InstancedMeshComponent } from "../../src/engine/ecs/foliage/ecs/InstancedMeshComponent.js";
-import { hex2rgb } from "../../src/core/color/hex2rgb.js";
-import { obtainTerrain } from "../../src/engine/ecs/terrain/util/obtainTerrain.js";
-
-class FoliagePaintTool extends Tool {
-    constructor() {
-        super();
-        this.name = "foliage_paint";
-
-        this.settings.layer = new Vector1(0);
-        this.settings.value = new Vector1(1);
-        this.settings.alphaMultiplier = new Vector1(1);
-        this.settings.color = new ObservedValue("#FFFFFF");
-
-        this.settings.baseColor = new ObservedValue("#000000");
-        this.settings.baseColorAlpha = new Vector1(0.6);
-
-        const self = this;
-
-    }
-
-    updateSelection() {
-        self.paint();
-    }
-
-    buildColor() {
-
-        const color = new Vector4();
-        const baseColor = hex2rgb(this.settings.color.get());
-        color.set(baseColor.r, baseColor.g, baseColor.b, 0);
-        color.multiplyScalar(1 / 255);
-
-        return color;
-    }
-
-    buildBaseColor() {
-
-        const color = new Vector4();
-        const baseColor = hex2rgb(this.settings.baseColor.get());
-        color.set(baseColor.r, baseColor.g, baseColor.b, 0);
-        color.multiplyScalar(1 / 255);
-
-        color.w = this.settings.baseColorAlpha.getValue();
-
-        return color;
-    }
-
-    initialize() {
-        super.initialize();
-
-        const engine = this.engine;
-        const editor = this.editor;
-
-        this.terrain = obtainTerrain(engine.entityManager.dataset, function (t, entity) {
-            self.terrainEntity = entity;
-        });
-
-        this.terrain.overlay.push();
-
-        this.terrain.overlay.borderWidth.set(0);
-
-        this.paint();
-
-        editor.selection.on.added.add(this.updateSelection);
-        editor.selection.on.removed.add(this.updateSelection);
-    }
-
-    shutdown() {
-        this.terrain.overlay.pop();
-
-        this.editor.selection.on.added.remove(this.updateSelection);
-        this.editor.selection.on.removed.remove(this.updateSelection);
-
-        this.settings.value.onChanged.remove(this.updateSelection);
-        this.settings.alphaMultiplier.onChanged.remove(this.updateSelection);
-        this.settings.color.onChanged.remove(this.updateSelection);
-
-        super.shutdown();
-    }
-
-    paint() {
-
-        const alphaMultiplier = this.settings.alphaMultiplier.getValue();
-        const overlay = this.terrain.overlay;
-        overlay.clear();
-
-        const layer = this.settings.layer.getValue();
-
-        const color = this.buildColor();
-
-        const baseColor = this.buildBaseColor();
-
-        const engine = this.engine;
-
-        /**
-         *
-         * @param {InstancedMeshComponent} foliage
-         * @param {Number} entity
-         */
-        function visit(foliage, entity) {
-            const foliageLayer = foliage.layers.get(layer);
-            loadSampler2D(foliageLayer.densityMap.get(), engine.assetManager).then(function (sampler) {
-
-                overlay.size.set(sampler.width, sampler.height);
-                overlay.clear();
-
-                const v4c = new Vector4(0, 0, 0, 0);
-
-                function mappingFunction(index, array, x, y) {
-                    const address = index;
-                    const alpha = sampler.data[address / 4] * alphaMultiplier;
-                    color.w = alpha;
-
-                    Vector4.lerp(color, baseColor, (1 - alpha), v4c);
-
-                    //scale to unsigned byte value
-                    v4c.multiplyScalar(255);
-
-
-                    array[address] = v4c.x;
-                    array[address + 1] = v4c.y;
-                    array[address + 2] = v4c.z;
-                    //alpha
-                    array[address + 3] = v4c.w;
-                }
-
-                convertSampler2D2Canvas(sampler, 1, 0, overlay.canvas, mappingFunction);
-
-                overlay.update();
-            });
-        }
-
-        //initialize overlay
-        this.traverse(visit);
-    }
-
-    traverse(callback) {
-        /**
-         * @type {EntityManager}
-         */
-        const entityManger = this.engine.entityManager;
-        this.editor.selection.forEach(function (entity) {
-
-            /**
-             *
-             * @type {InstancedMeshComponent}
-             */
-            const foliage = entityManger.getComponent(entity, InstancedMeshComponent);
-
-
-            if (foliage === null) {
-                //do nothing
-                return;
-            }
-
-            callback(foliage, entity);
-        });
-    }
-}
-
-
-export default FoliagePaintTool;

package/editor/tools/engine/ToolStateMachine.js

@@ -1,53 +0,0 @@
-import { SimpleStateMachineDescription } from "../../../src/core/fsm/simple/SimpleStateMachineDescription.js";
-import { ToolState } from "./ToolState.js";
-import { StateMachine } from "../../../src/core/fsm/StateMachine.js";
-
-const smd = new SimpleStateMachineDescription();
-
-smd.createState(ToolState.Initial);
-smd.createState(ToolState.Ready);
-smd.createState(ToolState.Running);
-
-smd.createEdge(ToolState.Initial, ToolState.Ready);
-smd.createEdge(ToolState.Ready, ToolState.Initial);
-smd.createEdge(ToolState.Ready, ToolState.Running);
-smd.createEdge(ToolState.Running, ToolState.Ready);
-
-
-/**
- * @param {Tool} tool
- * @returns {StateMachine}
- */
-export function buildToolStateMachine(tool) {
-    const sm = new StateMachine(smd);
-
-    sm.addState(ToolState.Initial);
-    sm.addState(ToolState.Ready);
-    sm.addState(ToolState.Running);
-
-
-    sm.createTransition(ToolState.Initial, ToolState.Ready, () => {
-        tool.initialize();
-        return Promise.resolve();
-    });
-
-    sm.createTransition(ToolState.Ready, ToolState.Initial, () => {
-        tool.shutdown();
-        return Promise.resolve();
-    });
-
-    sm.createTransition(ToolState.Ready, ToolState.Running, () => {
-        tool.start();
-        return Promise.resolve();
-    });
-
-    sm.createTransition(ToolState.Running, ToolState.Ready, () => {
-        tool.stop();
-        return Promise.resolve();
-    });
-
-    sm.setState(ToolState.Initial);
-
-
-    return sm;
-}

package/src/core/NumberFormat.js

@@ -1,4 +0,0 @@
-/**
- * Created by Alex on 08/08/2016.
- * @copyright Alex Goldring 2016
- */

package/src/core/binary/ByteArrayTools.js

@@ -1,137 +0,0 @@
-/**
- * Created by Alex on 03/11/2016.
- * @author Alex Goldring
- * @author google.closure library team
- */
-
-import { stringifyStream } from "../json/JsonUtils.js";
-
-/**
- * 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.
- */
-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;
-    }
-
-    const uint8Array = new Uint8Array(output);
-
-    return uint8Array;
-}
-
-
-/**
- * Turns an array of numbers into the string given by the concatenation of the
- * characters to which the numbers correspond.
- * @param {!Uint8Array|!Array<number>} bytes Array of numbers representing
- *     characters.
- * @return {string} Stringification of the array.
- */
-function byteArrayToString(bytes) {
-    const numBytes = bytes.length;
-
-    const CHUNK_SIZE = 8192;
-
-    // Special-case the simple case for speed's sake.
-    if (numBytes <= CHUNK_SIZE) {
-        return String.fromCharCode.apply(null, bytes);
-    }
-
-    // The remaining logic splits conversion by chunks since
-    // Function#apply() has a maximum parameter count.
-    // See discussion: http://goo.gl/LrWmZ9
-
-    let str = '';
-    for (let i = 0; i < numBytes; i += CHUNK_SIZE) {
-        const chunk = Array.prototype.slice.call(bytes, i, i + CHUNK_SIZE);
-        str += String.fromCharCode.apply(null, chunk);
-    }
-    return str;
-}
-
-/**
- *
- * @param {Object} json
- * @returns {number[]}
- */
-function jsonToStringToByteArray(json) {
-    const output = [];
-    let p = 0;
-
-    function addToOutput(str) {
-        for (let i = 0; i < str.length; i++) {
-            let c = str.charCodeAt(i);
-            while (c > 0xff) {
-                output[p++] = c & 0xff;
-                c >>= 8;
-            }
-            output[p++] = c;
-        }
-    }
-
-    stringifyStream(json, addToOutput);
-    return output;
-}
-
-
-/**
- *
- * @param {string} url
- * @param {string} filename
- */
-export function downloadUrlAsFile(url, filename) {
-    const elem = window.document.createElement('a');
-    elem.href = url;
-    elem.download = filename;
-    document.body.appendChild(elem);
-    elem.click();
-    document.body.removeChild(elem);
-}
-
-function downloadAsFile(data, filename, type = 'text/json') {
-
-    let blobContent;
-
-    if (data instanceof ArrayBuffer || data instanceof Uint8Array) {
-        //raw binary data
-        blobContent = [data];
-    } else if (data instanceof Array) {
-        //already an array
-        blobContent = data;
-    } else if (data instanceof Blob) {
-        //already a blob
-        blobContent = [data];
-    } else if (typeof data === "string") {
-        blobContent = [data];
-    } else {
-        blobContent = [data]
-    }
-
-    const blob = new Blob(blobContent, { type });
-    if (window.navigator.msSaveOrOpenBlob) {
-        window.navigator.msSaveBlob(blob, filename);
-    } else {
-        downloadUrlAsFile(window.URL.createObjectURL(blob), filename);
-    }
-}
-
-export {
-    stringToByteArray,
-    byteArrayToString,
-    jsonToStringToByteArray,
-    downloadAsFile
-};

package/src/core/binary/NaiveBitSet.js

@@ -1,69 +0,0 @@
-/**
- * Used for testing of BitSet correctness and performance
- * NOTE: Not intended for production. Use {@link BitSet} instead
- */
-export class NaiveBitSet {
-    constructor() {
-        this.data = [];
-    }
-
-    nextSetBit(fromIndex) {
-        let i;
-
-        for (i = fromIndex; i < this.data.length; i++) {
-            if (this.data[i] === true) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    nextClearBit(fromIndex) {
-        let i;
-
-        for (i = fromIndex; i < this.data.length; i++) {
-            if (this.data[i] !== true) {
-                return i;
-            }
-        }
-
-        return i;
-    }
-
-    previousSetBit(fromIndex) {
-        let i;
-
-        for (i = fromIndex; i >= 0; i--) {
-            if (this.data[i] === true) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    set(bitIndex, value) {
-        this.data[bitIndex] = value;
-    }
-
-    get(bitIndex) {
-        return (this.data[bitIndex] === true);
-    }
-
-    size() {
-        return this.data.length;
-    }
-
-    setCapacity(n) {
-        //do nothing
-    }
-
-    capacity() {
-        return this.data.length;
-    }
-
-    reset() {
-        this.data = [];
-    }
-}

package/src/core/binary/objects/StandardTypeBuilder.js

@@ -1,126 +0,0 @@
-/**
- * Created by Alex on 14/12/2016.
- */
-
-
-import LineBuilder from "../../codegen/LineBuilder.js";
-import MultiplicityType from "../type/MultiplicityType.js";
-
-function cgFieldFromJSON(field) {
-
-}
-
-function generateStructure(type, typeRegistry) {
-    const lbConstruct = new LineBuilder();
-    const lbSerialize = new LineBuilder();
-    const lbDeSerialize = new LineBuilder();
-    //add fields
-    if (type.isPrimitive) {
-        throw new Error('Can not create a constructor for primitive type');
-    }
-    lbSerialize.add('return {');
-    lbSerialize.indent();
-
-    type.fields.forEach(function (field, index) {
-        lbConstruct.add('this.' + field.name + ' = ' + field.initial + ';');
-
-        lbSerialize.add(field.name + ': this.' + field.name + '.toJSON()' + ((index < type.fields.length - 1) ? ',' : ''));
-
-        lbDeSerialize.add('this.' + field.name + ' = ');
-    });
-
-    lbSerialize.dedent();
-    lbSerialize.add('};');
-
-}
-
-function build(type, typeRegistry) {
-    return typeRegistry.getOrCompute(type.name, function () {
-        return generateStructure(type, typeRegistry);
-    });
-}
-
-
-function ClassBuilder() {
-    this.dependencies = [];
-
-    this.fragments = {
-        init: new LineBuilder(),
-        serialize: new LineBuilder(),
-        deserialize: new LineBuilder()
-    };
-    this.jsonFields = [];
-}
-
-ClassBuilder.prototype.loadClass = function (name) {
-    const dependencies = this.dependencies;
-    const length = dependencies.length;
-    for (let i = 0; i < length; i++) {
-        const dependency = dependencies[i];
-        if (dependency === name) {
-            return "$" + i;
-        }
-    }
-    this.dependencies.push(name);
-    return "$" + length;
-};
-/**
- *
- * @param {Field} field
- */
-ClassBuilder.prototype.addField = function (field) {
-    let handle;
-
-    const fInit = this.fragments.init;
-    const fDeSerialize = this.fragments.deserialize;
-
-    const fieldType = field.type;
-    const fieldName = field.name;
-
-    const cgFieldVar = 'this.' + fieldName;
-
-    let cgSerializedValue;
-
-    const cgFieldJson = 'json.' + fieldName;
-
-    if (field.multiplicity === MultiplicityType.Many) {
-        handle = this.loadClass('core.collection.List');
-
-        fInit.add(cgFieldVar + ' = new ' + handle + "();");
-        cgSerializedValue = cgFieldVar + '.toJSON()';
-
-        if (fieldType.isPrimitive) {
-            fDeSerialize.add(cgFieldVar + '.fromJSON(' + cgFieldJson + ');');
-        } else {
-            handle = this.loadClass(fieldType.name);
-            fDeSerialize.add(cgFieldVar + '.fromJSON(' + cgFieldJson + ', ' + handle + ');');
-        }
-
-    } else if (field.observed) {
-        handle = this.loadClass('core.model.ObservedValue');
-        fInit.add(cgFieldVar + ' = new ' + handle + "(" + field.initial + ");");
-        cgSerializedValue = cgFieldVar + '.get()';
-        if (!fieldType.isPrimitive) {
-            cgSerializedValue += '.toJSON()';
-            fDeSerialize.add(cgFieldVar + '.get().fromJSON(' + cgFieldJson + ');');
-        } else {
-            fDeSerialize.add(cgFieldVar + '.fromJSON(' + cgFieldJson + ');');
-        }
-
-    } else {
-        fInit.add(cgFieldVar + ' = (' + field.initial + ');');
-        cgSerializedValue = cgFieldVar;
-        if (!fieldType.isPrimitive) {
-            cgSerializedValue += '.toJSON()';
-            fDeSerialize.add(cgFieldVar + '.fromJSON(' + cgFieldJson + ');');
-        } else {
-            fDeSerialize.add(cgFieldVar + ' = (' + cgFieldJson + ');');
-        }
-    }
-
-    this.jsonFields.push(fieldName + ' : ' + cgSerializedValue);
-};
-
-export default {
-    build: build
-};