@woosh/meep-engine 2.118.7 → 2.118.9

package/build/meep.module.js

@@ -54449,7 +54449,7 @@ class Color {
         return output;
     }
 }
-ex;
+
 /**
  * @deprecated use {@link Color#toArray} instead
  * @readonly
@@ -59635,7 +59635,10 @@ const AmbientOcclusionShader = function () {
  * @returns {number}
  */
 function gaussian$1(sigma, v) {
-    return Math.exp(-(v * v) / (2 * sigma * sigma));
+    const v2 = v * v;
+    const sigma2 = sigma * sigma;
+
+    return Math.exp(- v2 / (2 * sigma2));
 }
 
 /**
@@ -90948,6 +90951,10 @@ function configureThreeRenderer(webGLRenderer) {
 class GraphicsEngine {
     #debug = false;
 
+    get isGraphicsEngine(){
+        return true;
+    }
+
     /**
      *
      * @param {Camera} camera
@@ -92426,13 +92433,7 @@ class TaskGroup {
      * @returns {boolean}
      */
     addChild(child) {
-        if (this.children.indexOf(child) !== -1) {
-            return false;
-        }
-
-        this.children.push(child);
-
-        return true;
+        return array_push_if_unique(this.children, child);
     }
 
     /**
@@ -92582,7 +92583,7 @@ class TaskGroup {
      * @returns {Promise<unknown>}
      */
     promise() {
-        return Task.promise(this);
+        return new Promise((resolve, reject) => this.join(resolve, reject));
     }
 }
 
@@ -97801,139 +97802,6 @@ class SimpleLifecycle {
     }
 }
 
