@woosh/meep-engine 2.60.0 → 2.61.0

package/src/engine/graphics/texture/sampler/resize/sampler2d_scale_down_linear.js

@@ -1,4 +1,4 @@
-import { assert } from "../../../../../core/assert.js";
+import {assert} from "../../../../../core/assert.js";
 
 /**
  *
@@ -37,38 +37,35 @@ export function sampler2d_scale_down_linear(input, output) {
     const input_data = input.data;
     const output_data = output.data;
 
-    let i, j, k;
-    let x, y;
-
-    for (y = 0; y < oH; y++) {
+    for (let y = 0; y < oH; y++) {
 
         const sampleOffsetY = y * sH;
 
         const row_address = y * oW * itemSize;
 
-        for (x = 0; x < oW; x++) {
+        for (let x = 0; x < oW; x++) {
 
             const output_texel_address = row_address + x * itemSize;
 
             const sampleOffsetX = x * sW;
 
             // accumulate sample
-            for (j = 0; j < sH; j++) {
+            for (let j = 0; j < sH; j++) {
                 const row_index = (sampleOffsetY + j) * iW;
                 const texel_offset = row_index + sampleOffsetX;
+                let input_texel_address = texel_offset * itemSize;
 
-                for (i = 0; i < sW; i++) {
-
-                    const iAddress = (texel_offset + i) * itemSize;
+                for (let i = sW; i > 0; i--) {
 
-                    for (k = 0; k < itemSize; k++) {
-                        sample[k] += input_data[k + iAddress];
+                    for (let k = 0; k < itemSize; k++) {
+                        sample[k] += input_data[k + input_texel_address];
                     }
 
+                    input_texel_address += itemSize;
                 }
             }
 
-            for (i = 0; i < itemSize; i++) {
+            for (let i = 0; i < itemSize; i++) {
                 // dilute the sample
                 output_data[output_texel_address + i] = sample[i] * sampleSizeInv;
                 //reset sample

package/src/engine/graphics/texture/virtual/VirtualTexture.spec.js

@@ -25,7 +25,7 @@ test("constructor doesn't throw", () => {
     new VirtualTexture(assetManager)
 });
 
-test("init computes sizes correctly", () => {
+test.skip("init computes sizes correctly", () => {
     const assetManager = mockAssetManager();
 
     const sut = new VirtualTexture(assetManager);

package/src/engine/plugin/EnginePluginManager.d.ts

@@ -1,11 +1,16 @@
+import {BaseProcess} from "../../core/process/BaseProcess";
 import {Reference} from "../reference/v2/Reference";
 
 interface Type<T> extends Function {
     new(...args: any[]): T;
 }
 
-export class EnginePluginManager {
+export class EnginePluginManager extends BaseProcess {
     acquire<T>(klass: Type<T>): Promise<Reference<T>>
 
     getPlugin<T>(klass: Type<T>): T | undefined
+
+    startup(): Promise<void>
+
+    shutdown(): Promise<void>
 }

package/src/engine/ecs/components/ClingToHeightMap.js

@@ -1,19 +0,0 @@
-/**
- * User: Alex Goldring
- * Date: 1/10/2014
- * Time: 21:29
- */
-import Vector3 from "../../../core/geom/Vector3.js";
-
-function ClingToHeightMap(options) {
-    if (options === void 0) {
-        options = {};
-    }
-    this.normalAlign = options.normalAlign !== void 0 ? options.normalAlign : false;
-    this.sampleCount = options.sampleCount !== void 0 ? options.sampleCount : 1;
-    this.samplingRadius = options.samplingRadius !== void 0 ? options.samplingRadius : 0;
-    const inf = Number.POSITIVE_INFINITY;
-    this.__prevPosition = new Vector3(inf, inf, inf);
-}
-
-export default ClingToHeightMap;

package/src/engine/ecs/components/SynchronizePosition.js

