@woosh/meep-engine 2.120.1 → 2.120.2

package/src/generation/grid/generation/GridTaskDensityMarkerDistribution.js

@@ -1,5 +1,6 @@
 import { assert } from "../../../core/assert.js";
 import { ArrayIteratorRandom } from "../../../core/collection/array/iterator/ArrayIteratorRandom.js";
+import { circle_area } from "../../../core/geom/2d/circle/circle_area.js";
 import { clamp } from "../../../core/math/clamp.js";
 import { clamp01 } from "../../../core/math/clamp01.js";
 import { NumericInterval } from "../../../core/math/interval/NumericInterval.js";
@@ -13,15 +14,6 @@ import { actionTask } from "../../../core/process/task/util/actionTask.js";
 import { MarkerNodeMatcherAny } from "../../markers/matcher/MarkerNodeMatcherAny.js";
 import { GridTaskGenerator } from "../GridTaskGenerator.js";
 
-
-/**
- *
- * @param {number} radius
- */
-function estimateDensityTarget(radius) {
-    return Math.PI * radius * radius;
-}
-
 export class GridTaskDensityMarkerDistribution extends GridTaskGenerator {
 
     /**
@@ -43,7 +35,7 @@ export class GridTaskDensityMarkerDistribution extends GridTaskGenerator {
     scale = new NumericInterval(1, 1);
 
     /**
-     * RNG seed offset
+     * RNG seed
      * @type {number}
      * @private
      */
@@ -77,13 +69,14 @@ export class GridTaskDensityMarkerDistribution extends GridTaskGenerator {
     /**
      *
      * @param {GridData} grid
-     * @param x0
-     * @param y0
-     * @param x1
-     * @param y1
+     * @param {number} x0
+     * @param {number} y0
+     * @param {number} x1
+     * @param {number} y1
+     * @returns {number}
      */
     estimateTapCount(grid, x0, y0, x1, y1) {
-        const random = seededRandom(99);
+        const random = seededRandom(this.__seed + 91234);
 
         /*
             for tap count we ween 3 things:
@@ -95,17 +88,23 @@ export class GridTaskDensityMarkerDistribution extends GridTaskGenerator {
         const width = x1 - x0;
         const height = y1 - y0;
 
-        const gridSize = width * height;
+        const grid_cell_count = width * height;
 
-        const SAMPLE_SIZE = 60 + gridSize * 0.01;
+        const SAMPLE_SIZE = 60 + grid_cell_count * 0.01;
 
         const x_max = width - 1;
         const y_max = height - 1;
 
+        /**
+         *
+         * @type {number[]}
+         */
         const samplesCollisions = [];
 
-        const samplesDensity = [];
-
+        /**
+         *
+         * @type {number[]}
+         */
         const samplesSize = [];
 
         const SIZE_SAMPLE_LIMIT = 10 + SAMPLE_SIZE * 3;
@@ -121,8 +120,6 @@ export class GridTaskDensityMarkerDistribution extends GridTaskGenerator {
 
             const density = clamp01(densityValue);
 
-            samplesDensity.push(density);
-
             if (density <= 0) {
                 continue;
             }
@@ -156,9 +153,9 @@ export class GridTaskDensityMarkerDistribution extends GridTaskGenerator {
         const meanNodeSize = samplesSize.length > 0 ? computeStatisticalMean(samplesSize) : 1;
 
         //compute relative density per unit square of a single marker
-        const meanSingleNodeDensity = estimateDensityTarget(meanNodeSize);
+        const meanSingleNodeDensity = circle_area(meanNodeSize);
 
-        const saturationTapCount = gridSize / meanSingleNodeDensity;
+        const saturationTapCount = grid_cell_count / meanSingleNodeDensity;
 
         // it is possible that a tap will collide with other existing nodes, in which situation the tap is rejected, to account for that we want to estimate how often this will happen and increase the tap count accordingly
         const collisionCompensation = clamp(1 / (1 - collisionProbability), 1, 10);
@@ -176,7 +173,11 @@ export class GridTaskDensityMarkerDistribution extends GridTaskGenerator {
      * @param {number} y1
      * @returns {Task}
      */
-    processArea(seed, grid, x0, y0, x1, y1) {
+    processArea(
+        seed,
+        grid,
+        x0, y0, x1, y1
+    ) {
 
         //we want to estimate average size of a marker
 
@@ -203,8 +204,6 @@ export class GridTaskDensityMarkerDistribution extends GridTaskGenerator {
          */
         const scale = this.scale;
 
-        const self = this;
-
         const random = seededRandom(seed);
 
         const width = x1 - x0;
@@ -232,7 +231,7 @@ export class GridTaskDensityMarkerDistribution extends GridTaskGenerator {
             //sample density mask
             const densityValue = density.execute(grid, _x, _y, 0);
 
-            if (densityValue === 0) {
+            if (densityValue <= 1e-6) {
                 // 0% chance
                 return TaskSignal.Continue;
             }
@@ -277,24 +276,22 @@ export class GridTaskDensityMarkerDistribution extends GridTaskGenerator {
             return TaskSignal.Continue;
         }
 
-        function initializer() {
-
-            random.setCurrentSeed(seed);
+        return new Task({
+            name: 'Density marker distribution',
+            cycleFunction,
+            initializer: () => {
 
-            iterationLimit = self.estimateTapCount(grid, x0, y0, x1, y1);
-            iteration = 0;
+                random.setCurrentSeed(seed);
 
-            assert.isNumber(iterationLimit, 'iterationLimit');
-            assert.isFiniteNumber(iterationLimit, 'iterationLimit');
-            assert.ok(!Number.isNaN(iterationLimit), 'iterationLimit is NaN');
+                iterationLimit = this.estimateTapCount(grid, x0, y0, x1, y1);
+                iteration = 0;
 
-            rejectedSampleBudget = iterationLimit * 0.15;
-        }
+                assert.isNumber(iterationLimit, 'iterationLimit');
+                assert.isFiniteNumber(iterationLimit, 'iterationLimit');
+                assert.ok(!Number.isNaN(iterationLimit), 'iterationLimit is NaN');
 
-        return new Task({
-            name: 'Density marker distribution',
-            cycleFunction,
-            initializer,
+                rejectedSampleBudget = iterationLimit * 0.15;
+            },
             estimatedDuration: height * width / 6000,
             computeProgress() {
                 if (iterationLimit === 0) {
@@ -312,9 +309,11 @@ export class GridTaskDensityMarkerDistribution extends GridTaskGenerator {
         const random = seededRandom(seed);
 
         const tile_size = 16;
-        //we want to estimate average size of a marker
+
+
         const tasks = [];
 
+        //we want to estimate average size of a marker
         const tInitialize = actionTask(() => {
 
             if (!this.density.initialized) {
@@ -324,12 +323,21 @@ export class GridTaskDensityMarkerDistribution extends GridTaskGenerator {
             this.action.initialize(grid, seed);
         });
 
+        /*
+         we break the entire region into smaller tiles (16x16)
+         this puts an upper bound of sorts on how many samples we have to take, irrespective of actual grid size
+         these tiles also give us something closer to blue noise distribution
+         The assumption with which the tile size was chosen is average marker size of ~1
+         Actual tile size was tweaked using empirical tests
+         */
 
         for (let j = 0; j < grid.height; j += tile_size) {
+
             const y0 = j;
             const y1 = min2(grid.height, j + tile_size);
 
             for (let i = 0; i < grid.width; i += tile_size) {
+
                 const x0 = i;
                 const x1 = min2(grid.width, i + tile_size);
 
@@ -343,7 +351,7 @@ export class GridTaskDensityMarkerDistribution extends GridTaskGenerator {
             }
         }
 
-        //build a random dependency chain to ensure that tiles are not processed in parallel, thus crating race coditions and leading to non-deterministic result
+        // build a random dependency chain to ensure that tiles are not processed in parallel, thus crating race conditions and leading to non-deterministic result
         const iteratorRandom = new ArrayIteratorRandom();
         iteratorRandom.initialize(tasks);
 

package/editor/actions/concrete/ModifyPatchSampler2DAction.d.ts

@@ -1,48 +0,0 @@
-export class ModifyPatchSampler2DAction extends Action<any> {
-    /**
-     *
-     * @param {Sampler2D} sampler
-     * @param {number[]} bounds
-     */
-    constructor(sampler: Sampler2D, bounds: number[]);
-    /**
-     *
-     * @type {Sampler2D}
-     * @private
-     */
-    private __sampler;
-    /**
-     *
-     * @type {number[]}
-     * @private
-     */
-    private __bounds;
-    /**
-     *
-     * @type {Sampler2D}
-     */
-    __patch_new: Sampler2D;
-    /**
-     *
-     * @type {Sampler2D}
-     * @private
-     */
-    private __patch_old;
-    get patch(): Sampler2D;
-    get x(): number;
-    get y(): number;
-    /**
-     *
-     * @param {number} x coordinate in global space
-     * @param {number} y coordinate in global space
-     * @param {number} [channel]
-     * @returns {number} delta between original value and the new one after the change
-     */
-    computeDelta(x: number, y: number, channel?: number): number;
-    computeByteSize(): any;
-    apply(context: any): Promise<void>;
-    revert(context: any): Promise<void>;
-}
-import { Action } from "../../../src/core/process/undo/Action.js";
-import { Sampler2D } from "../../../src/engine/graphics/texture/sampler/Sampler2D.js";
-//# sourceMappingURL=ModifyPatchSampler2DAction.d.ts.map

package/editor/actions/concrete/ModifyPatchTextureArray2DAction.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ModifyPatchTextureArray2DAction.d.ts","sourceRoot":"","sources":["ModifyPatchTextureArray2DAction.js"],"names":[],"mappings":"AAKA;IACI;;;;;OAKG;IACH,kBAJW,MAAM,EAAE,GAAC,UAAU,GAAC,WAAW,GAAC,YAAY,mBAC5C,MAAM,EAAE,UACR,MAAM,EAAE,EA6BlB;IAtBG,2DAAkB;IAClB,4BAAwC;IACxC,mBAAsB;IAUtB;;;OAGG;IACH,oBAAmD;IACnD;;;OAGG;IACH,oBAAmD;IAGvD;;;;;;;;;OASG;IACH,kCARW,MAAM,YACN,MAAM,iCAEN,MAAM,UACN,MAAM,cACN,MAAM,cACN,MAAM,QAiEhB;IAED,oCAEC;IAOD,mCA8BC;IAED,oCAuBC;CACJ;uBArLsB,0CAA0C"}

package/editor/actions/concrete/PaintTerrainOverlayAction.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"PaintTerrainOverlayAction.d.ts","sourceRoot":"","sources":["PaintTerrainOverlayAction.js"],"names":[],"mappings":";AAIA;IACI;;;;;;;OAOG;IACH,oBANW,MAAM,KACN,MAAM,KACN,MAAM,SACN,OAAO,EAYjB;IAPG,eAAoB;IACpB,UAAU;IACV,UAAU;IACV,eAAkB;IAElB,aAAmB;IACnB,kBAA6B;IAGjC,kCASC;IAED,mCAKC;CACJ;uBAxCsB,0CAA0C;oBAD7C,mCAAmC"}

package/editor/actions/concrete/PatchTerrainHeightAction.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"PatchTerrainHeightAction.d.ts","sourceRoot":"","sources":["PatchTerrainHeightAction.js"],"names":[],"mappings":"AAEA;IACI;;;;;;;OAOG;IACH,iCALW,MAAM,KACN,MAAM,SACN,MAAM,UACN,MAAM,EAUhB;IALG;;;OAGG;IACH,iBAAsB;IAG1B,+BAgCC;CAaJ;2CAlE0C,iCAAiC"}

package/editor/actions/concrete/SelectionAddAction.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"SelectionAddAction.d.ts","sourceRoot":"","sources":["SelectionAddAction.js"],"names":[],"mappings":";AAGA;IACI;;;;OAIG;IACH,sBAHW,KAAK,EAWf;IANG,cAAoB;IACpB;;;OAGG;IACH,UAFU,KAAK,CAES;IAG5B,kCAMC;IAED,mCAEC;CACJ;uBA9BsB,0CAA0C"}

package/editor/actions/concrete/SelectionClearAction.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"SelectionClearAction.d.ts","sourceRoot":"","sources":["SelectionClearAction.js"],"names":[],"mappings":";AAEA;IACI,cAGC;IADG,cAAoB;IAGxB,kCAGC;IAED,mCAEC;CACJ;uBAhBsB,0CAA0C"}

package/editor/actions/concrete/SelectionRemoveAction.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"SelectionRemoveAction.d.ts","sourceRoot":"","sources":["SelectionRemoveAction.js"],"names":[],"mappings":";AAEA;IACI,2BAIC;IAFG,cAAoB;IACpB,cAAwB;IAG5B,kCAUC;IAED,mCAEC;CACJ;uBAxBsB,0CAA0C"}

package/editor/actions/concrete/TransformModifyAction.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"TransformModifyAction.d.ts","sourceRoot":"","sources":["TransformModifyAction.js"],"names":[],"mappings":";AAGA;IACI;;;;;OAKG;IACH,mCAHW,SAAS,EASnB;IAHG,cAAoB;IACpB,oBAAwB;IACxB,YAAoB;IAqBxB,mCAMC;CACJ;uBA1CsB,0CAA0C;0BADvC,gDAAgD"}

package/editor/actions/concrete/WriteGridValueAction.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"WriteGridValueAction.d.ts","sourceRoot":"","sources":["WriteGridValueAction.js"],"names":[],"mappings":";AAGA;IACI,qDAUC;IAPG,YAAoB;IACpB,OAAU;IACV,OAAU;IACV,WAAkB;IAElB,uBAAoB;IACpB,iBAAoB;IAGxB,kCAgBC;IAED,mCAGC;CACJ;uBArCsB,0CAA0C;yBADxC,mDAAmD"}

package/src/engine/ecs/read_entity_reference.d.ts

@@ -1,9 +0,0 @@
-/**
- *
- * @param {EntityComponentDataset} ecd
- * @param {number} entity
- * @returns {EntityReference}
- */
-export function read_entity_reference(ecd: EntityComponentDataset, entity: number): EntityReference;
-import { EntityReference } from "./EntityReference.js";
-//# sourceMappingURL=read_entity_reference.d.ts.map

package/src/engine/ecs/read_entity_reference.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"read_entity_reference.d.ts","sourceRoot":"","sources":["../../../../src/engine/ecs/read_entity_reference.js"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,2CAJW,sBAAsB,UACtB,MAAM,GACJ,eAAe,CAQ3B;gCAd+B,sBAAsB"}

package/src/engine/ecs/read_entity_reference.js

@@ -1,15 +0,0 @@
-import { EntityReference } from "./EntityReference.js";
-
-/**
- *
- * @param {EntityComponentDataset} ecd
- * @param {number} entity
- * @returns {EntityReference}
- */
-export function read_entity_reference(ecd, entity) {
-
-    const generation = ecd.getEntityGeneration(entity);
-
-    return EntityReference.from(entity, generation);
-
-}