-class LinearValue {
-
-    /**
-     * @readonly
-     * @type {Signal}
-     */
-    onChanged = new Signal();
-
-    /**
-     *
-     * @param {number} [x = 0]
-     * @param {number} [a = 0]
-     * @param {number} [b = 1]
-     * @constructor
-     */
-    constructor(x = 0, a = 0, b = 1) {
-
-        /**
-         *
-         * @type {number}
-         */
-        this.x = x;
-        /**
-         *
-         * @type {number}
-         */
-        this.a = a;
-        /**
-         *
-         * @type {number}
-         */
-        this.b = b;
-
-    }
-
-    /**
-     *
-     * @param {LinearValue} other
-     * @returns {LinearValue}
-     */
-    copy(other) {
-        return this.set(other.x, other.a, other.b);
-    }
-
-    /**
-     *
-     * @param {number} x
-     * @param {number} a
-     * @param {number} b
-     * @returns {LinearValue}
-     */
-    set(x, a, b) {
-        this.x = x;
-        this.a = a;
-        this.b = b;
-
-        this.onChanged.dispatch(x, a, b);
-        return this;
-    }
-
-    /**
-     *
-     * @param v
-     * @returns {LinearValue}
-     */
-    addMultiplier(v) {
-        this.b += v;
-
-        this.onChanged.dispatch(this.x, this.a, this.b);
-        return this;
-    }
-
-    /**
-     *
-     * @param v
-     * @returns {LinearValue}
-     */
-    subMultiplier(v) {
-        return this.addMultiplier(-v);
-    }
-
-    /**
-     *
-     * @param v
-     * @returns {LinearValue}
-     */
-    addConstant(v) {
-        this.a += v;
-
-        this.onChanged.dispatch(this.x, this.a, this.b);
-        return this;
-    }
-
-    /**
-     *
-     * @param v
-     * @returns {LinearValue}
-     */
-    subConstant(v) {
-        return this.addConstant(-v);
-    }
-
-    /**
-     *
-     * @returns {number}
-     */
-    getValue() {
-        // y = b*x + a
-        return this.x * this.b + this.a;
-    }
-
-    /**
-     *
-     * @param {LinearValue} other
-     * @returns {boolean}
-     */
-    equals(other) {
-        return this.x === other.x && this.a === other.a && this.b === other.b;
-    }
-
-    toJSON() {
-        return {
-            x: this.x,
-            a: this.a,
-            b: this.b
-        };
-    }
-
-    fromJSON(json) {
-        this.set(json.x, json.a, json.b);
-    }
-}
-
 /**
  *
  * @param {string} string
@@ -98113,7 +97981,6 @@ function findProcessor(model) {
 }
 
 
-
 class ValueProcessor {
     /**
      * @template Container, Value
@@ -98160,7 +98027,6 @@ const processors = [
     p(isInstanceOf(ObservedBoolean), extractorGetValue, format),
     p(isInstanceOf(ObservedValue), extractorGetValue, format),
     p(isInstanceOf(ObservedString), extractorGetValue, format),
-    p(isInstanceOf(LinearValue), extractorGetValue, formatNumber),
     p(isInstanceOf(BoundedValue), extractBoundedValue, formatArray),
     p(isInstanceOf(Stat), extractorGetValue, formatNumber),
     p(isInstanceOf(Vector1), extractorGetValue, formatNumber),

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.118.7",
+  "version": "2.118.9",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/samples/generation/SampleGenerator0.js

@@ -1,73 +1,73 @@
-import { GridTaskGroup } from "../../src/generation/GridTaskGroup.js";
-import { GridCellPlacementRule } from "../../src/generation/placement/GridCellPlacementRule.js";
-import { CellMatcherGridPattern } from "../../src/generation/rules/cell/CellMatcherGridPattern.js";
-import { CellMatcherLayerBitMaskTest } from "../../src/generation/rules/CellMatcherLayerBitMaskTest.js";
-import { GridTags } from "./grid/GridTags.js";
-import { CellMatcherNot } from "../../src/generation/rules/logic/CellMatcherNot.js";
-import { GridCellActionPlaceMarker } from "../../src/generation/markers/GridCellActionPlaceMarker.js";
+import Vector3 from "../../src/core/geom/Vector3js";
+import { NumericInterval } from "../../src/core/math/interval/NumericInterval.js";
+import { CellFilterCellMatcher } from "../../src/generation/filtering/CellFilterCellMatcher.js";
+import { CellFilterCache } from "../../src/generation/filtering/numeric/CellFilterCache.js";
+import { CellFilterLiteralFloat } from "../../src/generation/filtering/numeric/CellFilterLiteralFloat.js";
+import { CellFilterAngleToNormal } from "../../src/generation/filtering/numeric/complex/CellFilterAngleToNormal.js";
+import { CellFilterGaussianBlur } from "../../src/generation/filtering/numeric/complex/CellFilterGaussianBlur.js";
+import { CellFilterSimplexNoise } from "../../src/generation/filtering/numeric/complex/CellFilterSimplexNoise.js";
+import { CellFilterAdd } from "../../src/generation/filtering/numeric/math/algebra/CellFilterAdd.js";
+import { CellFilterDivide } from "../../src/generation/filtering/numeric/math/algebra/CellFilterDivide.js";
+import { CellFilterMultiply } from "../../src/generation/filtering/numeric/math/algebra/CellFilterMultiply.js";
+import { CellFilterSubtract } from "../../src/generation/filtering/numeric/math/algebra/CellFilterSubtract.js";
+import { CellFilterClamp } from "../../src/generation/filtering/numeric/math/CellFilterClamp.js";
+import { CellFilterInverseLerp } from "../../src/generation/filtering/numeric/math/CellFilterInverseLerp.js";
+import { CellFilterLerp } from "../../src/generation/filtering/numeric/math/CellFilterLerp.js";
+import { CellFilterMax2 } from "../../src/generation/filtering/numeric/math/CellFilterMax2.js";
+import { CellFilterOneMinus } from "../../src/generation/filtering/numeric/math/CellFilterOneMinus.js";
+import { CellFilterSmoothStep } from "../../src/generation/filtering/numeric/math/CellFilterSmoothStep.js";
+import { CellFilterStep } from "../../src/generation/filtering/numeric/math/CellFilterStep.js";
+import { CellFilterCubicFunction } from "../../src/generation/filtering/numeric/math/poly/CellFilterCubicFunction.js";
+import {
+    CellFilterSampleLayerLinear
+} from "../../src/generation/filtering/numeric/sampling/CellFilterSampleLayerLinear.js";
+import { GridTaskActionRuleSet } from "../../src/generation/grid/generation/discrete/GridTaskActionRuleSet.js";
 import { GridTaskCellularAutomata } from "../../src/generation/grid/generation/discrete/GridTaskCellularAutomata.js";
-import { GridTaskActionRuleSet } from "../../src/generation/grid/generation/discrete/GridTaskCellActionRuleSet.js";
-import { GridActionRuleSet } from "../../src/generation/markers/GridActionRuleSet.js";
+import { GridTaskConnectRooms } from "../../src/generation/grid/generation/discrete/GridTaskConnectRooms.js";
 import {
     GridTaskBuildSourceDistanceMap
 } from "../../src/generation/grid/generation/discrete/layer/GridTaskBuildSourceDistanceMap.js";
-import { CellMatcherAnd } from "../../src/generation/rules/logic/CellMatcherAnd.js";
-import { GridCellActionPlaceTags } from "../../src/generation/placement/action/GridCellActionPlaceTags.js";
 import {
-    CellMatcherContainsMarkerWithinRadius
-} from "../../src/generation/rules/cell/CellMatcherContainsMarkerWithinRadius.js";
-import { mir_matcher_attack_corridor } from "./rules/mir_matcher_attack_corridor.js";
-import { mir_generator_place_bases } from "./generators/mir_generator_place_bases.js";
-import { matcher_tag_traversable_unoccupied } from "./rules/matcher_tag_traversable_unoccupied.js";
-import { mir_generator_place_starting_point } from "./generators/mir_generator_place_starting_point.js";
-import { GridTaskConnectRooms } from "../../src/generation/grid/generation/discrete/GridTaskConnectRooms.js";
-import { matcher_tag_traversable } from "./rules/matcher_tag_traversable.js";
+    GridTaskDensityMarkerDistribution
+} from "../../src/generation/grid/generation/GridTaskDensityMarkerDistribution.js";
+import { GridTaskSequence } from "../../src/generation/grid/generation/GridTaskSequence.js";
 import { GridTaskGenerateRoads } from "../../src/generation/grid/generation/road/GridTaskGenerateRoads.js";
-import { mir_generator_place_road_decorators } from "./generators/mir_generator_place_road_decorators.js";
+import { GridTaskGroup } from "../../src/generation/GridTaskGroup.js";
+import { GridActionRuleSet } from "../../src/generation/markers/GridActionRuleSet.js";
+import { GridCellActionPlaceMarker } from "../../src/generation/markers/GridCellActionPlaceMarker.js";
 import { MarkerNodeMatcherByType } from "../../src/generation/markers/matcher/MarkerNodeMatcherByType.js";
 import {
-    GridTaskDensityMarkerDistribution
-} from "../../src/generation/grid/generation/GridTaskDensityMarkerDistribution.js";
-import { CellFilterSimplexNoise } from "../../src/generation/filtering/numeric/complex/CellFilterSimplexNoise.js";
-import { NumericInterval } from "../../src/core/math/interval/NumericInterval.js";
-import { CellFilterMultiply } from "../../src/generation/filtering/numeric/math/algebra/CellFilterMultiply.js";
-import { CellFilterCellMatcher } from "../../src/generation/filtering/CellFilterCellMatcher.js";
-import { CellFilterLiteralFloat } from "../../src/generation/filtering/numeric/CellFilterLiteralFloat.js";
-import { MirGridLayers } from "./grid/MirGridLayers.js";
-import { CellFilterLerp } from "../../src/generation/filtering/numeric/math/CellFilterLerp.js";
+    MarkerNodeTransformerRecordProperty
+} from "../../src/generation/markers/transform/MarkerNodeTransformerRecordProperty.js";
+import {
+    MarkerNodeTransformerYRotateByFilter
+} from "../../src/generation/markers/transform/MarkerNodeTransformerYRotateByFilter.js";
+import { GridCellActionPlaceTags } from "../../src/generation/placement/action/GridCellActionPlaceTags.js";
 import {
     GridCellActionWriteFilterToLayer
 } from "../../src/generation/placement/action/GridCellActionWriteFilterToLayer.js";
-import { CellMatcherAny } from "../../src/generation/rules/CellMatcherAny.js";
-import { CellFilterGaussianBlur } from "../../src/generation/filtering/numeric/complex/CellFilterGaussianBlur.js";
 import { GridCellActionSequence } from "../../src/generation/placement/action/util/GridCellActionSequence.js";
-import { CellFilterStep } from "../../src/generation/filtering/numeric/math/CellFilterStep.js";
-import {
-    CellFilterSampleLayerLinear
-} from "../../src/generation/filtering/numeric/sampling/CellFilterSampleLayerLinear.js";
-import { CellFilterAngleToNormal } from "../../src/generation/filtering/numeric/complex/CellFilterAngleToNormal.js";
-import Vector3 from "../../src/core/geom/Vector3js";
-import { CellFilterOneMinus } from "../../src/generation/filtering/numeric/math/CellFilterOneMinus.js";
-import { CellFilterSmoothStep } from "../../src/generation/filtering/numeric/math/CellFilterSmoothStep.js";
-import { SampleNoise20_0 } from "./filters/SampleNoise20_0.js";
-import { SampleGroundMoistureFilter } from "./filters/SampleGroundMoistureFilter.js";
-import { GridTaskSequence } from "../../src/generation/grid/generation/GridTaskSequence.js";
-import { CellFilterSubtract } from "../../src/generation/filtering/numeric/math/algebra/CellFilterSubtract.js";
-import { CellFilterCache } from "../../src/generation/filtering/numeric/CellFilterCache.js";
-import { CellFilterInverseLerp } from "../../src/generation/filtering/numeric/math/CellFilterInverseLerp.js";
-import { CellFilterClamp } from "../../src/generation/filtering/numeric/math/CellFilterClamp.js";
+import { GridCellPlacementRule } from "../../src/generation/placement/GridCellPlacementRule.js";
 import {
-    MarkerNodeTransformerYRotateByFilter
-} from "../../src/generation/markers/transform/MarkerNodeTransformerYRotateByFilter.js";
+    CellMatcherContainsMarkerWithinRadius
+} from "../../src/generation/rules/cell/CellMatcherContainsMarkerWithinRadius.js";
+import { CellMatcherGridPattern } from "../../src/generation/rules/cell/CellMatcherGridPattern.js";
 import { GridPatternMatcherCell } from "../../src/generation/rules/cell/GridPatternMatcherCell.js";
-import {
-    MarkerNodeTransformerRecordProperty
-} from "../../src/generation/markers/transform/MarkerNodeTransformerRecordProperty.js";
-import { CellFilterAdd } from "../../src/generation/filtering/numeric/math/algebra/CellFilterAdd.js";
-import { CellFilterDivide } from "../../src/generation/filtering/numeric/math/algebra/CellFilterDivide.js";
-import { CellFilterCubicFunction } from "../../src/generation/filtering/numeric/math/poly/CellFilterCubicFunction.js";
-import { CellFilterMax2 } from "../../src/generation/filtering/numeric/math/CellFilterMax2.js";
+import { CellMatcherAny } from "../../src/generation/rules/CellMatcherAny.js";
+import { CellMatcherLayerBitMaskTest } from "../../src/generation/rules/CellMatcherLayerBitMaskTest.js";
+import { CellMatcherAnd } from "../../src/generation/rules/logic/CellMatcherAnd.js";
+import { CellMatcherNot } from "../../src/generation/rules/logic/CellMatcherNot.js";
+import { SampleGroundMoistureFilter } from "./filters/SampleGroundMoistureFilter.js";
+import { SampleNoise20_0 } from "./filters/SampleNoise20_0.js";
+import { mir_generator_place_bases } from "./generators/mir_generator_place_bases.js";
+import { mir_generator_place_road_decorators } from "./generators/mir_generator_place_road_decorators.js";
+import { mir_generator_place_starting_point } from "./generators/mir_generator_place_starting_point.js";
+import { GridTags } from "./grid/GridTags.js";
+import { MirGridLayers } from "./grid/MirGridLayers.js";
 import { matcher_not_play_area } from "./rules/matcher_not_play_area.js";
+import { matcher_tag_traversable } from "./rules/matcher_tag_traversable.js";
+import { matcher_tag_traversable_unoccupied } from "./rules/matcher_tag_traversable_unoccupied.js";
+import { mir_matcher_attack_corridor } from "./rules/mir_matcher_attack_corridor.js";
 
 export const SampleGenerator0 = new GridTaskGroup();
 

package/samples/generation/generators/interactive/mir_generator_place_buff_objects.js

@@ -1,35 +1,33 @@
-import { CellMatcherGridPattern } from "../../../../src/generation/rules/cell/CellMatcherGridPattern.js";
-import { matcher_tag_traversable_unoccupied } from "../../rules/matcher_tag_traversable_unoccupied.js";
-import { CellMatcherNot } from "../../../../src/generation/rules/logic/CellMatcherNot.js";
-import {
-    CellMatcherContainsMarkerWithinRadius
-} from "../../../../src/generation/rules/cell/CellMatcherContainsMarkerWithinRadius.js";
-import { GridCellActionPlaceTags } from "../../../../src/generation/placement/action/GridCellActionPlaceTags.js";
-import { GridTags } from "../../grid/GridTags.js";
+import { BuffObjectTypes } from "../../../../../../generator/BuffObjectTypes.js";
+import { UnlockableElementsManager } from "../../../../../../model/unlocks/UnlockableElementsManager.js";
+import { MirMarkerTypes } from "../../../../../generator/MirMarkerTypes.js";
 import { bitwiseAnd } from "../../../../src/core/binary/operations/bitwiseAnd.js";
-import { GridCellActionPlaceMarker } from "../../../../src/generation/markers/GridCellActionPlaceMarker.js";
-import { GridCellPlacementRule } from "../../../../src/generation/placement/GridCellPlacementRule.js";
-import {
-    GridTaskActionRuleSet
-} from "../../../../src/generation/grid/generation/discrete/GridTaskCellActionRuleSet.js";
+import { CellFilterLiteralFloat } from "../../../../src/generation/filtering/numeric/CellFilterLiteralFloat.js";
+import { GridTaskActionRuleSet } from "../../../../src/generation/grid/generation/discrete/GridTaskActionRuleSet.js";
 import { GridActionRuleSet } from "../../../../src/generation/markers/GridActionRuleSet.js";
+import { GridCellActionPlaceMarker } from "../../../../src/generation/markers/GridCellActionPlaceMarker.js";
 import { GridCellActionPlaceMarkerGroup } from "../../../../src/generation/markers/GridCellActionPlaceMarkerGroup.js";
-import { matcher_tag_not_traversable } from "../../rules/matcher_tag_not_traversable.js";
+import { MarkerNodeMatcherAnd } from "../../../../src/generation/markers/matcher/MarkerNodeMatcherAnd.js";
+import { MarkerNodeMatcherByType } from "../../../../src/generation/markers/matcher/MarkerNodeMatcherByType.js";
 import {
     MarkerNodeMatcherContainsTag
 } from "../../../../src/generation/markers/matcher/MarkerNodeMatcherContainsTag.js";
+import { RuleSelectionPolicyType } from "../../../../src/generation/markers/RuleSelectionPolicyType.js";
+import { GridCellActionPlaceTags } from "../../../../src/generation/placement/action/GridCellActionPlaceTags.js";
+import { GridCellActionSequence } from "../../../../src/generation/placement/action/util/GridCellActionSequence.js";
+import { GridCellPlacementRule } from "../../../../src/generation/placement/GridCellPlacementRule.js";
+import {
+    CellMatcherContainsMarkerWithinRadius
+} from "../../../../src/generation/rules/cell/CellMatcherContainsMarkerWithinRadius.js";
+import { CellMatcherGridPattern } from "../../../../src/generation/rules/cell/CellMatcherGridPattern.js";
+import { GridPatternMatcherCell } from "../../../../src/generation/rules/cell/GridPatternMatcherCell.js";
 import { CellMatcherAnd } from "../../../../src/generation/rules/logic/CellMatcherAnd.js";
-import { MarkerNodeMatcherByType } from "../../../../src/generation/markers/matcher/MarkerNodeMatcherByType.js";
+import { CellMatcherNot } from "../../../../src/generation/rules/logic/CellMatcherNot.js";
 import { CellMatcherOr } from "../../../../src/generation/rules/logic/CellMatcherOr.js";
-import { RuleSelectionPolicyType } from "../../../../src/generation/markers/RuleSelectionPolicyType.js";
-import { MarkerNodeMatcherAnd } from "../../../../src/generation/markers/matcher/MarkerNodeMatcherAnd.js";
+import { GridTags } from "../../grid/GridTags.js";
 import { MirGridLayers } from "../../grid/MirGridLayers.js";
-import { CellFilterLiteralFloat } from "../../../../src/generation/filtering/numeric/CellFilterLiteralFloat.js";
-import { MirMarkerTypes } from "../../../../../generator/MirMarkerTypes.js";
-import { GridPatternMatcherCell } from "../../../../src/generation/rules/cell/GridPatternMatcherCell.js";
-import { BuffObjectTypes } from "../../../../../../generator/BuffObjectTypes.js";
-import { UnlockableElementsManager } from "../../../../../../model/unlocks/UnlockableElementsManager.js";
-import { GridCellActionSequence } from "../../../../src/generation/placement/action/util/GridCellActionSequence.js";
+import { matcher_tag_not_traversable } from "../../rules/matcher_tag_not_traversable.js";
+import { matcher_tag_traversable_unoccupied } from "../../rules/matcher_tag_traversable_unoccupied.js";
 
 const TAG_MAJOR = 'Major Buff';
 const TAG_MINOR = 'Minor Buff';

package/samples/generation/generators/mir_generator_place_bases.js

@@ -1,40 +1,40 @@
-import { GridTaskActionRuleSet } from "../../../src/generation/grid/generation/discrete/GridTaskCellActionRuleSet.js";
-import { GridCellPlacementRule } from "../../../src/generation/placement/GridCellPlacementRule.js";
-import { CellMatcherGridPattern } from "../../../src/generation/rules/cell/CellMatcherGridPattern.js";
-import { GridActionRuleSet } from "../../../src/generation/markers/GridActionRuleSet.js";
-import { GridCellActionPlaceTags } from "../../../src/generation/placement/action/GridCellActionPlaceTags.js";
-import { GridTags } from "../grid/GridTags.js";
-import { GridCellActionPlaceMarker } from "../../../src/generation/markers/GridCellActionPlaceMarker.js";
-import { CellMatcherNot } from "../../../src/generation/rules/logic/CellMatcherNot.js";
-import {
-    CellMatcherContainsMarkerWithinRadius
-} from "../../../src/generation/rules/cell/CellMatcherContainsMarkerWithinRadius.js";
-import { matcher_tag_traversable_unoccupied } from "../rules/matcher_tag_traversable_unoccupied.js";
+import { MirMarkerTags } from "../../../../generator/MirMarkerTags.js";
+import { MirMarkerTypes } from "../../../../generator/MirMarkerTypes.js";
 import { bitwiseAnd } from "../../../src/core/binary/operations/bitwiseAnd.js";
-import { GridCellActionPlaceMarkerGroup } from "../../../src/generation/markers/GridCellActionPlaceMarkerGroup.js";
-import { MarkerNodeMatcherByType } from "../../../src/generation/markers/matcher/MarkerNodeMatcherByType.js";
-import { MirGridLayers } from "../grid/MirGridLayers.js";
+import { Transform } from "../../../src/engine/ecs/transform/Transform.js";
 import { CellFilterLiteralFloat } from "../../../src/generation/filtering/numeric/CellFilterLiteralFloat.js";
+import { GridTaskActionRuleSet } from "../../../src/generation/grid/generation/discrete/GridTaskActionRuleSet.js";
+import { MarkerNodeEmitterFromAction } from "../../../src/generation/markers/emitter/MarkerNodeEmitterFromAction.js";
 import {
     MarkerNodeEmitterGridCellAction
 } from "../../../src/generation/markers/emitter/MarkerNodeEmitterGridCellAction.js";
 import { MarkerNodeEmitterPredicated } from "../../../src/generation/markers/emitter/MarkerNodeEmitterPredicated.js";
+import { GridActionRuleSet } from "../../../src/generation/markers/GridActionRuleSet.js";
+import { GridCellActionPlaceMarker } from "../../../src/generation/markers/GridCellActionPlaceMarker.js";
+import { GridCellActionPlaceMarkerGroup } from "../../../src/generation/markers/GridCellActionPlaceMarkerGroup.js";
+import { MarkerNodeMatcherAny } from "../../../src/generation/markers/matcher/MarkerNodeMatcherAny.js";
+import { MarkerNodeMatcherByType } from "../../../src/generation/markers/matcher/MarkerNodeMatcherByType.js";
 import { GridDataNodePredicateNot } from "../../../src/generation/markers/predicate/GridDataNodePredicateNot.js";
 import {
     GridDataNodePredicateOverlaps
 } from "../../../src/generation/markers/predicate/GridDataNodePredicateOverlaps.js";
-import { MarkerNodeMatcherAny } from "../../../src/generation/markers/matcher/MarkerNodeMatcherAny.js";
-import { MarkerNodeEmitterFromAction } from "../../../src/generation/markers/emitter/MarkerNodeEmitterFromAction.js";
-import { Transform } from "../../../src/engine/ecs/transform/Transform.js";
 import {
     MarkerNodeTransformerOffsetPosition
 } from "../../../src/generation/markers/transform/MarkerNodeTransformerOffsetPosition.js";
 import {
     MarkerNodeTransformerRecordUniqueRandomEnum
 } from "../../../src/generation/markers/transform/MarkerNodeTransformerRecordUniqueRandomEnum.js";
-import { MirMarkerTypes } from "../../../../generator/MirMarkerTypes.js";
-import { MirMarkerTags } from "../../../../generator/MirMarkerTags.js";
+import { GridCellActionPlaceTags } from "../../../src/generation/placement/action/GridCellActionPlaceTags.js";
 import { GridCellActionSequence } from "../../../src/generation/placement/action/util/GridCellActionSequence.js";
+import { GridCellPlacementRule } from "../../../src/generation/placement/GridCellPlacementRule.js";
+import {
+    CellMatcherContainsMarkerWithinRadius
+} from "../../../src/generation/rules/cell/CellMatcherContainsMarkerWithinRadius.js";
+import { CellMatcherGridPattern } from "../../../src/generation/rules/cell/CellMatcherGridPattern.js";
+import { CellMatcherNot } from "../../../src/generation/rules/logic/CellMatcherNot.js";
+import { GridTags } from "../grid/GridTags.js";
+import { MirGridLayers } from "../grid/MirGridLayers.js";
+import { matcher_tag_traversable_unoccupied } from "../rules/matcher_tag_traversable_unoccupied.js";
 
 const pMatcher = new CellMatcherGridPattern();
 

package/samples/generation/generators/mir_generator_place_road_decorators.js

@@ -1,21 +1,21 @@
-import { GridTaskActionRuleSet } from "../../../src/generation/grid/generation/discrete/GridTaskCellActionRuleSet.js";
+import { CellFilterLiteralFloat } from "../../../src/generation/filtering/numeric/CellFilterLiteralFloat.js";
+import { GridTaskActionRuleSet } from "../../../src/generation/grid/generation/discrete/GridTaskActionRuleSet.js";
 import { GridActionRuleSet } from "../../../src/generation/markers/GridActionRuleSet.js";
+import { GridCellActionPlaceMarker } from "../../../src/generation/markers/GridCellActionPlaceMarker.js";
+import { MarkerNodeMatcherAny } from "../../../src/generation/markers/matcher/MarkerNodeMatcherAny.js";
+import { MarkerNodeMatcherByType } from "../../../src/generation/markers/matcher/MarkerNodeMatcherByType.js";
+import { MarkerNodeMatcherContainsTag } from "../../../src/generation/markers/matcher/MarkerNodeMatcherContainsTag.js";
 import { GridCellPlacementRule } from "../../../src/generation/placement/GridCellPlacementRule.js";
+import {
+    CellMatcherContainsMarkerWithinRadius
+} from "../../../src/generation/rules/cell/CellMatcherContainsMarkerWithinRadius.js";
 import { CellMatcherGridPattern } from "../../../src/generation/rules/cell/CellMatcherGridPattern.js";
 import { CellMatcherLayerBitMaskTest } from "../../../src/generation/rules/CellMatcherLayerBitMaskTest.js";
-import { GridTags } from "../grid/GridTags.js";
 import { CellMatcherAnd } from "../../../src/generation/rules/logic/CellMatcherAnd.js";
 import { CellMatcherNot } from "../../../src/generation/rules/logic/CellMatcherNot.js";
-import { GridCellActionPlaceMarker } from "../../../src/generation/markers/GridCellActionPlaceMarker.js";
-import { matcher_tag_traversable_unoccupied } from "../rules/matcher_tag_traversable_unoccupied.js";
-import {
-    CellMatcherContainsMarkerWithinRadius
-} from "../../../src/generation/rules/cell/CellMatcherContainsMarkerWithinRadius.js";
-import { MarkerNodeMatcherByType } from "../../../src/generation/markers/matcher/MarkerNodeMatcherByType.js";
-import { MarkerNodeMatcherContainsTag } from "../../../src/generation/markers/matcher/MarkerNodeMatcherContainsTag.js";
-import { MarkerNodeMatcherAny } from "../../../src/generation/markers/matcher/MarkerNodeMatcherAny.js";
+import { GridTags } from "../grid/GridTags.js";
 import { MirGridLayers } from "../grid/MirGridLayers.js";
-import { CellFilterLiteralFloat } from "../../../src/generation/filtering/numeric/CellFilterLiteralFloat.js";
+import { matcher_tag_traversable_unoccupied } from "../rules/matcher_tag_traversable_unoccupied.js";
 
 
 const matcher_tag_road = CellMatcherLayerBitMaskTest.from(GridTags.Road, MirGridLayers.Tags);

package/src/core/color/Color.js

@@ -700,7 +700,7 @@ export class Color {
         return output;
     }
 }
-ex
+
 /**
  * @deprecated use {@link Color#toArray} instead
  * @readonly

package/src/core/color/operations/color_darken.d.ts

@@ -0,0 +1,8 @@
+/**
+ *
+ * @param {Color} input
+ * @param {number} [amount]
+ */
+export function color_darken(input: Color, amount?: number): Color;
+import { Color } from "../Color.js";
+//# sourceMappingURL=color_darken.d.ts.map

