@woosh/meep-engine 2.94.4 → 2.94.6

package/src/engine/graphics/ecs/trail2d/Trail2DSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Trail2DSystem.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/ecs/trail2d/Trail2DSystem.js"],"names":[],"mappings":";AA+BA;IAkCI;;;OAGG;IACH,4BA4BC;IAjED,oDAAoC;IAEpC,+DAEE;IAEF;;;OAGG;IACH,WAFU,4BAA4B,CAES;IAE/C;;;;OAIG;IACH,wBAAiC;IAGjC;;;;OAIG;IACH,oBAAgB;IAEhB;;;OAGG;IACH,YAAgB;IAcZ;;;;OAIG;IACH,iBAAsB;IAEtB;;;OAGG;IACH,UAFU,cAAc,CAEO;IAE/B;;;OAGG;IACH,aAFU,cAAY,IAAI,CAEH;IAK3B,mFAgBC;IAED,2EAMC;IAED;;;;;OAKG;IACH,sBAoDC;IAED;;;;;OAKG;IACH,YAHW,OAAO,aADP,SAAS,YAET,MAAM,QAahB;IAED;;;;;OAKG;IACH,kBAJW,OAAO,aACP,SAAS,UACT,MAAM,QAShB;IAED;;;;OAIG;IACH,yBAHW,OAAO,aACP,SAAS,QAsDnB;IAED,6BAWC;CACJ;uBAtRsB,wBAAwB;0BACrB,qCAAqC;oBAYzB,cAAc;4CAdR,uDAAuD;6CAYtD,yDAAyD;+BARvE,yBAAyB"}
+{"version":3,"file":"Trail2DSystem.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/ecs/trail2d/Trail2DSystem.js"],"names":[],"mappings":";AA8BA;IAkCI;;;OAGG;IACH,4BA4BC;IAjED,oDAAoC;IAEpC,+DAEE;IAEF;;;OAGG;IACH,WAFU,4BAA4B,CAES;IAE/C;;;;OAIG;IACH,wBAAiC;IAGjC;;;;OAIG;IACH,oBAAgB;IAEhB;;;OAGG;IACH,YAAgB;IAcZ;;;;OAIG;IACH,iBAAsB;IAEtB;;;OAGG;IACH,UAFU,cAAc,CAEO;IAE/B;;;OAGG;IACH,aAFU,cAAY,IAAI,CAEH;IAK3B,mFAgBC;IAED,2EAMC;IAED;;;;;OAKG;IACH,sBAoDC;IAED;;;;;OAKG;IACH,YAHW,OAAO,aADP,SAAS,YAET,MAAM,QAahB;IAED;;;;;OAKG;IACH,kBAJW,OAAO,aACP,SAAS,UACT,MAAM,QAShB;IAED;;;;OAIG;IACH,yBAHW,OAAO,aACP,SAAS,QAoCnB;IAED,6BAWC;CACJ;uBAnQsB,wBAAwB;0BACrB,qCAAqC;oBAY3C,cAAc;4CAdU,uDAAuD;6CAYtD,yDAAyD;+BARvE,yBAAyB"}

package/src/engine/graphics/ecs/trail2d/Trail2DSystem.js

@@ -23,12 +23,11 @@ import { RibbonX } from "../../trail/x/RibbonX.js";
 import { RibbonXPlugin } from "../../trail/x/RibbonXPlugin.js";
 import { RibbonXFixedPhysicsSimulator } from "../../trail/x/simulator/RibbonXFixedPhysicsSimulator.js";
 
-import Trail2D, { Trail2DFlags } from './Trail2D.js';
+import Trail2D from './Trail2D.js';
+import { Trail2DFlags } from "./Trail2DFlags.js";
 
 const v3Temp1 = new Vector3();
 
