@woosh/meep-engine 2.33.60 → 2.33.64

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/engine/grid/systems/GridPosition2TransformSystem.js

@@ -6,8 +6,8 @@ import { Transform } from '../../ecs/transform/Transform.js';
 import GridPosition from '../components/GridPosition.js';
 import { GridPosition2Transform } from '../components/GridPosition2Transform.js';
 import Vector3 from "../../../core/geom/Vector3.js";
-import { obtainTerrain } from "../../../../model/game/scenes/SceneUtils.js";
 import { GridPosition2TransformFlags } from "../components/GridPosition2TransformFlags.js";
+import { obtainTerrain } from "../../ecs/terrain/util/obtainTerrain.js";
 
 
 export class GridPosition2TransformSystem extends System {

package/engine/grid/systems/ViewportGridProjectionSystem.js

@@ -5,9 +5,9 @@ import { System } from '../../ecs/System.js';
 import GeometryBVH from '../../ecs/components/GeometryBVH.js';
 import GridPosition from '../components/GridPosition.js';
 import ViewportGridProjection from '../components/ViewportGridProjection.js';
-import { obtainTerrain } from "../../../../model/game/scenes/SceneUtils.js";
 import Vector2 from "../../../core/geom/Vector2.js";
 import Vector3 from "../../../core/geom/Vector3.js";
+import { obtainTerrain } from "../../ecs/terrain/util/obtainTerrain.js";
 
 class ViewportGridProjectionSystem extends System {
     constructor(grid, graphicsEngine) {

package/engine/grid/transform2grid/Transform2GridPositionSystem.js

@@ -2,9 +2,9 @@ import { System } from "../../ecs/System.js";
 import { Transform2GridPosition } from "./Transform2GridPosition.js";
 import GridPosition from "../components/GridPosition.js";
 import { Transform } from "../../ecs/transform/Transform.js";
-import { obtainTerrain } from "../../../../model/game/scenes/SceneUtils.js";
 import Vector2 from "../../../core/geom/Vector2.js";
 import { Transform2GridPositionMode } from "./Transform2GridPositionMode.js";
+import { obtainTerrain } from "../../ecs/terrain/util/obtainTerrain.js";
 
 const v2 = new Vector2();
 

package/engine/scene/transitionToScene.js

@@ -1,11 +1,11 @@
 import { actionTask, delayTask, wrapTaskIgnoreFailure } from "../../core/process/task/TaskUtils.js";
-import { loadVisibleTerrainTiles } from "../../../model/game/scenes/SceneUtils.js";
 import TaskGroup from "../../core/process/task/TaskGroup.js";
 import Task from "../../core/process/task/Task.js";
 import TaskState from "../../core/process/task/TaskState.js";
 import { noop } from "../../core/function/Functions.js";
 import { compileAllMaterials } from "../graphics/ecs/compileAllMaterials.js";
 import { createTaskWaitForMeshesToLoad } from "../graphics/ecs/mesh/createTaskWaitForMeshesToLoad.js";
+import { loadVisibleTerrainTiles } from "../ecs/terrain/util/loadVisibleTerrainTiles.js";
 
 
 /**

package/generation/grid/actions/ContinuousGridCellActionSetTerrainHeight.js

@@ -2,9 +2,9 @@ import { lerp } from "../../../core/math/lerp.js";
 import { min2 } from "../../../core/math/min2.js";
 import { ContinuousGridCellAction } from "./ContinuousGridCellAction.js";
 import { Sampler2D } from "../../../engine/graphics/texture/sampler/Sampler2D.js";
-import { obtainTerrain } from "../../../../model/game/scenes/SceneUtils.js";
 import { assert } from "../../../core/assert.js";
 import { CellFilterLiteralFloat } from "../../filtering/numeric/CellFilterLiteralFloat.js";
+import { obtainTerrain } from "../../../engine/ecs/terrain/util/obtainTerrain.js";
 
 export class ContinuousGridCellActionSetTerrainHeight extends ContinuousGridCellAction {
     constructor() {

package/generation/markers/actions/placement/MarkerNodeEntityProcessorClingToTerrain.js

@@ -1,7 +1,7 @@
 import { MarkerNodeEntityProcessor } from "./MarkerNodeEntityProcessor.js";
-import { obtainTerrain } from "../../../../../model/game/scenes/SceneUtils.js";
 import { SurfacePoint3 } from "../../../../core/geom/3d/SurfacePoint3.js";
 import { alignToVector } from "../../../../engine/ecs/terrain/ecs/ClingToTerrainSystem.js";
+import { obtainTerrain } from "../../../../engine/ecs/terrain/util/obtainTerrain.js";
 
 const p = new SurfacePoint3();
 

package/generation/markers/debug/visualizeMarkers.js

@@ -11,13 +11,13 @@ import {
 import EntityBuilder from "../../../engine/ecs/EntityBuilder.js";
 import Renderable from "../../../engine/ecs/components/Renderable.js";
 import { Transform } from "../../../engine/ecs/transform/Transform.js";
-import { obtainTerrain } from "../../../../model/game/scenes/SceneUtils.js";
 import LabelView from "../../../view/common/LabelView.js";
 import GUIElement from "../../../engine/ecs/gui/GUIElement.js";
 import ViewportPosition from "../../../engine/ecs/gui/position/ViewportPosition.js";
 import HeadsUpDisplay from "../../../engine/ecs/gui/hud/HeadsUpDisplay.js";
 import Vector3 from "../../../core/geom/Vector3.js";
 import { MarkerNodeMatcherAny } from "../matcher/MarkerNodeMatcherAny.js";
+import { obtainTerrain } from "../../../engine/ecs/terrain/util/obtainTerrain.js";
 
 function formatValue(v) {
 

package/generation/theme/ThemeEngine.js

@@ -1,6 +1,5 @@
 import { QuadTreeNode } from "../../core/geom/2d/quad-tree/QuadTreeNode.js";
 import { assert } from "../../core/assert.js";
-import { obtainTerrain } from "../../../model/game/scenes/SceneUtils.js";
 import { seededRandom } from "../../core/math/random/seededRandom.js";
 import { TerrainLayerRuleAggregator } from "./TerrainLayerRuleAggregator.js";
 import { actionTask, countTask, emptyTask, futureTask } from "../../core/process/task/TaskUtils.js";
@@ -17,6 +16,7 @@ import { TerrainLayer } from "../../engine/ecs/terrain/ecs/layers/TerrainLayer.j
 import { TerrainFlags } from "../../engine/ecs/terrain/ecs/TerrainFlags.js";
 import { binarySearchLowIndex } from "../../core/collection/array/binarySearchLowIndex.js";
 import { randomFloatBetween } from "../../core/math/random/randomFloatBetween.js";
+import { obtainTerrain } from "../../engine/ecs/terrain/util/obtainTerrain.js";
 
 /**
  *

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.60",
+  "version": "2.33.64",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",

package/samples/terrain/main.js

@@ -0,0 +1,117 @@
+import { EngineConfiguration } from "../../engine/EngineConfiguration.js";
+import { EngineHarness } from "../../engine/EngineHarness.js";
+import { GameAssetType } from "../../engine/asset/GameAssetType.js";
+import { TextureAssetLoader } from "../../engine/asset/loaders/texture/TextureAssetLoader.js";
+import { ImprovedNoise } from "three/examples/jsm/math/ImprovedNoise.js";
+import { lerp } from "../../core/math/lerp.js";
+import Vector2 from "../../core/geom/Vector2.js";
+import Vector3 from "../../core/geom/Vector3.js";
+import { obtainTerrain } from "../../engine/ecs/terrain/util/obtainTerrain.js";
+
+const eh = new EngineHarness();
+
+/**
+ *
+ * @param {Engine} engine
+ * @return {EngineConfiguration}
+ */
+function makeConfig(engine) {
+    const r = new EngineConfiguration();
+
+    // configure engine here, add systems, loaders etc.
+    r.addLoader(GameAssetType.Texture, new TextureAssetLoader());
+
+    return r;
+}
+
+/**
+ *
+ * @param {Terrain} terrain
+ * @param {number} resolution
+ * @param {number} heightMin
+ * @param {number} heightMax
+ */
+async function buildRandomTerrainHeights({
+                                             terrain,
+                                             resolution = 64,
+                                             heightMin = -5,
+                                             heightMax = 20
+                                         }) {
+
+    const terrain_height = terrain.samplerHeight;
+
+    terrain_height.resize(resolution, resolution);
+
+    const noise = new ImprovedNoise();
+
+    let x, y;
+
+    for (y = 0; y < resolution; y++) {
+        for (x = 0; x < resolution; x++) {
+
+            const u = x / (resolution - 1);
+            const v = y / (resolution - 1);
+
+            const noise_value = noise.noise(u * 13.456, v * 13.456, 0) * noise.noise(u * 3.71, v * 3.71, 0.8);
+
+            const height_value = lerp(heightMin, heightMax, noise_value);
+
+            terrain_height.set(x, y, [height_value]);
+        }
+    }
+
+    await terrain.updateWorkerHeights();
+    terrain.updateHeightTexture();
+    terrain.buildLightMap();
+
+    terrain.tiles.rebuild();
+}
+
+/**
+ *
+ * @param {Engine} engine
+ */
+async function main(engine) {
+
+
+    await EngineHarness.buildBasics({
+        engine,
+        enableWater: false,
+        terrainResolution: 4,
+        terrainSize: new Vector2(64, 64),
+        focus: new Vector3(64, 0, 54),
+        yaw: 0,
+        pitch: 0.909,
+        distance: 169
+    });
+
+    /**
+     *
+     * @type {EntityComponentDataset}
+     */
+    const ecd = engine.entityManager.dataset;
+
+    /**
+     *
+     * @type {Terrain|null}
+     */
+    const terrain = obtainTerrain(ecd);
+
+    buildRandomTerrainHeights({ terrain: terrain });
+}
+
+/**
+ *
+ * @param {EngineHarness} harness
+ */
+async function init(harness) {
+    const engine = eh.engine;
+
+    await makeConfig(engine).apply(engine);
+
+    await eh.initialize();
+
+    main(engine);
+}
+
+init(eh);

package/view/minimap/Minimap.js

@@ -19,7 +19,7 @@ import { MinimapWorldGL } from "./gl/MinimapWorldGL.js";
 import { MinimapCameraView } from "./dom/MinimapCameraView.js";
 import { MinimapFogOfWar } from "./gl/MinimapFogOfWar.js";
 import { MinimapTerrainGL } from "./gl/MinimapTerrainGL.js";
-import { obtainTerrain } from "../../../model/game/scenes/SceneUtils.js";
+import { obtainTerrain } from "../../engine/ecs/terrain/util/obtainTerrain.js";
 
 
 class MinimapView extends View {

package/engine/ecs/sockets/AttachmentSocketsSystem.js

@@ -1,10 +0,0 @@
-import { System } from "../System.js";
-import { AttachmentSockets } from "./AttachmentSockets.js";
-
-export class AttachmentSocketsSystem extends System {
-    constructor() {
-        super();
-
-        this.dependencies = [AttachmentSockets];
-    }
-}