package/src/core/color/operations/color_darken.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"color_darken.d.ts","sourceRoot":"","sources":["../../../../../src/core/color/operations/color_darken.js"],"names":[],"mappings":"AAQA;;;;GAIG;AACH,oCAHW,KAAK,WACL,MAAM,SAehB;sBAxBqB,aAAa"}

package/src/core/color/operations/color_darken.js

@@ -0,0 +1,27 @@
+import { assert } from "../../assert.js";
+import { clamp01 } from "../../math/clamp01.js";
+import { Color } from "../Color.js";
+import { linear_srgb_to_okhsv } from "../oklab/linear_srgb_to_okhsv.js";
+import { okhsv_to_linear_srgb } from "../oklab/okhsv_to_linear_srgb.js";
+
+const hsv = [0, 0, 0];
+
+/**
+ *
+ * @param {Color} input
+ * @param {number} [amount]
+ */
+export function color_darken(input, amount = 1) {
+    assert.isNumber(amount, 'amount');
+    assert.greaterThanOrEqual(amount, 0, 'amount');
+
+    const r = new Color();
+
+    linear_srgb_to_okhsv(hsv, input.r, input.g, input.b);
+
+    hsv[2] = clamp01(hsv[2] * (1 - amount));
+
+    okhsv_to_linear_srgb(r, ...hsv);
+
+    return r;
+}