-const v3_array = [];
-
 class Trail2DSystem extends System {
     dependencies = [Trail2D, Transform];
 
@@ -176,8 +175,8 @@ class Trail2DSystem extends System {
         }
 
         trail.bvh.resize(
-            position_x,position_y,position_z,
-            position_x,position_y,position_z
+            position_x, position_y, position_z,
+            position_x, position_y, position_z
         );
 
         trail.setFlag(Trail2DFlags.Built);
@@ -234,46 +233,28 @@ class Trail2DSystem extends System {
         const newPosition = v3Temp1;
 
         newPosition.copy(trail.offset);
-        newPosition.multiply(transform.scale);
-        newPosition.applyQuaternion(transform.rotation);
-
-        newPosition.add(transform.position);
+        newPosition.applyMatrix4(transform.matrix);
 
         trail.timeSinceLastUpdate += timeDelta;
         trail.time += timeDelta;
 
         const ageOffset = max2(0, trail.maxAge - trail.time);
 
-        if (trail.getFlag(Trail2DFlags.Spawning)) {
-            const refitTimeDelta = trail.maxAge / trail.ribbon.getCount();
-
-
-            if (trail.timeSinceLastUpdate >= refitTimeDelta) {
-
-                ribbon.getPointPosition(v3_array, ribbon.getHeadIndex());
-
-                if (newPosition.x !== v3_array[0] || newPosition.y !== v3_array[1] || newPosition.z !== v3_array[2]) {
-                    //make sure that this is a new position before rotating new segment
-                    trail.timeSinceLastUpdate = 0;
-                    //rotating segment
-
-                    ribbon.rotate();
-                }
-            }
+        this.simulator.update(ribbon, trail.maxAge, timeDelta);
 
-            const head_index = ribbon.getHeadIndex();
+        if (trail.getFlag(Trail2DFlags.Spawning)) {
+            trail.updateHead(newPosition.x, newPosition.y, newPosition.z, ageOffset);
+        }
 
-            ribbon.setPointPosition(head_index, newPosition.x, newPosition.y, newPosition.z);
+        if (trail.getFlag(Trail2DFlags.BoundsNeedUpdate)) {
+            const bvh = trail.bvh;
 
-            //set head to fresh value
-            ribbon.setPointAttribute_Scalar(head_index, RIBBON_ATTRIBUTE_ADDRESS_AGE, ageOffset);
+            ribbon.computeBoundingBox(bvh.bounds);
+            bvh.write_bounds();
 
+            trail.clearFlag(Trail2DFlags.BoundsNeedUpdate);
         }
 
-        ribbon.computeBoundingBox(trail.bvh.bounds);
-        trail.bvh.write_bounds();
-
-        this.simulator.update(ribbon, trail.maxAge, timeDelta);
     }
 
     update(timeDelta) {

package/src/engine/graphics/ecs/trail2d/makeGradientTrail.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"makeGradientTrail.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/ecs/trail2d/makeGradientTrail.js"],"names":[],"mappings":"AASA;;;;;;;;;;GAUG;AACH,kGATW,MAAM,EAAE,GAON,OAAO,CAiDnB;oBA5DqC,cAAc"}
+{"version":3,"file":"makeGradientTrail.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/ecs/trail2d/makeGradientTrail.js"],"names":[],"mappings":"AAUA;;;;;;;;;;GAUG;AACH,kGATW,MAAM,EAAE,GAON,OAAO,CAiDnB;oBA7DmB,cAAc"}

package/src/engine/graphics/ecs/trail2d/makeGradientTrail.js

@@ -5,7 +5,8 @@ import {
     RIBBON_ATTRIBUTE_ADDRESS_THICKNESS,
     RIBBON_ATTRIBUTE_ADDRESS_UV_OFFSET
 } from "../../trail/x/ribbon_attributes_spec.js";
