@woosh/meep-engine 2.119.89 → 2.119.90

package/package.json

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

package/src/core/geom/3d/shape/TransformedShape3D.d.ts

@@ -7,4 +7,6 @@ export class TransformedShape3D extends AbstractShape3D {
     static from_translation_scale(subject: AbstractShape3D, translation: ArrayLike<number>, scale: ArrayLike<number>): TransformedShape3D
 
     static from_scale(subject: AbstractShape3D, scale: ArrayLike<number>): TransformedShape3D
+
+    static from_translation(subject: AbstractShape3D, translation: ArrayLike<number>): TransformedShape3D
 }

package/src/core/geom/3d/shape/TransformedShape3D.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TransformedShape3D.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/3d/shape/TransformedShape3D.js"],"names":[],"mappings":";AAgBA;IAkCI;;;;;OAKG;IACH,wBAHW,eAAe,MADf,MAAM,EAAE,GAAC,YAAY,GAAC,IAAI,GAExB,kBAAkB,CAS9B;IAED;;;;;OAKG;IACH,uCAJW,eAAe,eACf,MAAM,EAAE,SACR,MAAM,EAAE,sBAalB;IAED;;;;OAIG;IACH,iCAHW,eAAe,eACf,MAAM,EAAE,sBAIlB;IAED;;;;;OAKG;IACH,2BAHW,eAAe,SACf,MAAM,EAAE,GAAC,YAAY,GAAC,IAAI,GAFxB,kBAAkB,CAS9B;IApFG;;;;OAIG;IACH,iBAAoC;IAEpC;;;;OAIG;IACH,yBAA4C;IAE5C;;;;OAIG;IACH,kBAAqB;IAGzB;;;OAGG;IACH,+BAEC;IA0DD;;;OAGG;IACH,4CAIC;IAED,yCAEC;IAED,qBAMC;IAED,wCAKC;IAED,mEAgDC;IAED,6CAEC;IAED,gCAKC;IAED,kFAIC;IAED,qGAMC;IAED;;;;OAIG;IACH,cAHW,kBAAkB,GAChB,OAAO,CAOnB;IAED,eAGC;CACJ;;8BAIS,OAAO;;gCA9Ne,sBAAsB;qBAR3B,WAAW;qBAAX,WAAW"}
+{"version":3,"file":"TransformedShape3D.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/3d/shape/TransformedShape3D.js"],"names":[],"mappings":"AAkBA;IAkCI;;;;;OAKG;IACH,wBAHW,eAAe,MADf,MAAM,EAAE,GAAC,YAAY,OAAK,GAExB,kBAAkB,CAS9B;IAED;;;;;OAKG;IACH,uCAJW,eAAe,eACf,MAAM,EAAE,SACR,MAAM,EAAE,sBAclB;IAED;;;;OAIG;IACH,iCAHW,eAAe,eACf,MAAM,EAAE,sBAIlB;IAED;;;;;OAKG;IACH,2BAHW,eAAe,SACf,MAAM,EAAE,GAAC,YAAY,OAAK,GAFxB,kBAAkB,CAW9B;IAvFG;;;;OAIG;IACH,iBAAoC;IAEpC;;;;OAIG;IACH,yBAA4C;IAE5C;;;;OAIG;IACH,kBAAqB;IAGzB;;;OAGG;IACH,+BAEC;IA6DD;;;OAGG;IACH,4CAIC;IAED,yCAEC;IAED,qBAMC;IAED,wCAKC;IAED,mEAgDC;IAED,6CAEC;IAED,gCAKC;IAED,kFAIC;IAED,qGAMC;IAED;;;;OAIG;IACH,cAHW,kBAAkB,GAChB,OAAO,CAOnB;IAED,eAGC;CACJ;;8BAIS,OAAO;;gCAjOe,sBAAsB"}

package/src/core/geom/3d/shape/TransformedShape3D.js

@@ -1,4 +1,4 @@
-import { mat4, vec3 } from "gl-matrix";
+import { Transform } from "../../../../engine/ecs/transform/Transform.js";
 import { assert } from "../../../assert.js";
 import { isArrayEqualStrict } from "../../../collection/array/isArrayEqualStrict.js";
 import { computeHashFloatArray } from "../../../math/hash/computeHashFloatArray.js";
@@ -6,6 +6,8 @@ import { sign } from "../../../math/sign.js";
 import { v3_length } from "../../vec3/v3_length.js";
 import { v3_matrix4_multiply } from "../../vec3/v3_matrix4_multiply.js";
 import { aabb3_matrix4_project } from "../aabb/aabb3_matrix4_project.js";
+import { m4_extract_scale } from "../m4_extract_scale.js";
+import { m4_invert } from "../mat4/m4_invert.js";
 import { AbstractShape3D } from "./AbstractShape3D.js";
 
 /**
@@ -71,15 +73,16 @@ export class TransformedShape3D extends AbstractShape3D {
      */
     static from_translation_scale(subject, translation, scale) {
 
-        assert.isArrayLike(translation,'translation');
-        assert.greaterThanOrEqual(translation.length,3,'translation length must be >= 3');
-        assert.isArrayLike(scale,'scale');
-        assert.greaterThanOrEqual(scale.length,3,'scale length must be >= 3');
+        assert.isArrayLike(translation, 'translation');
+        assert.greaterThanOrEqual(translation.length, 3, 'translation length must be >= 3');
+        assert.isArrayLike(scale, 'scale');
+        assert.greaterThanOrEqual(scale.length, 3, 'scale length must be >= 3');
 
-        const mat = mat4.create();
-        mat4.fromRotationTranslationScale(mat, [0, 0, 0, 1], translation, scale);
+        const t = new Transform();
+        t.scale.fromArray(scale);
+        t.position.fromArray(translation);
 
-        return TransformedShape3D.from_m4(subject, mat);
+        return TransformedShape3D.from_m4(subject, t.matrix);
     }
 
     /**
@@ -98,10 +101,12 @@ export class TransformedShape3D extends AbstractShape3D {
      * @param {number[]|Float32Array|vec3} scale
      */
     static from_scale(subject, scale) {
-        const mat = mat4.create();
-        mat4.fromScaling(mat, scale);
 
-        return TransformedShape3D.from_m4(subject, mat);
+        const t = new Transform();
+        t.scale.fromArray(scale);
+
+
+        return TransformedShape3D.from_m4(subject, t.matrix);
     }
 
     /**
@@ -111,7 +116,7 @@ export class TransformedShape3D extends AbstractShape3D {
     set transform(m) {
         this.__matrix.set(m);
 
-        mat4.invert(this.__inverse_matrix, this.__matrix);
+        m4_invert(this.__inverse_matrix, this.__matrix);
     }
 
     get transform() {
@@ -119,7 +124,7 @@ export class TransformedShape3D extends AbstractShape3D {
     }
 
     get volume() {
-        mat4.getScaling(scratch_v3_0, this.__matrix);
+        m4_extract_scale(scratch_v3_0, 0, this.__matrix);
 
         const scale_modifier = scratch_v3_0[0] * scratch_v3_0[1] * scratch_v3_0[2];
 
@@ -189,7 +194,7 @@ export class TransformedShape3D extends AbstractShape3D {
 
     contains_point(point) {
         // transform point to subject's local space
-        vec3.transformMat4(scratch_v3_0, point, this.__inverse_matrix);
+        v3_matrix4_multiply(scratch_v3_0, 0, point, 0, this.__inverse_matrix);
 
         return this.__subject.contains_point(scratch_v3_0);
     }