package/src/core/color/operations/color_desaturate.d.ts

@@ -1,7 +1,8 @@
 /**
  *
  * @param {Color} input
- * @param {number} amount
+ * @param {number} [amount]
  */
-export function color_desaturate(input: Color, amount: number): any;
+export function color_desaturate(input: Color, amount?: number): Color;
+import { Color } from "../Color.js";
 //# sourceMappingURL=color_desaturate.d.ts.map

package/src/core/color/operations/color_desaturate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"color_desaturate.d.ts","sourceRoot":"","sources":["../../../../../src/core/color/operations/color_desaturate.js"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,uDAFW,MAAM,OAUhB"}
+{"version":3,"file":"color_desaturate.d.ts","sourceRoot":"","sources":["../../../../../src/core/color/operations/color_desaturate.js"],"names":[],"mappings":"AAQA;;;;GAIG;AACH,wCAHW,KAAK,WACL,MAAM,SAehB;sBAxBqB,aAAa"}

package/src/core/color/operations/color_desaturate.js

@@ -1,16 +1,27 @@
+import { assert } from "../../assert.js";
 import { clamp01 } from "../../math/clamp01.js";
+import { Color } from "../Color.js";
+import { linear_srgb_to_okhsv } from "../oklab/linear_srgb_to_okhsv.js";
+import { okhsv_to_linear_srgb } from "../oklab/okhsv_to_linear_srgb.js";
+
+const hsv = [0, 0, 0];
 
 /**
  *
  * @param {Color} input
- * @param {number} amount
+ * @param {number} [amount]
  */
-export function color_desaturate(input, amount) {
-    const r = input.clone();
+export function color_desaturate(input, amount=1) {
+    assert.isNumber(amount,'amount');
+    assert.greaterThanOrEqual(amount,0,'amount');
+
+    const r = new Color();
+
+    linear_srgb_to_okhsv(hsv, input.r, input.g, input.b);
 
-    const hsv = r.getHSV();
+    hsv[1] = clamp01(hsv[1] * (1 - amount));
 
-    r.setHSV(hsv.h, hsv.s * clamp01(1 - amount), hsv.v);
+    okhsv_to_linear_srgb(r, ...hsv);
 
     return r;
 }

package/src/core/color/operations/color_lighten.d.ts

@@ -0,0 +1,8 @@
+/**
+ *
+ * @param {Color} input
+ * @param {number} amount
+ */
+export function color_lighten(input: Color, amount?: number): Color;
+import { Color } from "../Color.js";
+//# sourceMappingURL=color_lighten.d.ts.map

package/src/core/color/operations/color_lighten.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"color_lighten.d.ts","sourceRoot":"","sources":["../../../../../src/core/color/operations/color_lighten.js"],"names":[],"mappings":"AAQA;;;;GAIG;AACH,qCAHW,KAAK,WACL,MAAM,SAehB;sBAxBqB,aAAa"}