@@ -1,15 +0,0 @@
-/**
- * Created by Alex on 05/02/2015.
- */
-function SynchronizePosition(options) {
-    this.targetEntity = options.targetEntity;
-    this.x = options.x !== void 0 ? options.x : true;
-    this.y = options.y !== void 0 ? options.y : true;
-    this.z = options.z !== void 0 ? options.z : true;
-}
-
-SynchronizePosition.typeName = "SynchronizePosition";
-
-SynchronizePosition.serializable = false;
-
-export default SynchronizePosition;

package/src/engine/ecs/systems/ClingToHeightMapSystem.js

@@ -1,170 +0,0 @@
-/**
- * User: Alex Goldring
- * Date: 1/10/2014
- * Time: 21:32
- */
-import { System } from '../System.js';
-import ClingToHeightMap from '../components/ClingToHeightMap.js';
-import { Transform } from '../transform/Transform.js';
-import { Euler as ThreeEuler, Matrix4 as ThreeMatrix4, Vector2 as ThreeVector2, Vector3 as ThreeVector3 } from 'three';
-
-class ClingToHeightMapSystem extends System {
-    constructor(grid) {
-        super();
-
-        this.dependencies = [ClingToHeightMap];
-        //
-        this.entityManager = null;
-        this.grid = grid;
-        this.update = function () {
-            const uv = new ThreeVector2();
-            let u, v;
-            const euler = new ThreeEuler();
-            const normal = new ThreeVector3();
-            const m = new ThreeMatrix4();
-            const vUp = new ThreeVector3(0, 1, 0);
-            const vOrigin = new ThreeVector3();
-
-            function update(timeDelta) {
-                const entityManager = this.entityManager;
-                const terrain = this.terrain;
-                if (terrain === void 0) {
-                    return 0;
-                }
-                const grid = this.grid;
-                const heightSampler = terrain.samplerHeight;
-                const samplerNormal = terrain.samplerNormal;
-                entityManager.traverseEntities([ClingToHeightMap, Transform], function (clingon, transform) {
-                    const position = transform.global.position;
-                    if (position.equals(clingon.__prevPosition)) {
-                        return; //already correct placement
-                    } else {
-                        clingon.__prevPosition.copy(position);
-                    }
-                    grid.pointWorld2Grid(position, uv);
-                    uv.divide(grid.size);
-                    u = uv.x;
-                    v = uv.y;
-                    position.y = heightSampler.sample(u, v);
-                    transform.setGlobalPosition(position.x, position.y, position.z);
-                    //
-                    if (clingon.normalAlign) {
-                        if (clingon.samplingRadius !== 0 && clingon.sampleCount > 1) {
-                            //more than one sample is to be used to compute normal by averaging
-                            sampleNormalOnDisk(clingon.sampleCount, clingon.samplingRadius, samplerNormal, uv, normal);
-                        } else {
-                            samplerNormal.sample(u, v, normal);
-                        }
-                        vOrigin.set(0, 0, 0);
-                        vUp.set(0, 1, 0);
-                        //normal.set(-normal.x, normal.z, -normal.y);
-                        //
-                        m.identity();
-                        m.lookAt(normal, vOrigin, vUp);
-                        euler.setFromRotationMatrix(m, "XZY");
-                        if (Math.abs(euler.y) + 0.0001 >= Math.PI) {
-                            euler.z = -euler.z;
-                        }
-                        euler.y = 0; //drop rotation orthogonal to terrain
-                        transform.rotation.setFromEuler(euler);
-                    }
-                });
-            }
-
-            return update;
-        }();
-    }
-
-    remove(component) {
-    }
-
-    add(component) {
-    }
-
-    clearCache() {
-        const em = this.entityManager;
-        em.traverseEntities([ClingToHeightMap], function (clingon) {
-            clingon.__prevPosition.set(Number.NaN, Number.NaN, Number.NaN);
-        });
-    }
-}
-
-
-const sampleNormalOnDisk = (function () {
-    const tempNormal = new ThreeVector3();
-    const offset = new ThreeVector2();
-    const PI2 = Math.PI * 2;
-
-    //TODO consider plane-fitting algorithm from: http://www.ilikebigbits.com/blog/2015/3/2/plane-from-points
-    /*
-     // source: http://www.ilikebigbits.com/blog/2015/3/2/plane-from-points
-     // @author Emil Ernerfeldt
-     // Constructs a plane from a collection of points
-     // so that the summed squared distance to all points is minimzized
-     fn plane_from_points(points: &[Vec3]) -> Plane {
-     let n = points.len();
-     assert!(n >= 3, "At least three points required");
-
-     let mut sum = Vec3{x:0.0, y:0.0, z:0.0};
-     for p in points {
-     sum = &sum + &p;
-     }
-     let centroid = &sum * (1.0 / (n as f64));
-
-     // Calc full 3x3 covariance matrix, excluding symmetries:
-     let mut xx = 0.0; let mut xy = 0.0; let mut xz = 0.0;
-     let mut yy = 0.0; let mut yz = 0.0; let mut zz = 0.0;
-
-     for p in points {
-     let r = p - &centroid;
-     xx += r.x * r.x;
-     xy += r.x * r.y;
-     xz += r.x * r.z;
-     yy += r.y * r.y;
-     yz += r.y * r.z;
-     zz += r.z * r.z;
-     }
-
-     let det_x = yy*zz - yz*yz;
-     let det_y = xx*zz - xz*xz;
-     let det_z = xx*yy - xy*xy;
-
-     let det_max = max3(det_x, det_y, det_z);
-     assert!(det_max > 0.0, 'The points don't span a plane");
-
-     // Pick path with best conditioning:
-     let dir =
-     if det_max == det_x {
-     let a = (xz*yz - xy*zz) / det_x;
-     let b = (xy*yz - xz*yy) / det_x;
-     Vec3{x: 1.0, y: a, z: b}
-     } else if det_max == det_y {
-     let a = (yz*xz - xy*zz) / det_y;
-     let b = (xy*xz - yz*xx) / det_y;
-     Vec3{x: a, y: 1.0, z: b}
-     } else {
-     let a = (yz*xy - xz*yy) / det_z;
-     let b = (xz*xy - yz*xx) / det_z;
-     Vec3{x: a, y: b, z: 1.0}
-     };
-
-     plane_from_point_and_normal(&centroid, &normalize(dir))
-     }
-     */
-    function sampleNormalOnDisk(sampleCount, radius, sampler, origin, result) {
-        const radiusU = radius / sampler.width;
-        const radiusV = radius / sampler.height;
-        result.set(0, 0, 0);
-        for (let i = 0; i < sampleCount; i++) {
-            const angle = PI2 * (i / sampleCount);
-            offset.set(radiusU * Math.cos(angle), radiusV * Math.sin(angle));
-            sampler.sample(origin.x + offset.x, origin.y + offset.y, tempNormal);
-            result.add(tempNormal);
-        }
-        result.normalize();
-    }
-
-    return sampleNormalOnDisk;
-})();
-
-export default ClingToHeightMapSystem;

package/src/engine/ecs/systems/SynchronizePositionSystem.js

@@ -1,43 +0,0 @@
-/**
- * Created by Alex on 05/02/2015.
- */
-import { System } from '../System.js';
-import SynchronizePosition from '../components/SynchronizePosition.js';
-import { Transform } from '../transform/Transform.js';
-
-
-class SynchronizePositionSystem extends System {
-    constructor() {
-        super();
-
-        this.dependencies = [SynchronizePosition];
-
-        this.entityManager = null;
-    }
-
-    update(timeDelta) {
-        const em = this.entityManager;
-        const ecd = em.dataset;
-
-        if (ecd === null) {
-            return;
-        }
-
-        ecd.traverseEntities([SynchronizePosition, Transform], function (sync, transform) {
-            const targetEntity = sync.targetEntity;
-            const targetTransform = ecd.getComponent(targetEntity, Transform);
-            if (sync.x) {
-                transform.position.x = targetTransform.position.x;
-            }
-            if (sync.y) {
-                transform.position.y = targetTransform.position.y;
-            }
-            if (sync.z) {
-                transform.position.z = targetTransform.position.z;
-            }
-        });
-    }
-}
-
-
-export default SynchronizePositionSystem;