@woosh/meep-engine 2.33.62 → 2.33.63

package/ecs/grid/pick.js

@@ -0,0 +1,44 @@
+import { assert } from "../../core/assert.js";
+import Vector3 from "../../core/geom/Vector3.js";
+import { SurfacePoint3 } from "../../core/geom/3d/SurfacePoint3.js";
+import Vector2 from "../../core/geom/Vector2.js";
+
+/**
+ *
+ * @param {number} x
+ * @param {number} y
+ * @param {GraphicsEngine} graphicsEngine
+ * @param {Terrain} terrain
+ * @param {function(gridPosition:Vector2,worldPosition:Vector3,normal:Vector3)} callback
+ */
+export function pick(x, y, graphicsEngine, terrain, callback) {
+
+    assert.isNumber(x, 'x');
+    assert.isNumber(y, 'y');
+
+    assert.defined(terrain, 'terrain');
+    assert.notNull(terrain, 'terrain');
+
+    assert.isFunction(callback, 'callback');
+
+    const vSource = new Vector3(x, y, 0);
+    const vTarget = new Vector3();
+
+    graphicsEngine.normalizeViewportPoint(vSource, vSource);
+    graphicsEngine.viewportProjectionRay(vSource.x, vSource.y, vSource, vTarget);
+
+    const surfacePoint3 = new SurfacePoint3();
+
+    const hitFound = terrain.raycastFirstSync(surfacePoint3, vSource.x, vSource.y, vSource.z, vTarget.x, vTarget.y, vTarget.z);
+
+    if (!hitFound) {
+        // nothing found
+    } else {
+
+        const gridPosition = new Vector2();
+        terrain.mapPointWorld2Grid(surfacePoint3.position, gridPosition);
+        gridPosition._add(0.5, 0.5);
+        callback(gridPosition, surfacePoint3.position, surfacePoint3.normal);
+    }
+
+}

package/editor/tools/GridPaintTool.js

@@ -1,7 +1,6 @@
 import Tool from "./engine/Tool.js";
 import GridPosition from "../../engine/grid/components/GridPosition.js";
 import GridObstacle from "../../engine/grid/components/GridObstacle.js";
-import { pick } from "../../../model/game/util/ScreenGridPicker.js";
 import Vector4 from "../../core/geom/Vector4.js";
 import ObservedValue from "../../core/model/ObservedValue.js";
 import Vector1 from "../../core/geom/Vector1.js";
@@ -12,6 +11,7 @@ import Vector2 from "../../core/geom/Vector2.js";
 import TopDownCameraControllerSystem from "../../engine/graphics/ecs/camera/topdown/TopDownCameraControllerSystem.js";
 import { parseHex } from "../../core/color/parseHex.js";
 import { obtainTerrain } from "../../engine/ecs/terrain/util/obtainTerrain.js";