-import Trail2D, { Trail2DFlags } from "./Trail2D.js";
+import Trail2D from "./Trail2D.js";
+import { Trail2DFlags } from "./Trail2DFlags.js";
 
 /**
  *

package/src/engine/graphics/ecs/trail2d/prototypeTrail2D.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=prototypeTrail2D.d.ts.map

package/src/engine/graphics/ecs/trail2d/prototypeTrail2D.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prototypeTrail2D.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/ecs/trail2d/prototypeTrail2D.js"],"names":[],"mappings":""}

package/src/engine/graphics/ecs/trail2d/prototypeTrail2D.js

@@ -0,0 +1,65 @@
+import { OrbitingBehavior } from "../../../../../../model/game/util/behavior/OrbitingBehavior.js";
+import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
+import { make_justified_point_grid } from "../../../../core/geom/3d/util/make_justified_point_grid.js";
+import Vector3 from "../../../../core/geom/Vector3.js";
+import { TextureAssetLoader } from "../../../asset/loaders/texture/TextureAssetLoader.js";
+import Entity from "../../../ecs/Entity.js";
+import { Transform } from "../../../ecs/transform/Transform.js";
+import { EngineHarness } from "../../../EngineHarness.js";
+import { BehaviorComponent } from "../../../intelligence/behavior/ecs/BehaviorComponent.js";
+import { BehaviorSystem } from "../../../intelligence/behavior/ecs/BehaviorSystem.js";
+import Trail2D from "./Trail2D.js";
+import Trail2DSystem from "./Trail2DSystem.js";
+
+const harness = new EngineHarness();
+
+/**
+ *
+ * @param {Engine} engine
+ * @return {Promise<void>}
+ */
+async function main(engine) {
+    await EngineHarness.buildBasics({
+        engine,
+    });
+
+    const ecd = engine.entityManager.dataset;
+
+    const bounds = new AABB3(2, 1, 2, 18, 1, 18);
+
+    const grid_points = make_justified_point_grid(bounds, 0.2, (x, y, z) => {
+
+        const entity = new Entity();
+
+        entity.add(Trail2D.fromJSON({
+            textureURL: "data/textures/trail/rainbow.png",
+            width: 0.01
+        }));
+        entity.add(Transform.fromJSON({
+            position: { x, y, z }
+        }));
+        entity.add(BehaviorComponent.fromOne(OrbitingBehavior.from({
+            center: new Vector3(x,y,z),
+            radius: 0.1-0.02
+        })))
+
+        entity.build(ecd)
+
+    });
+
+    console.log("Grid Points:",grid_points);
+
+}
+
+harness.initialize({
+    configuration(config, engine) {
+
+        config.addLoader("texture", new TextureAssetLoader());
+
+        config.addManySystems(
+            new Trail2DSystem(engine),
+            new BehaviorSystem(engine)
+        );
+
+    }
+}).then(main)

package/src/engine/graphics/sh3/path_tracer/prototypePathTracer.js

