@woosh/meep-engine 2.43.14 → 2.43.16

package/core/geom/3d/SurfacePoint3.d.ts

@@ -4,8 +4,13 @@ import {Matrix4} from "three";
 export class SurfacePoint3 {
     normal: Vector3
     position: Vector3
+    index: number
 
     applyMatrix4_three(matrix4: Matrix4): void
 
+    applyMatrix4(m4: ArrayLike<number>): void
+
     copy(other: SurfacePoint3): void
+
+    clone(): SurfacePoint3
 }

package/core/geom/3d/SurfacePoint3.js

@@ -1,5 +1,6 @@
 import Vector3 from "../Vector3.js";
 import { v3_length } from "../v3_length.js";
+import { assert } from "../../assert.js";
 
 /**
  * Used for representing points on a 3D surface. Used for raycasting contacts
@@ -22,6 +23,9 @@ export class SurfacePoint3 {
      * @param {number[]|mat4|Float32Array} m
      */
     applyMatrix4(m) {
+        assert.defined(m, 'matrix');
+        assert.notNull(m, 'matrix');
+
         // transform position
         const p = this.position;
 

package/engine/ecs/terrain/tiles/TerrainTile.js

@@ -26,11 +26,13 @@ import Signal from "../../../../core/events/signal/Signal.js";
 import { mat4 } from "gl-matrix";
 import { AABB3 } from "../../../../core/bvh2/aabb3/AABB3.js";
 import { NumericInterval } from "../../../../core/math/interval/NumericInterval.js";
+import { array_copy } from "../../../../core/collection/array/copyArray.js";
 
 function extractFaceIndexFromLeaf(leaf) {
     return leaf;
 }
 
+
 class TerrainTile {
     /**
      * terrain tile is a part of a 2d array
@@ -143,8 +145,10 @@ class TerrainTile {
      * @param {number[]|Float32Array|mat4} m4
      */
     set transform(m4) {
-        mat4.copy(this.mesh.matrixWorld.elements, m4);
+        array_copy(m4, 0, this.mesh.matrixWorld.elements, 0, 16);
         this.computeBoundingBox();
+
+        array_copy(m4, 0, this.raycaster.transform, 0, 16);
     }
 
     /**
@@ -182,7 +186,10 @@ class TerrainTile {
      * @return {boolean}
      */
     raycastFirstSync(result, originX, originY, originZ, directionX, directionY, directionZ) {
-        return this.raycaster.raycast(result, originX, originY, originZ, directionX, directionY, directionZ);
+
+        const r = this.raycaster.raycast(result, originX, originY, originZ, directionX, directionY, directionZ);
+
+        return r;
     }
 
     getVertexNormal(index, result) {
@@ -212,7 +219,7 @@ class TerrainTile {
      * @param {TerrainTile|undefined} bottomLeft
      * @param {TerrainTile|undefined} bottomRight
      */
-    stitchNormals2(top, bottom, left, right, topLeft, topRight, bottomLeft, bottomRight) {
+    stitchNormals(top, bottom, left, right, topLeft, topRight, bottomLeft, bottomRight) {
 
 
         const v0 = new Vector3(),

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

@@ -516,6 +516,7 @@ class TerrainTileManager {
     }
 
     /**
+     * Fix normals along the seams of the tile
      *
      * @param {number} x
      * @param {number} y
@@ -556,7 +557,7 @@ class TerrainTileManager {
             right = self.getRaw(x + 1, y);
         }
 
-        tile.stitchNormals2(top, bottom, left, right, topLeft, topRight, bottomLeft, bottomRight);
+        tile.stitchNormals(top, bottom, left, right, topLeft, topRight, bottomLeft, bottomRight);
     }
 
     /**

package/engine/graphics/geometry/bvh/buffered/BVHGeometryRaycaster.js

@@ -5,6 +5,11 @@ import { rayTriangleIntersection } from "../../../../../core/geom/GeometryMath.j
 import { SurfacePoint3 } from "../../../../../core/geom/3d/SurfacePoint3.js";
 import { assert } from "../../../../../core/assert.js";
 import { v3_length } from "../../../../../core/geom/v3_length.js";
+import { ray3_array_apply_matrix4 } from "../../../../../core/geom/3d/ray/ray3_array_apply_matrix4.js";
+import { mat4 } from "gl-matrix";
+import { ray3_array_compose } from "../../../../../core/geom/3d/ray/ray3_array_compose.js";
+import { array_copy } from "../../../../../core/collection/array/copyArray.js";
+import { MATRIX_4_IDENTITY } from "../../../../../core/geom/3d/matrix/MATRIX_4_IDENTITY.js";
 
 const hit = new ThreeVector3();
 
@@ -12,6 +17,9 @@ const vA = new ThreeVector3(),
     vB = new ThreeVector3(),
     vC = new ThreeVector3();
 
+const ray_tmp = [];
+const m4_tmp = [];
+
 /**
  *
  * @param {number[]|Uint8Array|Uint16Array|Uint32Array} indices
@@ -119,6 +127,14 @@ export class BVHGeometryRaycaster {
         this.origin = new Vector3();
         this.direction = new Vector3();
 
+        /**
+         *
+         * @type {Float32Array}
+         */
+        this.transform = new Float32Array(16);
+
+        array_copy(MATRIX_4_IDENTITY, 0, this.transform, 0, 16);
+
         this.extractFaceIndexFromLeaf = extractFaceIndexFromLeaf_default;
     }
 
@@ -164,14 +180,36 @@ export class BVHGeometryRaycaster {
      * @param {number} directionZ
      * @returns {boolean}
      */
-    raycast(hit, originX, originY, originZ, directionX, directionY, directionZ) {
+    raycast(
+        hit,
+        originX, originY, originZ,
+        directionX, directionY, directionZ
+    ) {
 
-        this.origin.set(originX, originY, originZ);
-        this.direction.set(directionX, directionY, directionZ);
+        mat4.invert(m4_tmp, this.transform);
+
+        ray3_array_compose(
+            ray_tmp,
+            originX, originY, originZ,
+            directionX, directionY, directionZ
+        );
+
+        ray3_array_apply_matrix4(ray_tmp, ray_tmp, m4_tmp);
+
+        const _originX = ray_tmp[0];
+        const _originY = ray_tmp[1];
+        const _originZ = ray_tmp[2];
+
+        const _directionX = ray_tmp[3];
+        const _directionY = ray_tmp[4];
+        const _directionZ = ray_tmp[5];
+
+        this.origin.set(_originX, _originY, _originZ);
+        this.direction.set(_directionX, _directionY, _directionZ);
 
         this.__bestDistance = Number.POSITIVE_INFINITY;
 
-        this.bvh.traverseRayLeafIntersections(originX, originY, originZ, directionX, directionY, directionZ, this.visitLeafIntersection, this);
+        this.bvh.traverseRayLeafIntersections(_originX, _originY, _originZ, _directionX, _directionY, _directionZ, this.visitLeafIntersection, this);
 
         if (this.__bestDistance !== Number.POSITIVE_INFINITY) {
 
@@ -185,6 +223,8 @@ export class BVHGeometryRaycaster {
             hit.position.copy(this.__bestPosition);
             hit.normal.copy(vNormal);
 
+            hit.applyMatrix4(this.transform);
+
             return true;
         } else {
             //no hit

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