@woosh/meep-engine 2.134.4 → 2.135.0

package/src/engine/ecs/fow/shader/FogOfWarRenderer.js

@@ -1,145 +1,145 @@
-import { Mesh, OrthographicCamera, Scene } from "three";
-import { assert } from "../../../../core/assert.js";
-import { isValueBetweenInclusive } from "../../../../core/math/interval/isValueBetweenInclusive.js";
-import { FULL_SCREEN_TRIANGLE_GEOMETRY } from "../../../graphics/geometry/FULL_SCREEN_TRIANGLE_GEOMETRY.js";
-import { buildScreenSpaceFogOfWarShader } from "./screenSpaceFogOfWarShader.js";
-
-/**
- *
- * @param {FogOfWar} fow
- * @param {function(number, number, number, number)} callback
- */
-export function computeUvTransformFromFogOfWar(fow, callback) {
-
-    const sampler = fow.sampler;
-
-    const samplerWidth = sampler.width;
-    const samplerHeight = sampler.height;
-
-
-    const scaleX = (fow.scale * fow.size.x) * (samplerWidth / (samplerWidth - 3));
-    const scaleY = (fow.scale * fow.size.y) * (samplerHeight / (samplerHeight - 3));
-
-    const offsetX = 1.5 / samplerWidth;
-    const offsetY = 1.5 / samplerHeight;
-
-    callback(offsetX, offsetY, 1 / scaleX, 1 / scaleY);
-}
-
-export class FogOfWarRenderer {
-    constructor() {
-        /**
-         *
-         * @type {ShaderMaterial}
-         */
-        this.material = buildScreenSpaceFogOfWarShader();
-
-        this.quad = new Mesh(FULL_SCREEN_TRIANGLE_GEOMETRY, this.material);
-
-        this.camera = new OrthographicCamera(-1, 1, 1, -1, 0, 1);
-        this.scene = new Scene();
-        this.scene.add(this.quad);
-    }
-
-    /**
-     *
-     * @param {FogOfWar} fow
-     */
-    setUvTransformFromFog(fow) {
-        computeUvTransformFromFogOfWar(fow, (offsetX, offsetY, scaleX, scaleY) => {
-
-            this.setUvTransform(offsetX, offsetY, scaleX, scaleY);
-        });
-    }
-
-    /**
-     *
-     * @param {number} offsetX UV u offset, between 0 and 1
-     * @param {number} offsetY UV v offset, between 0 and 1
-     * @param {number} scaleX Transform scale from world coordinate position to UV u coordinate, minus offsetX
-     * @param {number} scaleY Transform scale from world coordinate position to UV v coordinate, minus offsetY
-     */
-    setUvTransform(offsetX, offsetY, scaleX, scaleY) {
-        assert.isNumber(offsetX, 'offsetX');
-        assert.notNaN(offsetX, 'offsetX');
-        assert.ok(isValueBetweenInclusive(offsetX, 0, 1), `expected offsetX to be between 0 and 1, instead was '${offsetX}'`);
-
-        assert.isNumber(offsetY,  'offsetY');
-        assert.notNaN(offsetY, 'offsetY');
-        assert.ok(isValueBetweenInclusive(offsetY, 0, 1), `expected offsetY to be between 0 and 1, instead was '${offsetY}'`);
-
-
-        assert.isNumber(scaleX,  'scaleX');
-        assert.notNaN(scaleX, 'scaleX');
-        assert.isFiniteNumber(scaleX, 'scaleX');
-
-        assert.isNumber(scaleY, 'scaleY');
-        assert.notNaN(scaleY, 'scaleY');
-        assert.isFiniteNumber(scaleY, 'scaleY');
-
-        this.material.uniforms.uFogUvTransform.value.set(offsetX, offsetY, scaleX, scaleY);
-    }
-
-    /**
-     *
-     * @param {Texture} texture
-     */
-    setDepthBuffer(texture) {
-        // assert.equal(texture.type, UnsignedShortType, `expected texture type to be UnsignedShort(=${UnsignedShortType}), instead got something else (=${texture.type})`)
-
-        this.material.uniforms.tDepth.value = texture;
-    }
-
-    /**
-     *
-     * @param {Texture} buffer
-     */
-    setFogBuffer(buffer) {
-        this.material.uniforms.tFog.value = buffer;
-
-    }
-
-    /**
-     * Resolution of the fog texture
-     * @param {number} x
-     * @param {number} y
-     */
-    setResolution(x, y) {
-        this.material.uniforms.uResolution.value.set(x, y);
-    }
-
-    /**
-     *
-     * @param {Vector4} color
-     */
-    setFogColor(color) {
-        this.material.uniforms.uColor.value.copy(color);
-    }
-
-    /**
-     *
-     * @param {WebGLRenderer} renderer
-     * @param {PerspectiveCamera|OrthographicCamera} camera
-     * @param {Scene} scene
-     * @param {WebGLRenderTarget} target
-     */
-    render(renderer, camera, scene, target) {
-        assert.ok(camera.isCamera, 'Not a camera');
-        assert.ok(camera.isPerspectiveCamera || camera.isOrthographicCamera, 'Unsupported Camera type. Expected PerspectiveCamera or OrthographicCamera');
-
-
-        //set up uniforms
-        const uniforms = this.material.uniforms;
-
-        uniforms.uProjectionInverse.value.copy(camera.projectionMatrixInverse);
-        uniforms.uViewInverse.value.copy(camera.matrixWorld);
-
-        renderer.setRenderTarget(target);
-        renderer.clearColor();
-
-        renderer.render(this.scene, this.camera);
-
-
-        renderer.setRenderTarget(null);
-    }
-}
+import { Mesh, OrthographicCamera, Scene } from "three";
+import { assert } from "../../../../core/assert.js";
+import { isValueBetweenInclusive } from "../../../../core/math/interval/isValueBetweenInclusive.js";
+import { FULL_SCREEN_TRIANGLE_GEOMETRY } from "../../../graphics/geometry/FULL_SCREEN_TRIANGLE_GEOMETRY.js";
+import { buildScreenSpaceFogOfWarShader } from "./screenSpaceFogOfWarShader.js";
+
+/**
+ *
+ * @param {FogOfWar} fow
+ * @param {function(number, number, number, number)} callback
+ */
+export function computeUvTransformFromFogOfWar(fow, callback) {
+
+    const sampler = fow.sampler;
+
+    const samplerWidth = sampler.width;
+    const samplerHeight = sampler.height;
+
+
+    const scaleX = (fow.scale * fow.size.x) * (samplerWidth / (samplerWidth - 3));
+    const scaleY = (fow.scale * fow.size.y) * (samplerHeight / (samplerHeight - 3));
+
+    const offsetX = 1.5 / samplerWidth;
+    const offsetY = 1.5 / samplerHeight;
+
+    callback(offsetX, offsetY, 1 / scaleX, 1 / scaleY);
+}
+
+export class FogOfWarRenderer {
+    constructor() {
+        /**
+         *
+         * @type {ShaderMaterial}
+         */
+        this.material = buildScreenSpaceFogOfWarShader();
+
+        this.quad = new Mesh(FULL_SCREEN_TRIANGLE_GEOMETRY, this.material);
+
+        this.camera = new OrthographicCamera(-1, 1, 1, -1, 0, 1);
+        this.scene = new Scene();
+        this.scene.add(this.quad);
+    }
+
+    /**
+     *
+     * @param {FogOfWar} fow
+     */
+    setUvTransformFromFog(fow) {
+        computeUvTransformFromFogOfWar(fow, (offsetX, offsetY, scaleX, scaleY) => {
+
+            this.setUvTransform(offsetX, offsetY, scaleX, scaleY);
+        });
+    }
+
+    /**
+     *
+     * @param {number} offsetX UV u offset, between 0 and 1
+     * @param {number} offsetY UV v offset, between 0 and 1
+     * @param {number} scaleX Transform scale from world coordinate position to UV u coordinate, minus offsetX
+     * @param {number} scaleY Transform scale from world coordinate position to UV v coordinate, minus offsetY
+     */
+    setUvTransform(offsetX, offsetY, scaleX, scaleY) {
+        assert.isNumber(offsetX, 'offsetX');
+        assert.notNaN(offsetX, 'offsetX');
+        assert.ok(isValueBetweenInclusive(offsetX, 0, 1), `expected offsetX to be between 0 and 1, instead was '${offsetX}'`);
+
+        assert.isNumber(offsetY,  'offsetY');
+        assert.notNaN(offsetY, 'offsetY');
+        assert.ok(isValueBetweenInclusive(offsetY, 0, 1), `expected offsetY to be between 0 and 1, instead was '${offsetY}'`);
+
+
+        assert.isNumber(scaleX,  'scaleX');
+        assert.notNaN(scaleX, 'scaleX');
+        assert.isFinite(scaleX, 'scaleX');
+
+        assert.isNumber(scaleY, 'scaleY');
+        assert.notNaN(scaleY, 'scaleY');
+        assert.isFinite(scaleY, 'scaleY');
+
+        this.material.uniforms.uFogUvTransform.value.set(offsetX, offsetY, scaleX, scaleY);
+    }
+
+    /**
+     *
+     * @param {Texture} texture
+     */
+    setDepthBuffer(texture) {
+        // assert.equal(texture.type, UnsignedShortType, `expected texture type to be UnsignedShort(=${UnsignedShortType}), instead got something else (=${texture.type})`)
+
+        this.material.uniforms.tDepth.value = texture;
+    }
+
+    /**
+     *
+     * @param {Texture} buffer
+     */
+    setFogBuffer(buffer) {
+        this.material.uniforms.tFog.value = buffer;
+
+    }
+
+    /**
+     * Resolution of the fog texture
+     * @param {number} x
+     * @param {number} y
+     */
+    setResolution(x, y) {
+        this.material.uniforms.uResolution.value.set(x, y);
+    }
+
+    /**
+     *
+     * @param {Vector4} color
+     */
+    setFogColor(color) {
+        this.material.uniforms.uColor.value.copy(color);
+    }
+
+    /**
+     *
+     * @param {WebGLRenderer} renderer
+     * @param {PerspectiveCamera|OrthographicCamera} camera
+     * @param {Scene} scene
+     * @param {WebGLRenderTarget} target
+     */
+    render(renderer, camera, scene, target) {
+        assert.ok(camera.isCamera, 'Not a camera');
+        assert.ok(camera.isPerspectiveCamera || camera.isOrthographicCamera, 'Unsupported Camera type. Expected PerspectiveCamera or OrthographicCamera');
+
+
+        //set up uniforms
+        const uniforms = this.material.uniforms;
+
+        uniforms.uProjectionInverse.value.copy(camera.projectionMatrixInverse);
+        uniforms.uViewInverse.value.copy(camera.matrixWorld);
+
+        renderer.setRenderTarget(target);
+        renderer.clearColor();
+
+        renderer.render(this.scene, this.camera);
+
+
+        renderer.setRenderTarget(null);
+    }
+}