@@ -71,7 +71,7 @@ vCanvas.css({
  * How many rays to use per-pixel
  * @type {number}
  */
-const PIXEL_SAMPLE_COUNT = 256;
+const PIXEL_SAMPLE_COUNT = 4;
 
 const pt = new PathTracer();
 

package/src/engine/graphics/trail/x/RibbonX.d.ts

@@ -68,10 +68,10 @@ export class RibbonX {
     initializeAttribute_Index(): void;
     /**
      *
-     * @param {number[]} result
+     * @param {number[]|Float32Array} result
      * @param {number} index
      */
-    getPointPosition(result: number[], index: number): void;
+    getPointPosition(result: number[] | Float32Array, index: number): void;
     /**
      *
      * @param {number} point_index

package/src/engine/graphics/trail/x/RibbonX.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RibbonX.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/trail/x/RibbonX.js"],"names":[],"mappings":"AAwBA;IAGQ;;;;OAIG;IACH,mBAAsC;IAEtC;;;;OAIG;IACH,eAAuD;IAEvD;;;;OAIG;IACH,qBAAqB;IAErB;;;;OAIG;IACH,qBAAqB;IAErB;;;;OAIG;IACH,0BAA0B;IAE1B;;;;OAIG;IACH,gBAAgB;IAGpB,gBAEC;IAED;;;OAGG;IACH,eAFa,cAAc,CAI1B;IAED;;;OAGG;IACH,YAFa,MAAM,CAIlB;IAED,uBAEC;IAED,uBAEC;IAED,sBA6CC;IAvCG,8BAAqD;IACrD,gCAA8D;IAE9D,2CAAoF;IAEpF,oDAA6F;IAC7F,gDAA0F;IAE1F,wCAAgF;IAChF,yCAAiF;IAEjF,qCAA8E;IAC9E,sCAA+E;IAC/E,wCAAiF;IACjF,4CAAsF;IAGtF,4BAAmE;IAwBvE,mCAWC;IAED;;OAEG;IACH,kCAqBC;IAED;;;;OAIG;IACH,yBAHW,MAAM,EAAE,SACR,MAAM,QAYhB;IAED;;;;;;;OAOG;IACH,uCANW,MAAM,mBACN,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,QAchB;IAED;;;;;OAKG;IACH,sCAJW,MAAM,mBACN,MAAM,SACN,MAAM,QAShB;IAED;;;;;;OAMG;IACH,4CALW,MAAM,mBACN,MAAM,SACN,MAAM,GACJ,MAAM,CAgBlB;IAED;;;;;;OAMG;IACH,+CALW,MAAM,0BACN,MAAM,2BACN,MAAM,yBACN,MAAM,QAYhB;IAED,2DA8DC;IAGD;;;;;;OAMG;IACH,qBALW,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,QAMhB;IAED;;;;OAIG;IACH,qBAHW,MAAM,SACN,MAAM,QAShB;IAED;;;;OAIG;IACH,yBAHW,MAAM,SACN,MAAM,QAShB;IAED;;;OAGG;IACH,gBAFW,MAAM,QAmDhB;IAED;;;OAGG;IACH,2BAFW,QAAM,UAAU,MAAM,CAAC,QAuCjC;IAGD;;OAEG;IACH,eAgFC;CACJ;+BAnjBM,OAAO;kCAAP,OAAO;2CAAP,OAAO;gCAAP,OAAO"}
+{"version":3,"file":"RibbonX.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/trail/x/RibbonX.js"],"names":[],"mappings":"AAwBA;IAGQ;;;;OAIG;IACH,mBAAsC;IAEtC;;;;OAIG;IACH,eAAuD;IAEvD;;;;OAIG;IACH,qBAAqB;IAErB;;;;OAIG;IACH,qBAAqB;IAErB;;;;OAIG;IACH,0BAA0B;IAE1B;;;;OAIG;IACH,gBAAgB;IAGpB,gBAEC;IAED;;;OAGG;IACH,eAFa,cAAc,CAI1B;IAED;;;OAGG;IACH,YAFa,MAAM,CAIlB;IAED,uBAEC;IAED,uBAEC;IAED,sBA6CC;IAvCG,8BAAqD;IACrD,gCAA8D;IAE9D,2CAAoF;IAEpF,oDAA6F;IAC7F,gDAA0F;IAE1F,wCAAgF;IAChF,yCAAiF;IAEjF,qCAA8E;IAC9E,sCAA+E;IAC/E,wCAAiF;IACjF,4CAAsF;IAGtF,4BAAmE;IAwBvE,mCAWC;IAED;;OAEG;IACH,kCAqBC;IAED;;;;OAIG;IACH,yBAHW,MAAM,EAAE,GAAC,YAAY,SACrB,MAAM,QAYhB;IAED;;;;;;;OAOG;IACH,uCANW,MAAM,mBACN,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,QAchB;IAED;;;;;OAKG;IACH,sCAJW,MAAM,mBACN,MAAM,SACN,MAAM,QAShB;IAED;;;;;;OAMG;IACH,4CALW,MAAM,mBACN,MAAM,SACN,MAAM,GACJ,MAAM,CAgBlB;IAED;;;;;;OAMG;IACH,+CALW,MAAM,0BACN,MAAM,2BACN,MAAM,yBACN,MAAM,QAYhB;IAED,2DA8DC;IAGD;;;;;;OAMG;IACH,qBALW,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,QAMhB;IAED;;;;OAIG;IACH,qBAHW,MAAM,SACN,MAAM,QAShB;IAED;;;;OAIG;IACH,yBAHW,MAAM,SACN,MAAM,QAShB;IAED;;;OAGG;IACH,gBAFW,MAAM,QAmDhB;IAED;;;OAGG;IACH,2BAFW,QAAM,UAAU,MAAM,CAAC,QA+CjC;IAGD;;OAEG;IACH,eAgFC;CACJ;+BA3jBM,OAAO;kCAAP,OAAO;2CAAP,OAAO;gCAAP,OAAO"}

package/src/engine/graphics/trail/x/RibbonX.js

@@ -184,7 +184,7 @@ export class RibbonX {
 
     /**
      *
-     * @param {number[]} result
+     * @param {number[]|Float32Array} result
      * @param {number} index
      */
     getPointPosition(result, index) {
@@ -459,18 +459,26 @@ export class RibbonX {
 
         for (let i = 0; i < n; i += 2) {
             const thickness = data.readCellValue(i, RIBBON_ATTRIBUTE_ADDRESS_THICKNESS);
-            const half_thickness = thickness / 2;
+            const half_thickness = thickness * 0.5;
 
             const x = data.readCellValue(i, RIBBON_ATTRIBUTE_ADDRESS_POSITION);
             const y = data.readCellValue(i, RIBBON_ATTRIBUTE_ADDRESS_POSITION + 1);
             const z = data.readCellValue(i, RIBBON_ATTRIBUTE_ADDRESS_POSITION + 2);
 
-            _x0 = min2(_x0, x - half_thickness);
-            _y0 = min2(_y0, y - half_thickness);
-            _z0 = min2(_z0, z - half_thickness);
-            _x1 = max2(_x1, x + half_thickness);
-            _y1 = max2(_y1, y + half_thickness);
-            _z1 = max2(_z1, z + half_thickness);
+            const x0 = x - half_thickness;
+            const y0 = y - half_thickness;
+            const z0 = z - half_thickness;
+
+            const x1 = x + half_thickness;
+            const y1 = y + half_thickness;
+            const z1 = z + half_thickness;
+
+            _x0 = min2(_x0, x0);
+            _y0 = min2(_y0, y0);
+            _z0 = min2(_z0, z0);
+            _x1 = max2(_x1, x1);
+            _y1 = max2(_y1, y1);
+            _z1 = max2(_z1, z1);
 
         }
 

package/src/engine/graphics/trail/x/simulator/RibbonXFixedPhysicsSimulator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RibbonXFixedPhysicsSimulator.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/trail/x/simulator/RibbonXFixedPhysicsSimulator.js"],"names":[],"mappings":"AAGA;;GAEG;AACH;IAKI;;;;;OAKG;IACH,iCAHW,MAAM,aACN,MAAM,QAkBhB;CACJ"}
+{"version":3,"file":"RibbonXFixedPhysicsSimulator.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/trail/x/simulator/RibbonXFixedPhysicsSimulator.js"],"names":[],"mappings":"AAIA;;GAEG;AACH;IAKI;;;;;OAKG;IACH,iCAHW,MAAM,aACN,MAAM,QAkBhB;CACJ"}

package/src/engine/graphics/trail/x/simulator/RibbonXFixedPhysicsSimulator.js

@@ -1,5 +1,6 @@
-import { RIBBON_ATTRIBUTE_ADDRESS_AGE, RIBBON_ATTRIBUTE_ADDRESS_UV_OFFSET } from "../ribbon_attributes_spec.js";
 import { clamp01 } from "../../../../../core/math/clamp01.js";
+import { RIBBON_ATTRIBUTE_ADDRESS_AGE, RIBBON_ATTRIBUTE_ADDRESS_UV_OFFSET } from "../ribbon_attributes_spec.js";
+
 
 /**
  * Fixed function simulation engine for ribbons