+import { pick } from "../../ecs/grid/pick.js";
 
 class GridPaintTool extends Tool {
     constructor() {

package/editor/tools/paint/TerrainPaintTool.js

@@ -3,12 +3,12 @@ import Tool from "../engine/Tool.js";
 import { Color } from "../../../core/color/Color.js";
 import { Sampler2D } from "../../../engine/graphics/texture/sampler/Sampler2D.js";
 import Vector2 from "../../../core/geom/Vector2.js";
-import { pick } from "../../../../model/game/util/ScreenGridPicker.js";
 import convertSampler2D2Canvas from "../../../engine/graphics/texture/sampler/Sampler2D2Canvas.js";
 import ObservedString from "../../../core/model/ObservedString.js";
 import { GameAssetType } from "../../../engine/asset/GameAssetType.js";
 import Vector1 from "../../../core/geom/Vector1.js";
 import { obtainTerrain } from "../../../engine/ecs/terrain/util/obtainTerrain.js";
+import { pick } from "../../../ecs/grid/pick.js";
 
 export class TerrainPaintTool extends Tool {
     constructor() {

package/editor/view/GridPickCoordinateView.js

@@ -1,8 +1,8 @@
 import View from "../../view/View.js";
-import { pick } from "../../../model/game/util/ScreenGridPicker.js";
 import domify from "../../view/DOM.js";
 import { PointerDevice } from "../../engine/input/devices/PointerDevice.js";
 import { obtainTerrain } from "../../engine/ecs/terrain/util/obtainTerrain.js";
+import { pick } from "../../ecs/grid/pick.js";
 
 class GridPickCoordinateView extends View {
     /**

package/engine/ecs/fow/FogOfWarRevealerSystem.js

@@ -2,7 +2,7 @@ import { System } from "../System.js";
 import { FogOfWarRevealer } from "./FogOfWarRevealer.js";
 import { SignalBinding } from "../../../core/events/signal/SignalBinding.js";
 import { FogOfWar } from "./FogOfWar.js";
-import Team from "../../../../model/game/ecs/component/Team.js";
+import Team from "../team/Team.js";
 import { Transform } from "../transform/Transform.js";
 import Vector2 from "../../../core/geom/Vector2.js";
 import { obtainTerrain } from "../terrain/util/obtainTerrain.js";

package/engine/ecs/team/Team.js

@@ -0,0 +1,82 @@
+/**
+ * Created by Alex on 13/04/2016.
+ */
+import ObservedInteger from "../../../core/model/ObservedInteger.js";
+import { BinaryClassSerializationAdapter } from "../storage/binary/BinaryClassSerializationAdapter.js";
+
+class Team extends ObservedInteger {
+    /**
+     *
+     * @param value
+     * @constructor
+     */
+    constructor(value = 0) {
+        super(value);
+    }
+
+    clone() {
+        return new Team(this.getValue());
+    }
+
+    /**
+     *
+     * @param {object} json
+     * @returns {Team}
+     */
+    static fromJSON(json) {
+        const t = new Team();
+
+        t.fromJSON(json);
+
+        return t;
+    }
+}
+
+Team.typeName = "Team";
+
+
+export default Team;
+
+export class TeamSerializationAdapter extends BinaryClassSerializationAdapter{
+    constructor(){
+        super();
+
+        this.klass = Team;
+        this.version = 0;
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {Team} value
+     */
+    serialize(buffer, value) {
+        const v = value.getValue();
+
+        if (v === Infinity) {
+            buffer.writeInt32(2147483647);
+        } else if (v === -Infinity) {
+            buffer.writeInt32(-2147483648);
+        } else {
+            //TODO it's possible to write encoded Infinity values by accident
+            buffer.writeInt32(v);
+        }
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {Team} value
+     */
+    deserialize(buffer, value) {
+        const v = buffer.readInt32();
+
+        if (v === 2147483647) {
+            value.set(Infinity);
+        } else if (v === -2147483648) {
+            value.set(-Infinity);
+        } else {
+            value.set(v);
+        }
+    }
+}

package/engine/ecs/tooltip/TooltipComponentSystem.js

@@ -2,10 +2,10 @@ import { System } from "../System.js";
 import { TooltipComponent } from "./TooltipComponent.js";
 import Vector3 from "../../../core/geom/Vector3.js";
 import { MeshSystem } from "../../graphics/ecs/mesh/MeshSystem.js";
-import { modelHitTest } from "../../../../model/game/util/ScreenGridPicker.js";
 import { SurfacePoint3 } from "../../../core/geom/3d/SurfacePoint3.js";
 import { VisualTip } from "../../../view/tooltip/VisualTip.js";
 import Rectangle from "../../../core/geom/Rectangle.js";
+import { modelHitTest } from "../../graphics/util/modelHitTest.js";
 
 const ray_source = new Vector3();
 const ray_direction = new Vector3();

package/engine/graphics/particles/particular/engine/utils/volume/prototypeParticleVolume.js

@@ -42,7 +42,6 @@ import { RepeatBehavior } from "../../../../../../intelligence/behavior/decorato
 import { ActionBehavior } from "../../../../../../intelligence/behavior/primitive/ActionBehavior.js";
 import { pingpong } from "../../../../../../../core/math/pingpong.js";
 import { ParameterLookupTable } from "../../parameter/ParameterLookupTable.js";
-import { pick } from "../../../../../../../../model/game/util/ScreenGridPicker.js";
 import GUIElement from "../../../../../../ecs/gui/GUIElement.js";
 import EmptyView from "../../../../../../../view/elements/EmptyView.js";
 import HeadsUpDisplay from "../../../../../../ecs/gui/hud/HeadsUpDisplay.js";
@@ -77,6 +76,7 @@ import TopDownCameraController from "../../../../../ecs/camera/topdown/TopDownCa
 import { randomFloatBetween } from "../../../../../../../core/math/random/randomFloatBetween.js";
 import { MicronRenderPlugin } from "../../../../../micron/plugin/MicronRenderPlugin.js";
 import { obtainTerrain } from "../../../../../../ecs/terrain/util/obtainTerrain.js";
+import { pick } from "../../../../../../../ecs/grid/pick.js";
 
 const engineHarness = new EngineHarness();
 

package/engine/graphics/render/forward_plus/plugin/ptototypeFPPlugin.js

@@ -80,7 +80,7 @@ import { ParticleEmitterSystem } from "../../../particles/ecs/ParticleEmitterSys
 import { ShadedGeometrySystem } from "../../../ecs/mesh-v2/ShadedGeometrySystem.js";
 import { FogOfWar } from "../../../../ecs/fow/FogOfWar.js";
 import { FogOfWarRevealer } from "../../../../ecs/fow/FogOfWarRevealer.js";
-import Team from "../../../../../../model/game/ecs/component/Team.js";
+import Team from "../../../../ecs/team/Team.js";
 import { AmbientOcclusionPostProcessEffect } from "../../buffer/simple-fx/ao/AmbientOcclusionPostProcessEffect.js";
 import { obtainTerrain } from "../../../../ecs/terrain/util/obtainTerrain.js";
 

package/engine/graphics/render/webgpu/sample/MeshInstance.js

@@ -1,5 +1,7 @@
 import { array_copy } from "../../../../../core/collection/array/copyArray.js";
 
+const BIND_GROUP_MATERIAL = 1;
+
 export class MeshInstance {
     constructor() {
 
@@ -9,6 +11,12 @@ export class MeshInstance {
          */
         this.geometry = null;
 
+        /**
+         *
+         * @type {null}
+         */
+        this.material = null;
+
         /**
          *
          * @type {GPUBuffer|null}
@@ -80,6 +88,10 @@ export class MeshInstance {
      * @param {GPURenderPassEncoder} pass
      */
     draw(pass) {
+        // set material bindings
+
+        // pass.setBindGroup(BIND_GROUP_MATERIAL, {});
+
         pass.setVertexBuffer(0, this.vertex_buffer);
         pass.setIndexBuffer(this.index_buffer, 'uint32');
         pass.drawIndexed(this.geometry.getIndex().array.length);

package/engine/graphics/util/modelHitTest.js

@@ -0,0 +1,63 @@
+import Vector2 from "../../../core/geom/Vector2.js";
+import Mesh from "../ecs/mesh/Mesh.js";
+
+const tempPoint = new Vector2();
+
+/**
+ *
+ * @param {SurfacePoint3} result
+ * @param {Array.<Number>} entities
+ * @param {EntityComponentDataset} ecd
+ * @param {GraphicsEngine} ge
+ * @param {Number} x
+ * @param {Number} y
+ * @returns {Number} entity number or -1 in case of failed test
+ */
+function modelHitTest(result, entities, ecd, ge, x, y) {
+    tempPoint.set(x, y);
+
+    ge.normalizeViewportPoint(tempPoint, tempPoint);
+
+    let i = 0;
+    const l = entities.length;
+
+    for (; i < l; i++) {
+
+        const entity = entities[i];
+
+        const model = ecd.getComponent(entity, Mesh);
+
+        if (model === null) {
+            //entity no longer exists most likely
+            continue;
+        }
+
+        /**
+         *
+         * @type {Intersection[]}
+         */
+        const hits = ge.intersectObjectUnderViewportPoint(tempPoint.x, tempPoint.y, model.mesh, true);
+
+        // get hit
+
+
+        if (hits.length > 0) {
+            /**
+             *
+             * @type {Intersection}
+             */
+            const hit = hits[0];
+
+            result.position.copy(hit.point);
+
+            //TODO extract normal
+
+            return entity;
+        }
+
+    }
+
+    return -1;
+}
+
+export { modelHitTest };

package/package.json

@@ -5,7 +5,7 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.33.62",
+  "version": "2.33.63",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",

package/util/ScreenGridPicker.js

@@ -0,0 +1,3 @@
+/**
+ * Created by Alex on 13/06/2016.
+ */