package/src/engine/ecs/gui/position/ViewportPositionSystem.js

@@ -217,7 +217,7 @@ function setElementPosition(view, bounds, viewportSize, vp) {
 
             stickFlag = true;
         } else if (bounds.x1 > stickyBounds.x1) {
-            x = stickyBounds.x1 - bounds.getWidth();
+            x = stickyBounds.x1 - bounds.width;
 
             stickFlag = true;
         } else {
@@ -229,7 +229,7 @@ function setElementPosition(view, bounds, viewportSize, vp) {
 
             stickFlag = true;
         } else if (bounds.y1 > stickyBounds.y1) {
-            y = stickyBounds.y1 - bounds.getHeight();
+            y = stickyBounds.y1 - bounds.height;
 
             stickFlag = true;
         } else {

package/src/engine/ecs/parent/entity_node_compute_bounding_box.js

@@ -14,7 +14,7 @@ export function entity_node_expand_bounding_box_to_fit(out, root) {
     if (sg !== null) {
         sg.getBoundingBox(scratch_aabb3);
 
-        out.expandToFit(scratch_aabb3);
+        out.union(scratch_aabb3);
     }
 
     const children = root.children;

package/src/engine/ecs/transform/Transform.d.ts

@@ -219,16 +219,6 @@ export class Transform {
      *  }
      */
     readonly isTransform: boolean;
-    /**
-     * @readonly
-     * @deprecated use {@link Transform.prototype.toMatrix} instead
-     */
-    readonly toMatrix4: (result?: number[] | Float32Array) => number[];
-    /**
-     * @readonly
-     * @deprecated use {@link Transform.prototype.fromMatrix} instead
-     */
-    readonly fromMatrix4: (matrix: mat4 | number[] | Float32Array) => this;
     #private;
 }
 export namespace Transform {

package/src/engine/ecs/transform/Transform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Transform.d.ts","sourceRoot":"","sources":["../../../../../src/engine/ecs/transform/Transform.js"],"names":[],"mappings":"AAsBA;;;;;;;;;;;GAWG;AACH;IAsRI;;;;OAIG;IACH,4BAFa,SAAS,CAQrB;IAED;;;;OAIG;IACH,uBAHW,MAAM,EAAE,GAAC,YAAY,GACnB,SAAS,CAQrB;IA0FD;;;;;OAKG;IACH,wCAJW,UAAU,gBACV,OAAO,wBAejB;IAxZD;;;OAGG;IACH,mBAHU,OAAO,CAGe;IAEhC;;;;;OAKG;IACH,mBAHU,UAAU,CAGkB;IAEtC;;;OAGG;IACH,gBAHU,OAAO,CAGY;IAE7B;;;;;;;;OAQG;IACH,iBAFU,YAAY,CAEC;IAEvB;;;;OAIG;IACH,OAFU,MAAM,CAEM;IAStB;;;;OAIG;IACH,uBAMC;IAED;;;OAGG;IACH,kBAMC;IAED;;;OAGG;IACH,qBAMC;IAED;;;;OAIG;IACH,kDAIC;IAED;;;;OAIG;IACH,oDAIC;IAYD;;;;OAIG;IACH,cAHW,MAAM,GAAC,cAAc,GACnB,IAAI,CAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM,GAAC,cAAc,GACnB,IAAI,CAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM,GAAC,cAAc,SACrB,OAAO,QAQjB;IAED;;;;OAIG;IACH,cAHW,MAAM,GAAC,cAAc,GACnB,OAAO,CAInB;IAED;;;;OAIG;IACH,qBAEC;IAED;;;;OAIG;IACH,eAHW,OAAO,OACP,OAAO,QAqBjB;IAED,0BAwBC;IAED;;;;;;;;;;;;;;;;;MAMC;IAED;;;;;OAKG;IACH,YAFW,SAAS,QAenB;IAED;;;OAGG;IACH,SAFa,SAAS,CAQrB;IAED;;;;OAIG;IACH,cAHW,SAAS,GACP,OAAO,CAMnB;IAED;;;OAGG;IACH,QAFa,MAAM,CAKlB;IA4BD;;;;;;OAMG;IACH,gBAHW,SAAS,GACP,IAAI,CAIhB;IAED;;;;;OAKG;IACH,sBAJW,SAAS,KACT,SAAS,GACP,IAAI,CAWhB;IAED;;;;OAIG;IACH,mBAHW,OAAK,MAAM,EAAE,GAAC,YAAY,GACxB,IAAI,CAmBhB;IAED;;;;OAIG;IACH,kBAHW,MAAM,EAAE,GAAC,YAAY,GACnB,MAAM,EAAE,CAOpB;IAED;;;;;OAKG;IACH,qBAEC;IAED;;;OAGG;IACH,cAFa,OAAO,CAMnB;IAED,mBAEC;IA6BL;;;;;;;;OAQG;IACH,sBANU,OAAO,CAMc;IAE/B;;;OAGG;IACH,8BA5Ee,MAAM,EAAE,GAAC,YAAY,KACnB,MAAM,EAAE,CA2EI;IAE7B;;;OAGG;IACH,+BA1Ge,OAAK,MAAM,EAAE,GAAC,YAAY,KACxB,IAAI,CAyGU;;CA7B9B;;kBAIS,MAAM;;oBA1bI,+BAA+B;uBAD5B,kCAAkC;+BAE1B,qBAAqB"}
+{"version":3,"file":"Transform.d.ts","sourceRoot":"","sources":["../../../../../src/engine/ecs/transform/Transform.js"],"names":[],"mappings":"AAsBA;;;;;;;;;;;GAWG;AACH;IAsRI;;;;OAIG;IACH,4BAFa,SAAS,CAQrB;IAED;;;;OAIG;IACH,uBAHW,MAAM,EAAE,GAAC,YAAY,GACnB,SAAS,CAQrB;IA0FD;;;;;OAKG;IACH,wCAJW,UAAU,gBACV,OAAO,wBAejB;IAxZD;;;OAGG;IACH,mBAHU,OAAO,CAGe;IAEhC;;;;;OAKG;IACH,mBAHU,UAAU,CAGkB;IAEtC;;;OAGG;IACH,gBAHU,OAAO,CAGY;IAE7B;;;;;;;;OAQG;IACH,iBAFU,YAAY,CAEC;IAEvB;;;;OAIG;IACH,OAFU,MAAM,CAEM;IAStB;;;;OAIG;IACH,uBAMC;IAED;;;OAGG;IACH,kBAMC;IAED;;;OAGG;IACH,qBAMC;IAED;;;;OAIG;IACH,kDAIC;IAED;;;;OAIG;IACH,oDAIC;IAYD;;;;OAIG;IACH,cAHW,MAAM,GAAC,cAAc,GACnB,IAAI,CAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM,GAAC,cAAc,GACnB,IAAI,CAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM,GAAC,cAAc,SACrB,OAAO,QAQjB;IAED;;;;OAIG;IACH,cAHW,MAAM,GAAC,cAAc,GACnB,OAAO,CAInB;IAED;;;;OAIG;IACH,qBAEC;IAED;;;;OAIG;IACH,eAHW,OAAO,OACP,OAAO,QAqBjB;IAED,0BAwBC;IAED;;;;;;;;;;;;;;;;;MAMC;IAED;;;;;OAKG;IACH,YAFW,SAAS,QAenB;IAED;;;OAGG;IACH,SAFa,SAAS,CAQrB;IAED;;;;OAIG;IACH,cAHW,SAAS,GACP,OAAO,CAMnB;IAED;;;OAGG;IACH,QAFa,MAAM,CAKlB;IA4BD;;;;;;OAMG;IACH,gBAHW,SAAS,GACP,IAAI,CAIhB;IAED;;;;;OAKG;IACH,sBAJW,SAAS,KACT,SAAS,GACP,IAAI,CAWhB;IAED;;;;OAIG;IACH,mBAHW,OAAK,MAAM,EAAE,GAAC,YAAY,GACxB,IAAI,CAmBhB;IAED;;;;OAIG;IACH,kBAHW,MAAM,EAAE,GAAC,YAAY,GACnB,MAAM,EAAE,CAOpB;IAED;;;;;OAKG;IACH,qBAEC;IAED;;;OAGG;IACH,cAFa,OAAO,CAMnB;IAED,mBAEC;IA6BL;;;;;;;;OAQG;IACH,sBANU,OAAO,CAMc;;CAjB9B;;kBAIS,MAAM;;oBA1bI,+BAA+B;uBAD5B,kCAAkC;+BAE1B,qBAAqB"}

package/src/engine/ecs/transform/Transform.js

@@ -462,17 +462,5 @@ Transform.typeName = "Transform";
  */
 Transform.prototype.isTransform = true;
 
-/**
- * @readonly
- * @deprecated use {@link Transform.prototype.toMatrix} instead
- */
-Transform.prototype.toMatrix4 = Transform.prototype.toMatrix
-
-/**
- * @readonly
- * @deprecated use {@link Transform.prototype.fromMatrix} instead
- */
-Transform.prototype.fromMatrix4 = Transform.prototype.fromMatrix
-