@woosh/meep-engine 2.64.0 → 2.66.0

package/src/engine/ecs/terrain/tiles/TerrainTileManager.js

@@ -1,32 +1,96 @@
 /**
  * Created by Alex on 21/05/2016.
  */
-import ObservedValue from '../../../../core/model/ObservedValue.js';
-import Vector2 from '../../../../core/geom/Vector2.js';
-import Signal from '../../../../core/events/signal/Signal.js';
-import TerrainTile from './TerrainTile.js';
-
-import { BinaryNode } from '../../../../core/bvh2/BinaryNode.js';
-
-import CheckersTexture from '../../../graphics/texture/CheckersTexture.js';
+import { mat4, vec3 } from "gl-matrix";
 
 
 import { MeshPhongMaterial } from 'three';
 import { assert } from "../../../../core/assert.js";
+import { BVH } from "../../../../core/bvh2/bvh3/BVH.js";
+import { bvh_query_leaves_ray } from "../../../../core/bvh2/bvh3/query/bvh_query_leaves_ray.js";
+import { isArrayEqualStrict } from "../../../../core/collection/array/isArrayEqualStrict.js";
 import { Color } from "../../../../core/color/Color.js";
+import Signal from '../../../../core/events/signal/Signal.js';
 import { noop } from "../../../../core/function/Functions.js";
+import { aabb2_overlap_exists } from "../../../../core/geom/2d/aabb/aabb2_overlap_exists.js";
 import { SurfacePoint3 } from "../../../../core/geom/3d/SurfacePoint3.js";
-import { RaycastBVHVisitor } from "../../../../core/bvh2/traversal/RaycastBVHVisitor.js";
-import { FirstRayIntersectionTerrainBVHVisitor } from "./FirstRayIntersectionTerrainBVHVisitor.js";
-import { traverseBinaryNodeUsingVisitor } from "../../../../core/bvh2/traversal/traverseBinaryNodeUsingVisitor.js";
-import ObservedInteger from "../../../../core/model/ObservedInteger.js";
+import Vector2 from '../../../../core/geom/Vector2.js';
 import { NumericInterval } from "../../../../core/math/interval/NumericInterval.js";
 import { randomFloatBetween } from "../../../../core/math/random/randomFloatBetween.js";
