@woosh/meep-engine 2.169.1 → 2.169.2

package/editor/ecs/component/editors/NumericIntervalEditor.js

@@ -2,6 +2,7 @@ import { TypeEditor } from "../TypeEditor.js";
 import EmptyView from "../../../../src/view/elements/EmptyView.js";
 import { NumberController } from "../../../view/ecs/components/common/NumberController.js";
 import LabelView from "../../../../src/view/common/LabelView.js";
+import { two_way_sync } from "./common/two_way_sync.js";
 
 export class NumericIntervalEditor extends TypeEditor {
     build(parent, field, registry) {
@@ -24,42 +25,24 @@ export class NumericIntervalEditor extends TypeEditor {
         r.addChild(new LabelView("max"))
         r.addChild(c_1);
 
-        let lock = false;
-
-        const sync_up = () => {
-            if (lock) {
-                return;
-            }
-
-            lock = true;
-
-            c_0.value.set(interval.min);
-            c_1.value.set(interval.max);
-
-            lock = false;
-        };
-
-        const sync_down = () => {
-
-            if (lock) {
-                return;
+        const { sync_up, sync_down } = two_way_sync(
+            () => {
+                c_0.value.set(interval.min);
+                c_1.value.set(interval.max);
+            },
+            () => {
+                const v0 = c_0.value.getValue();
+                const v1 = c_1.value.getValue();
+
+                if (v0 <= v1) {
+
+                    interval.set(
+                        v0,
+                        v1,
+                    );
+                }
             }
-
-            lock = true;
-
-            const v0 = c_0.value.getValue();
-            const v1 = c_1.value.getValue();
-
-            if (v0 <= v1) {
-
-                interval.set(
-                    v0,
-                    v1,
-                );
-            }
-
-            lock = false;
-        };
+        );
 
         r.on.linked.add(sync_up);
 

package/editor/ecs/component/editors/ObservedIntegerEditor.js

@@ -1,43 +1,22 @@
-import { TypeEditor } from "../TypeEditor.js";
-import { NumberController } from "../../../view/ecs/components/common/NumberController.js";
-
-export class ObservedIntegerEditor extends TypeEditor {
-    build(parent, field, registry) {
-        const instance = field.adapter.read(parent, field.name);
-        const ctrl = new NumberController();
-
-        let lock = false;
-
-        function sync_down() {
-
-            if (lock) {
-                return;
-            }
-
-            lock = true;
-
-            instance.set(ctrl.value.getValue());
-
-            lock = false;
-        }
-
-        function sync_up() {
-            if (lock) {
-                return;
-            }
-
-            lock = true;
-
-            ctrl.value.set(instance.getValue());
-
-            lock = false;
-        }
-
-        ctrl.on.linked.add(sync_up);
-
-        ctrl.value.onChanged.add(sync_down);
-        ctrl.bindSignal(instance.onChanged, sync_up);
-
-        return ctrl;
-    }
-}
+import { TypeEditor } from "../TypeEditor.js";
+import { NumberController } from "../../../view/ecs/components/common/NumberController.js";
+import { two_way_sync } from "./common/two_way_sync.js";
+
+export class ObservedIntegerEditor extends TypeEditor {
+    build(parent, field, registry) {
+        const instance = field.adapter.read(parent, field.name);
+        const ctrl = new NumberController();
+
+        const { sync_up, sync_down } = two_way_sync(
+            () => ctrl.value.set(instance.getValue()),
+            () => instance.set(ctrl.value.getValue())
+        );
+
+        ctrl.on.linked.add(sync_up);
+
+        ctrl.value.onChanged.add(sync_down);
+        ctrl.bindSignal(instance.onChanged, sync_up);
+
+        return ctrl;
+    }
+}

package/editor/ecs/component/editors/ObservedStringEditor.js

@@ -1,51 +1,34 @@
-import { TypeEditor } from "../TypeEditor.js";
-import EmptyView from "../../../../src/view/elements/EmptyView.js";
-
-export class ObservedStringEditor extends TypeEditor {
-    build(parent, field, registry) {
-
-        const ctrl = new EmptyView({
-            tag: 'input'
-        });
-
-        ctrl.attr({
-            type: 'text'
-        });
-
-        const value = field.adapter.read(parent, field.name);
-
-        let lock = false;
-
-        function sync_up() {
-            if (lock) {
-                return;
-            }
-
-            lock = true;
-
-            ctrl.el.value = value.getValue();
-
-            lock = false;
-        }
-
-        function sync_down() {
-            if (lock) {
-                return;
-            }
-
-            lock = true;
-            const str = ctrl.el.value;
-
-            value.set(str);
-
-            lock = false;
-        }
-
-        ctrl.on.linked.add(sync_up);
-        ctrl.bindSignal(value.onChanged, sync_up);
-        ctrl.el.addEventListener('input', sync_down);
-
-
-        return ctrl;
-    }
-}
+import { TypeEditor } from "../TypeEditor.js";
+import EmptyView from "../../../../src/view/elements/EmptyView.js";
+import { two_way_sync } from "./common/two_way_sync.js";
+
+export class ObservedStringEditor extends TypeEditor {
+    build(parent, field, registry) {
+
+        const ctrl = new EmptyView({
+            tag: 'input'
+        });
+
+        ctrl.attr({
+            type: 'text'
+        });
+
+        const value = field.adapter.read(parent, field.name);
+
+        const { sync_up, sync_down } = two_way_sync(
+            () => {
+                ctrl.el.value = value.getValue();
+            },
+            () => {
+                value.set(ctrl.el.value);
+            }
+        );
+
+        ctrl.on.linked.add(sync_up);
+        ctrl.bindSignal(value.onChanged, sync_up);
+        ctrl.el.addEventListener('input', sync_down);
+
+
+        return ctrl;
+    }
+}

package/editor/ecs/component/editors/common/makeV3_editor.js

@@ -1,6 +1,7 @@
 import EmptyView from "../../../../../src/view/elements/EmptyView.js";
 import { NumberController } from "../../../../view/ecs/components/common/NumberController.js";
 import LabelView from "../../../../../src/view/common/LabelView.js";
+import { two_way_sync } from "./two_way_sync.js";
 
 /**
  *
@@ -29,39 +30,20 @@ export function make_row_editor(props, value, change_signal = value.onChanged) {
         ctrls[i] = ctrl;
     }
 
-    let lock = false;
-
-    const sync_up = () => {
-        if (lock) {
-            return;
-        }
-
-        lock = true;
-
-        for (let i = 0; i < props.length; i++) {
-            const prop_name = props[i];
-
-            ctrls[i].value.set(value[prop_name]);
-        }
+    const { sync_up, sync_down } = two_way_sync(
+        () => {
+            for (let i = 0; i < props.length; i++) {
+                const prop_name = props[i];
 
+                ctrls[i].value.set(value[prop_name]);
+            }
+        },
+        () => {
+            const params = ctrls.map(c => c.value.getValue());
 
-        lock = false;
-    };
-
-    const sync_down = () => {
-
-        if (lock) {
-            return;
+            value.set.apply(value, params);
         }
-
-        lock = true;
-
-        const params = ctrls.map(c => c.value.getValue());
-
-        value.set.apply(value, params);
-
-        lock = false;
-    };
+    );
 
     r.on.linked.add(sync_up);
 

package/editor/ecs/component/editors/common/two_way_sync.js

@@ -0,0 +1,50 @@
+/**
+ * Build the pair of callbacks that keep a model and a widget in step, sharing one re-entrancy guard.
+ *
+ * Every two-way editor in this package needs the same protocol: writing the widget makes the widget
+ * announce a change, which would write the model, which announces a change, which would write the
+ * widget... The guard makes whichever direction is already running the only one that runs. It was
+ * previously hand-copied into each editor, which is how two of them ended up without it and how all
+ * of them ended up able to wedge permanently if a synchronizer threw part-way through — the lock was
+ * released by a plain assignment on the happy path only.
+ *
+ * Neither callback is invoked here; wire them up yourself (typically `view.on.linked` and the
+ * model's change signal for `sync_up`, the widget's value signal for `sync_down`).
+ *
+ * @param {function():void} up model -> widget
+ * @param {function():void} down widget -> model
+ * @returns {{sync_up:function():void, sync_down:function():void}}
+ */
+export function two_way_sync(up, down) {
+
+    let lock = false;
+
+    return {
+        sync_up() {
+            if (lock) {
+                return;
+            }
+
+            lock = true;
+
+            try {
+                up();
+            } finally {
+                lock = false;
+            }
+        },
+        sync_down() {
+            if (lock) {
+                return;
+            }
+
+            lock = true;
+
+            try {
+                down();
+            } finally {
+                lock = false;
+            }
+        }
+    };
+}

package/editor/ecs/component/editors/geom/QuaternionEditor.js

@@ -3,6 +3,7 @@ import { DEG_TO_RAD } from "../../../../../src/core/math/DEG_TO_RAD.js";
 import { RAD_TO_DEG } from "../../../../../src/core/math/RAD_TO_DEG.js";
 import { TypeEditor } from "../../TypeEditor.js";
 import { makeV3_editor } from "../common/makeV3_editor.js";
+import { two_way_sync } from "../common/two_way_sync.js";
 
 export class QuaternionEditor extends TypeEditor {
     build(parent, field, registry) {
@@ -14,42 +15,26 @@ export class QuaternionEditor extends TypeEditor {
 
         const euler = new Vector3();
 
-        let lock = false;
-        const sync_down = () => {
-            if (lock) {
-                return;
+        const { sync_up, sync_down } = two_way_sync(
+            () => {
+                const t = new Vector3();
+
+                q.toEulerAnglesXYZ(t);
+
+                euler.set(
+                    t.x * RAD_TO_DEG,
+                    t.y * RAD_TO_DEG,
+                    t.z * RAD_TO_DEG,
+                );
+            },
+            () => {
+                q.fromEulerAnglesXYZ(
+                    euler.x * DEG_TO_RAD,
+                    euler.y * DEG_TO_RAD,
+                    euler.z * DEG_TO_RAD
+                );
             }
-
-            lock = true;
-
-            q.fromEulerAnglesXYZ(
-                euler.x * DEG_TO_RAD,
-                euler.y * DEG_TO_RAD,
-                euler.z * DEG_TO_RAD
-            );
-
-            lock = false;
-        };
-
-        const sync_up = () => {
-            if (lock) {
-                return;
-            }
-
-            lock = true;
-
-            const t = new Vector3();
-
-            q.toEulerAnglesXYZ(t);
-
-            euler.set(
-                t.x * RAD_TO_DEG,
-                t.y * RAD_TO_DEG,
-                t.z * RAD_TO_DEG,
-            );
-
-            lock = false;
-        }
+        );
 
         const editor = makeV3_editor(euler);
 

package/editor/ecs/component/editors/geom/Vector1Editor.js

@@ -2,6 +2,7 @@ import { TypeEditor } from "../../TypeEditor.js";
 import { NumberController } from "../../../../view/ecs/components/common/NumberController.js";
 import Vector1 from "../../../../../src/core/geom/Vector1.js";
 import { isSubclassOf } from "../../../../../src/engine/plugin/isSubclassOf.js";
+import { two_way_sync } from "../common/two_way_sync.js";
 
 export class Vector1Editor extends TypeEditor {
     build(parent, field, registry) {
@@ -17,34 +18,10 @@ export class Vector1Editor extends TypeEditor {
         const view = new NumberController({ value: v1.getValue() });
 
 
-        let lock = false;
-
-        const sync_up = () => {
-            if (lock) {
-                return;
-            }
-
-            lock = true;
-
-            view.value.set(v1.x);
-
-            lock = false;
-        };
-
-        const sync_down = () => {
-
-            if (lock) {
-                return;
-            }
-
-            lock = true;
-
-            v1.set(
-                view.value.getValue(),
-            );
-
-            lock = false;
-        };
+        const { sync_up, sync_down } = two_way_sync(
+            () => view.value.set(v1.x),
+            () => v1.set(view.value.getValue())
+        );
 
         view.on.linked.add(sync_up);
 

package/editor/ecs/component/editors/primitive/NumberEditor.js

@@ -1,6 +1,7 @@
 import { TypeEditor } from "../../TypeEditor.js";
 import { NumberController } from "../../../../view/ecs/components/common/NumberController.js";
 import LabelView from "../../../../../src/view/common/LabelView.js";
+import { two_way_sync } from "../common/two_way_sync.js";
 
 export class NumberEditor extends TypeEditor {
     build(parent, field, registry) {
@@ -12,41 +13,24 @@ export class NumberEditor extends TypeEditor {
 
             const ctrl = new NumberController();
 
-            let lock = false;
+            const { sync_up, sync_down } = two_way_sync(
+                () => {
+                    let v = read_value();
 
-            function sync_up() {
-                if (lock) {
-                    return;
-                }
-
-                lock = true;
-
-                let v = read_value();
+                    if (Number.isNaN(v)) {
+                        v = 0;
+                    }
 
-                if (Number.isNaN(v)) {
-                    v = 0;
-                }
+                    if (typeof v !== "number") {
+                        v = v.valueOf();
+                    }
 
-                if (typeof v !== "number") {
-                    v = v.valueOf();
+                    ctrl.value.set(v);
+                },
+                () => {
+                    field.adapter.write(parent, field.name, ctrl.value.getValue());
                 }
-
-                ctrl.value.set(v);
-
-                lock = false;
-            }
-
-            function sync_down() {
-                if (lock) {
-                    return;
-                }
-
-                lock = true;
-
-                field.adapter.write(parent, field.name, ctrl.value.getValue());
-
-                lock = false;
-            }
+            );
 
             ctrl.on.linked.add(sync_up);
             ctrl.value.onChanged.add(sync_down);

package/editor/tools/paint/TerrainHeightPaintTool.js

@@ -11,34 +11,41 @@ import { TerrainPaintTool } from "./TerrainPaintTool.js";
 
 const LIMIT_VALUE = 1000;
 
+/**
+ * Scratch for the brush footprint. Both are read out into locals before any nested call, so they
+ * cannot alias.
+ * @type {Float64Array}
+ */
+const scratch_uv_rect = new Float64Array(4);
+const scratch_texel_rect = new Float64Array(4);
+
 /**
  *
  * @param {Terrain} terrain
- * @param {number} uv_x0
- * @param {number} uv_y0
- * @param {number} uv_x1
- * @param {number} uv_y1
+ * @param {Float64Array|number[]} uv_rect brush footprint in terrain UV space, `[x0, y0, x1, y1]`
  * @param {Sampler2D} marker
  * @param {number} value_delta
  * @param {number} limitMin
  * @param {number} limitMax
  * @returns {PatchTerrainHeightAction}
  */
-function make_mod_action(terrain, uv_x0, uv_y0, uv_x1, uv_y1, marker, value_delta, limitMin, limitMax) {
+function make_mod_action(terrain, uv_rect, marker, value_delta, limitMin, limitMax) {
 
     const heightMap = terrain.samplerHeight;
 
-    const h_x0 = uv_x0 * heightMap.width;
-    const h_x1 = uv_x1 * heightMap.width;
+    TerrainPaintTool.uvRectToTexelRect(scratch_texel_rect, uv_rect, heightMap.width, heightMap.height);
 
-    const h_y0 = uv_y0 * heightMap.height;
-    const h_y1 = uv_y1 * heightMap.height;
+    const h_x0 = scratch_texel_rect[0];
+    const h_y0 = scratch_texel_rect[1];
+    const h_x1 = scratch_texel_rect[2];
+    const h_y1 = scratch_texel_rect[3];
 
-    const x0 = Math.ceil(h_x0);
-    const x1 = Math.floor(h_x1);
+    TerrainPaintTool.texelRectToIntegerRect(scratch_texel_rect, scratch_texel_rect);
 
-    const y0 = Math.ceil(h_y0);
-    const y1 = Math.floor(h_y1);
+    const x0 = scratch_texel_rect[0];
+    const y0 = scratch_texel_rect[1];
+    const x1 = scratch_texel_rect[2];
+    const y1 = scratch_texel_rect[3];
 
     const action = new PatchTerrainHeightAction(terrain, x0, y0, (x1 - x0), (y1 - y0));
 
@@ -175,23 +182,7 @@ export class TerrainHeightPaintTool extends TerrainPaintTool {
          */
         const terrain = this.terrain;
 
-        const brushPosition = this.__brushPosition;
-        const brushSize = this.settings.brushSize;
-
-        const terrainSize = terrain.size;
-
-        const uv_x = brushPosition.x / terrainSize.x;
-        const uv_y = brushPosition.y / terrainSize.y;
-
-        const uv_w = brushSize / terrainSize.x;
-        const uv_h = brushSize / terrainSize.y;
-
-        const uv_x0 = uv_x - uv_w / 2;
-        const uv_x1 = uv_x + uv_w / 2;
-
-        const uv_y0 = uv_y - uv_h / 2;
-        const uv_y1 = uv_y + uv_h / 2;
-
+        this.computeBrushUVRect(scratch_uv_rect);
 
         const marker = this.settings.marker;
 
@@ -202,7 +193,7 @@ export class TerrainHeightPaintTool extends TerrainPaintTool {
         const limitMin = this.settings.limitMin;
         const limitMax = this.settings.limitMax;
 
-        const action = make_mod_action(terrain, uv_x0, uv_y0, uv_x1, uv_y1, marker, value_delta, limitMin, limitMax);
+        const action = make_mod_action(terrain, scratch_uv_rect, marker, value_delta, limitMin, limitMax);
 
         this.editor.actions.do(action);