@woosh/meep-engine 2.106.0 → 2.107.0

package/editor/tools/engine/ToolEngine.js

@@ -1,191 +1,188 @@
-/**
- * Created by Alex on 14/01/2017.
- */
-
-
 import List from '../../../src/core/collection/list/List.js';
 import ObservedValue from '../../../src/core/model/ObservedValue.js';
+import Clock from "../../../src/engine/Clock.js";
 import { decodeMouseEventButtons, PointerDevice } from '../../../src/engine/input/devices/PointerDevice.js';
+import GridPaintTool from "../GridPaintTool.js";
+import { TerrainHeightPaintTool } from "../paint/TerrainHeightPaintTool.js";
+import { TerrainTexturePaintTool } from "../paint/TerrainTexturePaintTool.js";
 
 import SelectionTool from '../SelectionTool.js';
 import TopDownCameraControlTool from '../TopDownCameraControlTool.js';
-import GridPaintTool from "../GridPaintTool.js";
 import { TransformTool } from "../TransformTool.js";
-import Clock from "../../../src/engine/Clock.js";
-import { TerrainHeightPaintTool } from "../paint/TerrainHeightPaintTool.js";
-import { TerrainTexturePaintTool } from "../paint/TerrainTexturePaintTool.js";
 
-/**
- *
- * @constructor
- * @property {List.<Tool>} tools
- * @property {ObservedValue.<Tool>} active
- */
-function ToolEngine() {
-    this.tools = new List();
-    this.active = new ObservedValue(null);
-    this.engine = null;
-    this.isRunning = false;
-    this.shutdownCallbacks = [];
-    this.pointer = null;
-}
+class ToolEngine {
+    /**
+     *
+     * @constructor
+     * @property {List.<Tool>} tools
+     * @property {ObservedValue.<Tool>} active
+     */
+    constructor() {
+        this.tools = new List();
+        this.active = new ObservedValue(null);
+        this.engine = null;
+        this.isRunning = false;
+        this.shutdownCallbacks = [];
+        this.pointer = null;
+    }
 
-ToolEngine.prototype.activate = function (toolName) {
-    const self = this;
-    this.tools.visitFirstMatch(function (tool) {
-        return tool.name === toolName;
-    }, function (tool) {
-        self.active.set(tool);
-    });
-};
+    activate(toolName) {
+        const self = this;
+        this.tools.visitFirstMatch(function (tool) {
+            return tool.name === toolName;
+        }, function (tool) {
+            self.active.set(tool);
+        });
+    }
 
-ToolEngine.prototype.initialize = function () {
+    initialize() {
 
-    this.active.onChanged.add((newTool, oldTool) => {
-        console.log("active tool changed. Old: ", oldTool, ", New :", newTool);
+        this.active.onChanged.add((newTool, oldTool) => {
+            console.log("active tool changed. Old: ", oldTool, ", New :", newTool);
 
-        if (oldTool !== null && typeof oldTool === "object") {
-            oldTool.finalize();
-        }
+            if (oldTool !== null && typeof oldTool === "object") {
+                oldTool.finalize();
+            }
 
-        if (newTool !== null && typeof newTool === "object") {
-            newTool.editor = this.editor;
-            newTool.engine = this.engine;
+            if (newTool !== null && typeof newTool === "object") {
+                newTool.editor = this.editor;
+                newTool.engine = this.engine;
 
-            newTool.initialize();
-        }
-    });
-
-    const terrainPaintToolRaise = new TerrainHeightPaintTool();
-    terrainPaintToolRaise.name = "terrain-height";
-
-    const terrainTexturePaintTool0 = new TerrainTexturePaintTool();
-    terrainTexturePaintTool0.name = `terrain-texture-0`;
-    terrainTexturePaintTool0.settings.splatIndex = 0;
-
-    const terrainTexturePaintTool1 = new TerrainTexturePaintTool();
-    terrainTexturePaintTool1.name = `terrain-texture-1`;
-    terrainTexturePaintTool1.settings.splatIndex = 1;
-
-    const terrainTexturePaintTool2 = new TerrainTexturePaintTool();
-    terrainTexturePaintTool2.name = `terrain-texture-2`;
-    terrainTexturePaintTool2.settings.splatIndex = 2;
-
-    const terrainTexturePaintTool3 = new TerrainTexturePaintTool();
-    terrainTexturePaintTool3.name = `terrain-texture-3`;
-    terrainTexturePaintTool3.settings.splatIndex = 3;
-
-    const tools = this.tools;
-    tools
-        .add(new SelectionTool())
-        .add(new TopDownCameraControlTool())
-        .add(new GridPaintTool())
-        .add(new TransformTool())
-        .add(terrainPaintToolRaise)
-        .add(terrainTexturePaintTool0)
-        .add(terrainTexturePaintTool1)
-        .add(terrainTexturePaintTool2)
-        .add(terrainTexturePaintTool3)
-    ;
-};
-
-/**
- *
- * @param {Engine} engine
- * @param {Editor} editor
- */
-ToolEngine.prototype.startup = function (engine, editor) {
-    this.engine = engine;
-    this.editor = editor;
-    this.isRunning = true;
-    const pointer = this.pointer = new PointerDevice(engine.graphics.domElement);
-
-    const self = this;
-
-    const clock = new Clock();
-
-    clock.start();
-
-    function update() {
-        if (!self.isRunning) {
-            return;
-        }
-        requestAnimationFrame(update);
+                newTool.initialize();
+            }
+        });
+
+        const terrainPaintToolRaise = new TerrainHeightPaintTool();
+        terrainPaintToolRaise.name = "terrain-height";
+
+        const terrainTexturePaintTool0 = new TerrainTexturePaintTool();
+        terrainTexturePaintTool0.name = `terrain-texture-0`;
+        terrainTexturePaintTool0.settings.splatIndex = 0;
+
+        const terrainTexturePaintTool1 = new TerrainTexturePaintTool();
+        terrainTexturePaintTool1.name = `terrain-texture-1`;
+        terrainTexturePaintTool1.settings.splatIndex = 1;
+
+        const terrainTexturePaintTool2 = new TerrainTexturePaintTool();
+        terrainTexturePaintTool2.name = `terrain-texture-2`;
+        terrainTexturePaintTool2.settings.splatIndex = 2;
+
+        const terrainTexturePaintTool3 = new TerrainTexturePaintTool();
+        terrainTexturePaintTool3.name = `terrain-texture-3`;
+        terrainTexturePaintTool3.settings.splatIndex = 3;
+
+        const tools = this.tools;
+        tools
+            .add(new SelectionTool())
+            .add(new TopDownCameraControlTool())
+            .add(new GridPaintTool())
+            .add(new TransformTool())
+            .add(terrainPaintToolRaise)
+            .add(terrainTexturePaintTool0)
+            .add(terrainTexturePaintTool1)
+            .add(terrainTexturePaintTool2)
+            .add(terrainTexturePaintTool3)
+        ;
+    }
 
-        const tool = self.active.get();
+    /**
+     *
+     * @param {Engine} engine
+     * @param {Editor} editor
+     */
+    startup(engine, editor) {
+        this.engine = engine;
+        this.editor = editor;
+        this.isRunning = true;
+        const pointer = this.pointer = new PointerDevice(engine.graphics.domElement);
 
-        const delta = clock.getDelta();
+        const self = this;
 
-        if (tool !== null) {
-            tool.update(delta);
+        const clock = new Clock();
+
+        clock.start();
+
+        function update() {
+            if (!self.isRunning) {
+                return;
+            }
+            requestAnimationFrame(update);
+
+            const tool = self.active.get();
+
+            const delta = clock.getDelta();
+
+            if (tool !== null) {
+                tool.update(delta);
+            }
         }
-    }
 
-    //start update loop
-    update();
+        //start update loop
+        update();
 
-    //hook up interaction controls
-    function pointerDown(position, event) {
-        const tool = self.active.get();
-        if (tool !== null) {
-            tool.modifiers.shift = event.shiftKey;
+        //hook up interaction controls
+        function pointerDown(position, event) {
+            const tool = self.active.get();
+            if (tool !== null) {
+                tool.modifiers.shift = event.shiftKey;
+
+                if (typeof event.buttons === "number") {
+                    const decodedButtons = decodeMouseEventButtons(event.buttons);
 
-            if (typeof event.buttons === "number") {
-                const decodedButtons = decodeMouseEventButtons(event.buttons);
+                    const isPrimaryPressed = decodedButtons[0];
 
-                const isPrimaryPressed = decodedButtons[0];
+                    if (!isPrimaryPressed) {
+                        //when working with mouse, only activate on primary mouse button
+                        return;
+                    }
 
-                if (!isPrimaryPressed) {
-                    //when working with mouse, only activate on primary mouse button
-                    return;
                 }
 
+                tool.start();
             }
-
-            tool.start();
         }
-    }
 
-    function pointerUp(position, event) {
-        const tool = self.active.get();
-        if (tool !== null) {
+        function pointerUp(position, event) {
+            const tool = self.active.get();
+            if (tool !== null) {
 
-            tool.stop();
+                tool.stop();
+            }
         }
-    }
 
 
-    pointer.on.down.add(pointerDown);
-    pointer.on.up.add(pointerUp);
-    pointer.start();
+        pointer.on.down.add(pointerDown);
+        pointer.on.up.add(pointerUp);
+        pointer.start();
 
 
-    function cleanup() {
-        pointer.on.down.remove(pointerDown);
-        pointer.on.up.remove(pointerUp);
-        pointer.stop();
-    }
+        function cleanup() {
+            pointer.on.down.remove(pointerDown);
+            pointer.on.up.remove(pointerUp);
+            pointer.stop();
+        }
 
-    this.shutdownCallbacks.push(cleanup);
-};
+        this.shutdownCallbacks.push(cleanup);
+    }
 
-ToolEngine.prototype.shutdown = function () {
-    this.isRunning = false;
-    const toolProxy = this.active;
+    shutdown() {
+        this.isRunning = false;
+        const toolProxy = this.active;
 
-    const tool = toolProxy.getValue();
+        const tool = toolProxy.getValue();
 
-    if (tool !== null) {
-        toolProxy.set(null);
-    }
+        if (tool !== null) {
+            toolProxy.set(null);
+        }
 
-    //execute cleanup
-    this.shutdownCallbacks.forEach(function (cb) {
-        cb();
-    });
+        //execute cleanup
+        this.shutdownCallbacks.forEach(function (cb) {
+            cb();
+        });
 
-    this.shutdownCallbacks = [];
-};
+        this.shutdownCallbacks = [];
+    }
+}
 
 
 export default ToolEngine;

package/editor/tools/v2/TransformControls.js

@@ -16,14 +16,14 @@ import {
     TorusGeometry,
     Vector3
 } from 'three';
-import { ShadedGeometry } from "../../../src/engine/graphics/ecs/mesh-v2/ShadedGeometry.js";
-import { DrawMode } from "../../../src/engine/graphics/ecs/mesh-v2/DrawMode.js";
+import { assert } from "../../../src/core/assert.js";
+import { SurfacePoint3 } from "../../../src/core/geom/3d/SurfacePoint3.js";
 import { EntityNode } from "../../../src/engine/ecs/parent/EntityNode.js";
 import { Transform } from "../../../src/engine/ecs/transform/Transform.js";
+import { DrawMode } from "../../../src/engine/graphics/ecs/mesh-v2/DrawMode.js";
+import { ShadedGeometry } from "../../../src/engine/graphics/ecs/mesh-v2/ShadedGeometry.js";
 import { ShadedGeometryFlags } from "../../../src/engine/graphics/ecs/mesh-v2/ShadedGeometryFlags.js";
-import { SurfacePoint3 } from "../../../src/core/geom/3d/SurfacePoint3.js";
 import { FrameRunner } from "../../../src/engine/graphics/FrameRunner.js";
-import { assert } from "../../../src/core/assert.js";
 
 const _raycaster = new Raycaster();
 
@@ -47,6 +47,27 @@ const _objectChangeEvent = { type: 'objectChange' };
  */
 const _tempTransform = new Transform();
 
+function CircleGeometry(radius, arc) {
+
+    const geometry = new TorusGeometry(radius, 0.0075, 3, 64, arc * Math.PI * 2);
+    geometry.rotateY(Math.PI / 2);
+    geometry.rotateX(Math.PI / 2);
+    return geometry;
+
+}
+
+// Special geometry for transform helper. If scaled with position vector it spans from [0,0,0] to position
+
+function TranslateHelperGeometry() {
+
+    const geometry = new BufferGeometry();
+
+    geometry.setAttribute('position', new Float32BufferAttribute([0, 0, 0, 1, 1, 1], 3));
+
+    return geometry;
+
+}
+
 class GizmoNode extends EntityNode {
     constructor() {
         super();
@@ -1002,26 +1023,6 @@ class TransformControlsGizmo extends GizmoNode {
         const lineGeometry2 = new CylinderGeometry(0.0075, 0.0075, 0.5, 3);
         lineGeometry2.translate(0, 0.25, 0);
 
-        function CircleGeometry(radius, arc) {
-
-            const geometry = new TorusGeometry(radius, 0.0075, 3, 64, arc * Math.PI * 2);
-            geometry.rotateY(Math.PI / 2);
-            geometry.rotateX(Math.PI / 2);
-            return geometry;
-
-        }
-
-        // Special geometry for transform helper. If scaled with position vector it spans from [0,0,0] to position
-
-        function TranslateHelperGeometry() {
-
-            const geometry = new BufferGeometry();
-
-            geometry.setAttribute('position', new Float32BufferAttribute([0, 0, 0, 1, 1, 1], 3));
-
-            return geometry;
-
-        }
 
         // Gizmo definitions - custom hierarchy definitions for setupGizmo() function
 

package/editor/view/EditorView.js

@@ -1,8 +1,3 @@
-/**
- * Created by Alex on 14/01/2017.
- */
-
-
 import { passThrough } from "../../src/core/function/passThrough.js";
 import { ProcessState } from "../../src/core/process/ProcessState.js";
 import LabelView from '../../src/view/common/LabelView.js';

package/editor/view/ecs/ComponentControlFactory.js

@@ -1,48 +1,45 @@
-/**
- * Created by Alex on 14/01/2017.
- */
-
-
 //TODO consider making more abstract and using as a ViewFactory elsewhere
 
 import { assert } from "../../../src/core/assert.js";
 
-/**
- *
- * @constructor
- */
-function ComponentControlFactory() {
-    this.controllerTypes = {};
+class ComponentControlFactory {
+    /**
+     *
+     * @constructor
+     */
+    constructor() {
+        this.controllerTypes = {};
+    }
+
+    /**
+     *
+     * @param {string} componentTypeName
+     * @param {function} factory
+     * @returns {ComponentControlFactory}
+     */
+    register(componentTypeName, factory) {
+        assert.equal(typeof factory, 'function');
+        assert.equal(typeof componentTypeName, 'string');
+
+        this.controllerTypes[componentTypeName] = factory;
+
+        return this;
+    }
+
+    /**
+     *
+     * @param {string} componentTypeName
+     * @returns {object} instance of a controller for given component type
+     */
+    create(componentTypeName) {
+        const factory = this.controllerTypes[componentTypeName];
+        return factory();
+    }
+
+    exists(typeName) {
+        return this.controllerTypes.hasOwnProperty(typeName);
+    }
 }
 
-/**
- *
- * @param {string} componentTypeName
- * @param {function} factory
- * @returns {ComponentControlFactory}
- */
-ComponentControlFactory.prototype.register = function (componentTypeName, factory) {
-    assert.equal(typeof factory, 'function');
-    assert.equal(typeof componentTypeName, 'string');
-
-    this.controllerTypes[componentTypeName] = factory;
-
-    return this;
-};
-
-/**
- *
- * @param {string} componentTypeName
- * @returns {object} instance of a controller for given component type
- */
-ComponentControlFactory.prototype.create = function (componentTypeName) {
-    const factory = this.controllerTypes[componentTypeName];
-    return factory();
-};
-
-ComponentControlFactory.prototype.exists = function (typeName) {
-    return this.controllerTypes.hasOwnProperty(typeName);
-};
-
 export default ComponentControlFactory;
 

package/editor/view/ecs/EntityEditor.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 15/01/2017.
- */
 import List from '../../../src/core/collection/list/List.js';
 import ObservedValue from '../../../src/core/model/ObservedValue.js';
 import { isDefined } from "../../../src/core/process/matcher/isDefined.js";

package/editor/view/ecs/EntityList.js

@@ -1,20 +1,15 @@
-/**
- * Created by Alex on 14/01/2017.
- */
-
-
-import View from "../../../src/view/View.js";
-import dom from "../../../src/view/DOM.js";
+import List from '../../../src/core/collection/list/List.js';
+import Signal from '../../../src/core/events/signal/Signal.js';
+import ObservedValue from '../../../src/core/model/ObservedValue.js';
 import LabelView from '../../../src/view/common/LabelView.js';
 import VirtualListView from '../../../src/view/common/VirtualListView.js';
+import dom from "../../../src/view/DOM.js";
 import ButtonView from '../../../src/view/elements/button/ButtonView.js';
-import ObservedValue from '../../../src/core/model/ObservedValue.js';
-import Signal from '../../../src/core/events/signal/Signal.js';
-import List from '../../../src/core/collection/list/List.js';
+import EmptyView from "../../../src/view/elements/EmptyView.js";
+import View from "../../../src/view/View.js";
 
 import SelectionAddAction from '../../actions/concrete/SelectionAddAction.js';
 import SelectionRemoveAction from '../../actions/concrete/SelectionRemoveAction.js';
-import EmptyView from "../../../src/view/elements/EmptyView.js";
 
 class EntityView extends EmptyView {
     /**

package/editor/view/ecs/components/MeshController.js

@@ -1,14 +1,11 @@
-/**
- * Created by Alex on 16/01/2017.
- */
+import { MeshSystem } from "../../../../src/engine/graphics/ecs/mesh/MeshSystem.js";
 import GuiControl from '../../../../src/view/controller/controls/GuiControl.js';
 
-import MeshPreview from '../../../../src/view/elements/MeshPreview.js';
-
 import { clear } from "../../../../src/view/controller/dat/DatGuiUtils.js";
-import DatGuiController from "./DatGuiController.js";
 import EmptyView from "../../../../src/view/elements/EmptyView.js";
-import { MeshSystem } from "../../../../src/engine/graphics/ecs/mesh/MeshSystem.js";
+
+import MeshPreview from '../../../../src/view/elements/MeshPreview.js';
+import DatGuiController from "./DatGuiController.js";
 
 class MeshController extends GuiControl {
     /**

package/editor/view/ecs/components/TransformController.js

@@ -1,15 +1,9 @@
-/**
- * Created by Alex on 14/01/2017.
- */
-
-
-import GuiControl from '../../../../src/view/controller/controls/GuiControl.js';
-import Vector3Control from '../../../../src/view/controller/controls/Vector3Control.js';
+import { Euler as ThreeEuler } from 'three';
 import Vector3 from '../../../../src/core/geom/Vector3.js';
 
 import LabelView from '../../../../src/view/common/LabelView.js';
-
-import { Euler as ThreeEuler } from 'three';
+import GuiControl from '../../../../src/view/controller/controls/GuiControl.js';
+import Vector3Control from '../../../../src/view/controller/controls/Vector3Control.js';
 
 class TransformController extends GuiControl {
     constructor() {

package/editor/view/tools/ToolView.js

@@ -1,13 +1,7 @@
-/**
- * Created by Alex on 16/01/2017.
- */
-
-
-import View from "../../../src/view/View.js";
-import dom from "../../../src/view/DOM.js";
-
 import LabelView from '../../../src/view/common/LabelView.js';
+import dom from "../../../src/view/DOM.js";
 import ImageView from "../../../src/view/elements/image/ImageView.js";
+import View from "../../../src/view/View.js";
 
 class ToolView extends View {
     /**

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.106.0",
+  "version": "2.107.0",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/core/IdPool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IdPool.d.ts","sourceRoot":"","sources":["../../../src/core/IdPool.js"],"names":[],"mappings":";AAQA;;;GAGG;AACH;IAOI;;;;OAIG;IACH,QAFa,MAAM,CAIlB;IAED;;;OAGG;IACH,OAFa,MAAM,CAQlB;IAED;;;;OAIG;IACH,gBAHW,MAAM,GACL,OAAO,CASlB;IAED;;;;OAIG;IACH,WAHW,MAAM,GACJ,OAAO,CAInB;IAED;;;OAGG;IACH,iCASC;IAED;;;OAGG;IACH,YAFW,MAAM,QAIhB;IAED;;OAEG;IACH,cAEC;;CACJ"}
+{"version":3,"file":"IdPool.d.ts","sourceRoot":"","sources":["../../../src/core/IdPool.js"],"names":[],"mappings":";AAGA;;;GAGG;AACH;IAOI;;;;OAIG;IACH,QAFa,MAAM,CAIlB;IAED;;;OAGG;IACH,OAFa,MAAM,CAQlB;IAED;;;;OAIG;IACH,gBAHW,MAAM,GACL,OAAO,CASlB;IAED;;;;OAIG;IACH,WAHW,MAAM,GACJ,OAAO,CAInB;IAED;;;OAGG;IACH,iCASC;IAED;;;OAGG;IACH,YAFW,MAAM,QAIhB;IAED;;OAEG;IACH,cAEC;;CACJ"}

package/src/core/IdPool.js

@@ -1,8 +1,3 @@
-/**
- * Created by Alex on 01/04/2014.
- */
-
-
 import { assert } from "./assert.js";
 import { BitSet } from "./binary/BitSet.js";
 

package/src/core/UUID.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UUID.d.ts","sourceRoot":"","sources":["../../../src/core/UUID.js"],"names":[],"mappings":";;;;AAWA;;;;GAIG;AACH,yBAFa,MAAM,CAIlB"}
+{"version":3,"file":"UUID.d.ts","sourceRoot":"","sources":["../../../src/core/UUID.js"],"names":[],"mappings":";;;;AAOA;;;;GAIG;AACH,yBAFa,MAAM,CAIlB"}

package/src/core/UUID.js

@@ -1,7 +1,3 @@
-/**
- * Created by Alex on 24/04/2016.
- */
-
 function replacer(c) {
     const r = Math.random() * 16 | 0, v = c === 'x' ? r : (r & 0x3 | 0x8);
     return v.toString(16);