-import { mat4, vec3 } from "gl-matrix";
-import { isArrayEqualStrict } from "../../../../core/collection/array/isArrayEqualStrict.js";
-import { aabb2_overlap_exists } from "../../../../core/geom/2d/aabb/aabb2_overlap_exists.js";
+import ObservedInteger from "../../../../core/model/ObservedInteger.js";
+import ObservedValue from '../../../../core/model/ObservedValue.js';
+
+import CheckersTexture from '../../../graphics/texture/CheckersTexture.js';
+import TerrainTile from './TerrainTile.js';
+
+/**
+ *
+ * @type {number[]}
+ */
+const scratch_array = [];
+const scratch_contact = new SurfacePoint3();
 
 class TerrainTileManager {
+    /**
+     *
+     * @type {TerrainTile[]}
+     */
+    tiles = [];
+
+    on = {
+        tileBuilt: new Signal(),
+        tileDestroyed: new Signal()
+    };
+
+    /**
+     *
+     * @type {Vector2}
+     */
+    tileSize = new Vector2(10, 10);
+
+    /**
+     *
+     * @type {Vector2}
+     */
+    totalSize = new Vector2(1, 1);
+    /**
+     * Number of subdivisions per single grid cell
+     * @type {ObservedInteger}
+     */
+    resolution = new ObservedInteger(4);
+
+    /**
+     * 2D Scale of the terrain
+     * @type {Vector2}
+     */
+    scale = new Vector2(1, 1);
+
+
+    /**
+     *
+     * @type {Float32Array}
+     * @private
+     */
+    __transform = new Float32Array(16);
+
+    /**
+     * @readonly
+     * @type {BVH}
+     */
+    bvh = new BVH();
+
+    /**
+     *
+     * @type {NumericInterval}
+     */
+    heightRange = new NumericInterval(0, 0);
+
+    /**
+     * Debug parameter, makes all tiles have random colored material for easy visual distinction
+     * @type {boolean}
+     */
+    debugTileMaterialRandom = false;
+
     /**
      *
      * @param {Vector2} [tileSize]
@@ -40,28 +104,6 @@ class TerrainTileManager {
         }
     ) {
 
-        /**
-         *
-         * @type {TerrainTile[]}
-         */
-        this.tiles = [];
-
-        this.on = {
-            tileBuilt: new Signal(),
-            tileDestroyed: new Signal()
-        };
-
-        /**
-         *
-         * @type {Vector2}
-         */
-        this.tileSize = new Vector2(10, 10);
-
-        /**
-         *
-         * @type {Vector2}
-         */
-        this.totalSize = new Vector2(1, 1);
 
         if (material === undefined) {
             const defaultMaterialTexture = CheckersTexture.create(this.totalSize.clone()._sub(1, 1).multiplyScalar(0.5));
@@ -70,17 +112,6 @@ class TerrainTileManager {
 
         this.material = new ObservedValue(material);
 
-        /**
-         * Number of subdivisions per single grid cell
-         * @type {ObservedInteger}
-         */
-        this.resolution = new ObservedInteger(4);
-
-        /**
-         * 2D Scale of the terrain
-         * @type {Vector2}
-         */
-        this.scale = new Vector2(1, 1);
 
         /**
          *
@@ -88,31 +119,10 @@ class TerrainTileManager {
          */
         this.buildWorker = buildWorker;
 
-        this.bvh = new BinaryNode();
-
-        /**
-         *
-         * @type {NumericInterval}
-         */
-        this.heightRange = new NumericInterval(0, 0);
-
-        /**
-         * Debug parameter, makes all tiles have random colored material for easy visual distinction
-         * @type {boolean}
-         */
-        this.debugTileMaterialRandom = false;
-
         this.material.onChanged.add(() => {
             this.traverse(this.assignTileMaterial, this);
         });
 
-        /**
-         *
-         * @type {Float32Array}
-         * @private
-         */
-        this.__transform = new Float32Array(16);
-
     }
 
     set transform(m4) {
@@ -155,17 +165,12 @@ class TerrainTileManager {
 
             if (!terrainTile.isBuilt && !terrainTile.isBuildInProgress) {
 
-                const bb = terrainTile.boundingBox;
+                const bb = terrainTile.external_bvh;
 
-                bb.resize(
-                    bb.x0,
-                    min_height,
-                    bb.z0,
+                bb.bounds[1] = min_height;
+                bb.bounds[4] = max_height;
 
-                    bb.x1,
-                    max_height,
-                    bb.z1
-                );
+                bb.write_bounds();
 
             }
 
@@ -175,8 +180,6 @@ class TerrainTileManager {
     initialize() {
         this.destroyTiles();
 
-        this.bvh.setNegativelyInfiniteBounds();
-
         this.initializeTiles();
     }
 
@@ -224,6 +227,7 @@ class TerrainTileManager {
         for (let i = 0; i < tile_count; i++) {
             const tile = tiles[i];
 
+            tile.external_bvh.unlink();
             tile.dispose();
 
         }
@@ -231,8 +235,7 @@ class TerrainTileManager {
         tiles.splice(0, tile_count);
 
         //clear out BVH
-        this.bvh.right = null;
-        this.bvh.left = null;
+        this.bvh.release_all();
 
     }
 
@@ -252,19 +255,27 @@ class TerrainTileManager {
      * @param {number} u1
      * @param {number} v1
      */
-    rebuildTilesByUV(u0, v0, u1, v1) {
+    rebuildTilesByUV(
+        u0, v0,
+        u1, v1
+    ) {
+
+        const size = this.totalSize;
 
-        const tx0 = u0 * this.totalSize.x;
-        const tx1 = u1 * this.totalSize.x;
+        const tx0 = u0 * size.x;
+        const tx1 = u1 * size.x;
 
-        const ty0 = v0 * this.totalSize.y;
-        const ty1 = v1 * this.totalSize.y;
+        const ty0 = v0 * size.y;
+        const ty1 = v1 * size.y;
 
-        const dirtyTiles = this.getRawTilesOverlappingRectangle(tx0 - 1, ty0 - 1, tx1 + 1, ty1 + 1);
+        const dirty_tiles = this.getRawTilesOverlappingRectangle(tx0 - 1, ty0 - 1, tx1 + 1, ty1 + 1);
 
-        dirtyTiles.forEach(tile => {
+        const dirty_count = dirty_tiles.length;
+
+        for (let i = 0; i < dirty_count; i++) {
+            const tile = dirty_tiles[i];
             tile.isBuilt = false;
-        });
+        }
     }
 
 
@@ -310,11 +321,14 @@ class TerrainTileManager {
 
     initializeTiles() {
 
-        const gridSize = this.totalSize.clone();
-        gridSize.divide(this.tileSize);
-        gridSize.ceil();
+        const total_size = this.totalSize;
 
-        const tileCount = gridSize.x * gridSize.y;
+        const gridSize = total_size.clone();
+
+        const time_size = this.tileSize;
+
+        gridSize.divide(time_size);
+        gridSize.ceil();
 
         const tiles = this.tiles;
 
@@ -328,19 +342,23 @@ class TerrainTileManager {
 
         //populate tiles
         for (let y = 0; y < gridSize.y; y++) {
-            const tY = y < gridSize.y - 1 ? this.tileSize.y : (this.totalSize.y - this.tileSize.y * y);
+
+            const tY = y < gridSize.y - 1 ? time_size.y : (total_size.y - time_size.y * y);
+
             for (let x = 0; x < gridSize.x; x++) {
-                const tX = x < gridSize.x - 1 ? this.tileSize.x : (this.totalSize.x - this.tileSize.x * x);
+
+                const tX = x < gridSize.x - 1 ? time_size.x : (total_size.x - time_size.x * x);
 
                 const tile = new TerrainTile();
-                tiles[y * gridSize.x + x] = tile;
+                const index = y * gridSize.x + x;
+                tiles[index] = tile;
 
                 this.assignTileMaterial(tile);
 
                 tile.gridPosition.set(x, y);
 
                 tile.size.set(tX, tY);
-                tile.position.set(this.tileSize.x * x, this.tileSize.y * y);
+                tile.position.set(time_size.x * x, time_size.y * y);
                 tile.scale.copy(this.scale);
                 tile.resolution.copy(this.resolution);
 
@@ -349,12 +367,11 @@ class TerrainTileManager {
 
                 //hook for building
                 tile.ensureBuilt = ensureBuilt(x, y);
+
+                tile.external_bvh.link(this.bvh, index);
             }
         }
 
-        this.bvh.insertManyBoxes2(function (index) {
-            return tiles[index].boundingBox;
-        }, tileCount);
     }
 
     /**
@@ -395,9 +412,7 @@ class TerrainTileManager {
         assert.ok(tileIndex >= 0, `tileIndex(=${tileIndex}) must be >= 0`);
         assert.ok(tileIndex <= this.tiles.length, `tileIndex(=${tileIndex}) must be <= tileCount(=${this.tiles.length})`);
 
-        const tile = this.tiles[tileIndex];
-
-        return tile;
+        return this.tiles[tileIndex];
     }
 
     /**
@@ -456,22 +471,6 @@ class TerrainTileManager {
         return this.obtain(tile.gridPosition.x, tile.gridPosition.y);
     }
 
-    /**
-     * @deprecated use {@link #obtain instead}
-     * @param {number} x
-     * @param {number} y
-     * @param {function(TerrainTile):*} callback
-     */
-    processTile(x, y, callback) {
-        const tile = this.getRaw(x, y);
-
-        if (tile.isBuilt) {
-            callback(tile);
-        } else {
-            tile.onBuilt.addOne(callback);
-        }
-    }
-
     /**
      *
      * @param {number} x coordinate
@@ -601,26 +600,49 @@ class TerrainTileManager {
         directionZ
     ) {
 
-        // console.log('+ raycastFirstSync');
-        raycastBVHVisitor.collector = firstRayIntersectionTerrainBVHVisitor;
-        raycastBVHVisitor.setOrigin(originX, originY, originZ);
-        raycastBVHVisitor.setDirection(directionX, directionY, directionZ);
+        const hit_count = bvh_query_leaves_ray(
+            this.bvh,
+            this.bvh.root,
+            scratch_array, 0,
+            originX, originY, originZ,
+            directionX, directionY, directionZ
+        );
+
+        let closest_hit_distance = Number.POSITIVE_INFINITY;
+        let hit_found = false;
+
+        for (let i = 0; i < hit_count; i++) {
+            const node_id = scratch_array[i];
+
+            const tile_index = this.bvh.node_get_user_data(node_id);
+
+            const tile = this.tiles[tile_index];
 
-        firstRayIntersectionTerrainBVHVisitor.initialize();
-        firstRayIntersectionTerrainBVHVisitor.setOrigin(originX, originY, originZ);
-        firstRayIntersectionTerrainBVHVisitor.setDirection(directionX, directionY, directionZ);
+            if(!tile.isBuilt){
+                continue;
+            }
+
+            const tile_hit_found = tile.raycastFirstSync(
+                scratch_contact,
+                originX, originY, originZ,
+                directionX, directionY, directionZ
+            );
 
-        traverseBinaryNodeUsingVisitor(this.bvh, raycastBVHVisitor);
+            if (!tile_hit_found) {
+                continue;
+            }
 
-        // console.log('- raycastFirstSync');
+            hit_found = true;
 
-        if (firstRayIntersectionTerrainBVHVisitor.closestDistance !== Number.POSITIVE_INFINITY) {
-            result.copy(firstRayIntersectionTerrainBVHVisitor.closest);
+            const distance_sqr = scratch_contact.position._distanceSqrTo(originX, originY, originZ);
 
-            return true;
+            if (distance_sqr < closest_hit_distance) {
+                closest_hit_distance = distance_sqr;
+                result.copy(scratch_contact);
+            }
         }
 
-        return false;
+        return hit_found;
     }
 
     /**
@@ -649,10 +671,6 @@ class TerrainTileManager {
         assert.typeOf(resolve, 'function', 'resolve');
         assert.typeOf(reject, 'function', 'reject');
 
-        const processName = 'building tile x = ' + x + ", y = " + y;
-        const self = this;
-
-
         const tileIndex = this.computeTileIndex(x, y);
         const tile = this.tiles[tileIndex];
 
@@ -665,12 +683,12 @@ class TerrainTileManager {
             tile.position.toJSON(),
             tile.size.toJSON(),
             tile.scale.toJSON(),
-            self.totalSize.toJSON(),
+            this.totalSize.toJSON(),
             tile_resolution
-        ).then(function (tileData) {
+        ).then((tileData) => {
 
             //check that the tile under index is still the same tile
-            if (self.tiles[tileIndex] !== tile) {
+            if (this.tiles[tileIndex] !== tile) {
                 //the original tile was destroyed
                 reject('Original tile was destroyed during build process');
                 return;
@@ -681,16 +699,17 @@ class TerrainTileManager {
                 return;
             }
 
+            // const processName = 'building tile x = ' + x + ", y = " + y;
             // console.time(processName);
 
             tile.build(tileData);
 
             assert.equal(tile.resolution.getValue(), tile_resolution, 'tile resolution has changed');
 
-            self.stitchTile(x, y, tile);
+            this.stitchTile(x, y, tile);
 
             //refit the bvh
-            tile.boundingBox.parentNode.bubbleRefit();
+            tile.external_bvh.write_bounds();
 
             tile.isBuilt = true;
             tile.isBuildInProgress = false;
@@ -700,13 +719,10 @@ class TerrainTileManager {
 
             // console.timeEnd(processName);
 
-            self.on.tileBuilt.send1(tile);
+            this.on.tileBuilt.send1(tile);
         }, reject);
     }
 }
 
-const raycastBVHVisitor = new RaycastBVHVisitor();
-const firstRayIntersectionTerrainBVHVisitor = new FirstRayIntersectionTerrainBVHVisitor();
-
 export default TerrainTileManager;
 

package/src/engine/ecs/terrain/tiles/TileBuildWorker.js

@@ -2,16 +2,27 @@
  * Created by Alex on 29/05/2016.
  */
 
-import * as BinaryBVHFromBufferGeometry from '../../../graphics/geometry/bvh/buffered/BinaryBVHFromBufferGeometry.js';
+import { BinaryUint32BVH } from "../../../../core/bvh2/binary/2/BinaryUint32BVH.js";
+import { bvh32_from_indexed_geometry } from "../../../graphics/geometry/bvh/buffered/bvh32_from_indexed_geometry.js";
 import { Sampler2D } from '../../../graphics/texture/sampler/Sampler2D.js';
+import { sampler2d_channel_compute_max } from "../../../graphics/texture/sampler/sampler2d_channel_compute_max.js";
+import { sampler2d_channel_compute_min } from "../../../graphics/texture/sampler/sampler2d_channel_compute_min.js";
 import BufferedGeometryArraysBuilder from '../BufferedGeometryArraysBuilder.js';
 import { tensionOptimizeUV } from "../util/tensionOptimizeUV.js";
-import { sampler2d_channel_compute_min } from "../../../graphics/texture/sampler/sampler2d_channel_compute_min.js";
-import { sampler2d_channel_compute_max } from "../../../graphics/texture/sampler/sampler2d_channel_compute_max.js";
-
 
 self.Lib = {
-    BinaryBVHFromBufferGeometry,
+    /**
+     *
+     * @param {Float32Array} vertices
+     * @param {Uint32Array} indices
+     * @returns {BinaryUint32BVH}
+     */
+    build_bvh(vertices, indices) {
+        const bvh = new BinaryUint32BVH();
+        bvh32_from_indexed_geometry(bvh, vertices, indices);
+
+        return bvh;
+    },
     Sampler2D,
     BufferedGeometryArraysBuilder,
     tensionOptimizeUV,

package/src/engine/graphics/camera/testClippingPlaneComputation.js

@@ -2,9 +2,6 @@ import { Frustum, OrthographicCamera } from "three";
 import FacingDirectionSystem from "../../../../../model/game/ecs/system/FacingDirectionSystem.js";
 import { makeEngineOptionsModel } from "../../../../../model/game/options/makeEngineOptionsModel.js";
 import { enableEditor } from "../../../../editor/enableEditor.js";
-import {
-    ThreeClippingPlaneComputingBVHVisitor
-} from "../../../core/bvh2/traversal/ThreeClippingPlaneComputingBVHVisitor.js";
 import { RingBuffer } from "../../../core/collection/RingBuffer.js";
 import { convex_hull_jarvis_2d } from "../../../core/geom/2d/convex-hull/convex_hull_jarvis_2d.js";
 import Vector2 from "../../../core/geom/Vector2.js";
@@ -20,9 +17,9 @@ import HeadsUpDisplaySystem from "../../ecs/gui/hud/HeadsUpDisplaySystem.js";
 import ViewportPosition from "../../ecs/gui/position/ViewportPosition.js";
 import ViewportPositionSystem from "../../ecs/gui/position/ViewportPositionSystem.js";
 import { InverseKinematicsSystem } from "../../ecs/ik/InverseKinematicsSystem.js";
+import RenderSystem from "../../ecs/renderable/RenderSystem.js";
 import AnimationSystem from "../../ecs/systems/AnimationSystem.js";
 import MotionSystem from "../../ecs/systems/MotionSystem.js";
-import RenderSystem from "../../ecs/systems/RenderSystem.js";
 import ScriptSystem from "../../ecs/systems/ScriptSystem.js";
 import SteeringSystem from "../../ecs/systems/SteeringSystem.js";
 import TagSystem from "../../ecs/systems/TagSystem.js";
@@ -292,7 +289,7 @@ function makeCameraClippingDebug(engine) {
     const buffer = new RingBuffer(100);
 
     engine.graphics.on.postRender.add(() => {
-        buffer.push(ThreeClippingPlaneComputingBVHVisitor.VISIT_COUNT_LEAF);
+        // buffer.push(ThreeClippingPlaneComputingBVHVisitor.VISIT_COUNT_LEAF);
 
         ctx.clearRect(0, 0, canvasView.size.x, canvasView.size.y);
 
@@ -327,7 +324,7 @@ function makeCameraClippingDebug(engine) {
 
         special_hits_2.splice(0, special_hits_2.length);
 
-        ThreeClippingPlaneComputingBVHVisitor.VISIT_COUNT_LEAF = 0;
+        // ThreeClippingPlaneComputingBVHVisitor.VISIT_COUNT_LEAF = 0;
     });
 
     setInterval(() => {

package/src/engine/graphics/debug/VisualSymbolLine.js

@@ -94,6 +94,7 @@ export class VisualSymbolLine {
         const bb = renderable.boundingBox;
 
         bb.setBoundsUnordered(a_x, a_y, a_z, b_x, b_y, b_z);
+
         renderable.bvh.resize(bb.x0, bb.y0, bb.z0, bb.x1, bb.y1, bb.z1);
     }
 

package/src/engine/graphics/ecs/camera/CameraSystem.js

@@ -3,20 +3,20 @@
  */
 
 
-import { System } from '../../../ecs/System.js';
-import { Camera } from './Camera.js';
-import { Transform } from '../../../ecs/transform/Transform.js';
 import { Frustum as ThreeFrustum, } from 'three';
 import { assert } from "../../../../core/assert.js";
 import { SignalBinding } from "../../../../core/events/signal/SignalBinding.js";
-import { set_camera_aspect_ratio } from "./set_camera_aspect_ratio.js";
-import { build_three_camera_object } from "./build_three_camera_object.js";
-import { update_camera_transform } from "./update_camera_transform.js";
+import { ResourceAccessKind } from "../../../../core/model/ResourceAccessKind.js";
+import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";
+import { System } from '../../../ecs/System.js';
+import { Transform } from '../../../ecs/transform/Transform.js';
 import { auto_set_camera_clipping_planes } from "./auto_set_camera_clipping_planes.js";
+import { build_three_camera_object } from "./build_three_camera_object.js";
+import { Camera } from './Camera.js';
 import { frustum_from_camera } from "./frustum_from_camera.js";
 import { invertQuaternionOrientation } from "./InvertQuaternionOrientation.js";
-import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";
-import { ResourceAccessKind } from "../../../../core/model/ResourceAccessKind.js";
+import { set_camera_aspect_ratio } from "./set_camera_aspect_ratio.js";
+import { update_camera_transform } from "./update_camera_transform.js";
 
 export class CameraSystem extends System {
     /**
@@ -32,7 +32,7 @@ export class CameraSystem extends System {
         this.dependencies = [Camera, Transform];
 
         this.components_used = [
-            ResourceAccessSpecification.from(Camera,ResourceAccessKind.Write)
+            ResourceAccessSpecification.from(Camera, ResourceAccessKind.Write)
         ];
 
         /**

package/src/engine/graphics/ecs/camera/auto_set_camera_clipping_planes.js

@@ -1,32 +1,12 @@
-import { CameraClippingPlaneComputer } from "./CameraClippingPlaneComputer.js";
-
-const cameraClippingPlaneComputer = new CameraClippingPlaneComputer();
-
 /**
  *
  * @param {Camera} c
  * @param {RenderLayerManager} layers
  */
 export function auto_set_camera_clipping_planes(c, layers) {
-    const camera = c.object;
-
-    /**
-     *
-     * @type {number}
-     */
-    const hysteresis = c.autoClipHysteresis;
-
-    cameraClippingPlaneComputer.hysteresis = hysteresis;
-    cameraClippingPlaneComputer.camera = camera;
-    cameraClippingPlaneComputer.layers = layers;
-
-    cameraClippingPlaneComputer.compute();
-
-    if (camera.near !== cameraClippingPlaneComputer.near || camera.far !== cameraClippingPlaneComputer.far) {
-        camera.near = cameraClippingPlaneComputer.near;
-        camera.far = cameraClippingPlaneComputer.far;
+    // TODO implement
 
-        camera.updateProjectionMatrix();
-    }
+    c.object.far = c.clip_far;
+    c.object.near = c.clip_near;
 
 }