@woosh/meep-engine 3.60.7 → 3.60.8

package/package.json

@@ -6,7 +6,7 @@
   "description": "Advanced 3D game engine",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "3.60.7",
+  "version": "3.60.8",
   "exports": {
     "./build/*": "./build/*",
     "./src/*": "./src/*",

package/src/generation/markers/GridActionRuleSet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GridActionRuleSet.d.ts","sourceRoot":"","sources":["../../../../src/generation/markers/GridActionRuleSet.js"],"names":[],"mappings":"AA2BA;IA0BI;;;;;;;;OAQG;IACH;QAN4C,KAAK,EAAtC,uBAAuB;QACW,MAAM,GAAxC,uBAAuB;QACJ,OAAO,GAA1B,MAAM,EAAE;QACU,kBAAkB,GAApC,OAAO;QACL,iBAAiB,CAkB7B;IAjDD;;;OAGG;IACH,UAFU,uBAAuB,CAEnB;IAEd;;;OAGG;IACH,QAFU,uBAAuB,GAAC,MAAM,CAEI;IAE5C;;;OAGG;IACH,SAFU,MAAM,EAAE,CAED;IAEjB;;;OAGG;IACH,aAFU,OAAO,CAEE;IA6BnB;;;OAGG;IACH,uCAEC;IAED;;;;;;OAMG;IACH,8BAJW,MAAM,eACN,MAAM,QAiIhB;CACJ;wCArNuC,8BAA8B"}
+{"version":3,"file":"GridActionRuleSet.d.ts","sourceRoot":"","sources":["../../../../src/generation/markers/GridActionRuleSet.js"],"names":[],"mappings":"AA4BA;IA0BI;;;;;;;;OAQG;IACH;QAN4C,KAAK,EAAtC,uBAAuB;QACW,MAAM,GAAxC,uBAAuB;QACJ,OAAO,GAA1B,MAAM,EAAE;QACU,kBAAkB,GAApC,OAAO;QACL,iBAAiB,CAkB7B;IAjDD;;;OAGG;IACH,UAFU,uBAAuB,CAEnB;IAEd;;;OAGG;IACH,QAFU,uBAAuB,GAAC,MAAM,CAEI;IAE5C;;;OAGG;IACH,SAFU,MAAM,EAAE,CAED;IAEjB;;;OAGG;IACH,aAFU,OAAO,CAEE;IA6BnB;;;OAGG;IACH,uCAEC;IAED;;;;;;OAMG;IACH,8BAJW,MAAM,eACN,MAAM,QAyIhB;CACJ;wCA7NuC,8BAA8B"}

package/src/generation/markers/GridActionRuleSet.js

@@ -3,6 +3,7 @@ import { ArrayIteratorRandom } from "../../core/collection/array/iterator/ArrayI
 import { ArrayIteratorSequential } from "../../core/collection/array/iterator/ArrayIteratorSequential.js";
 import { v2_rotate } from "../../core/geom/vec2/v2_rotate.js";
 import { PI_HALF } from "../../core/math/PI_HALF.js";
+import { randomIntegerBetween } from "../../core/math/random/randomIntegerBetween.js";
 import { seededRandom } from "../../core/math/random/seededRandom.js";
 import TaskGroup from "../../core/process/task/TaskGroup.js";
 import { countTask } from "../../core/process/task/util/countTask.js";
@@ -146,7 +147,6 @@ export class GridActionRuleSet {
 
         const tMain = randomCountTask(seed, 0, sampleCount, index => {
 
-
             const sample_y = (index / sampleCountX) | 0;
             const sample_x = index % sampleCountX;
 
@@ -166,11 +166,19 @@ export class GridActionRuleSet {
 
                 const matcher = element.pattern;
 
+                let ROTATION_COUNT = 1;
+                let INITIAL_ROTATION = 0;
+
+                if (element.allowRotation) {
+                    ROTATION_COUNT = 4;
+                    // to avoid biasing rotation 0, we pick a random initial rotation; the sequence is always the same though
+                    INITIAL_ROTATION = randomIntegerBetween(random, 0, 3);
+                }
+
                 sampling_loop: for (let sampleIndex = 0; sampleIndex < patternSize;) {
                     const sampleOffsetX = pattern[sampleIndex++];
                     const sampleOffsetY = pattern[sampleIndex++];
 
-                    const ROTATION_COUNT = element.allowRotation ? 4 : 1;
 
                     // a single roll per placement attempt: whether the rule fires is decided once,
                     // the rotation scan only decides the orientation. Rolling per rotation would
@@ -178,8 +186,9 @@ export class GridActionRuleSet {
                     const roll = random();
 
                     for (let j = 0; j < ROTATION_COUNT; j++) {
+                        const rotation_index = (j + INITIAL_ROTATION) % 4;
 
-                        const rotation = j * PI_HALF;
+                        const rotation = rotation_index * PI_HALF;
 
                         v2_rotate(scratch_offset, 0, sampleOffsetX, sampleOffsetY, rotation);