@woosh/meep-engine 2.118.8 → 2.118.11

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

@@ -3,9 +3,6 @@ import {
 } from "../../../../src/core/collection/array/typed/typedArrayConstructorByInstance.js";
 import { FrameRunner } from "../../../../src/engine/graphics/FrameRunner.js";
 import html_canvas_to_sampler2d from "../../../../src/engine/graphics/texture/html_canvas_to_sampler2d.js";
-import {
-    copy_Sampler2D_channel_data
-} from "../../../../src/engine/graphics/texture/sampler/copy_Sampler2D_channel_data.js";
 import { downloadSampler2DAsPNG } from "../../../../src/engine/graphics/texture/sampler/downloadSamplerAsPNG.js";
 import { sampler2d_scale } from "../../../../src/engine/graphics/texture/sampler/resize/sampler2d_scale.js";
 import { Sampler2D } from "../../../../src/engine/graphics/texture/sampler/Sampler2D.js";
@@ -13,6 +10,7 @@ import {
     sampler2d_compute_texel_value_conversion_scale_to_uint8
 } from "../../../../src/engine/graphics/texture/sampler/sampler2d_compute_texel_value_conversion_scale_to_uint8.js";
 import sampler2D2Canvas from "../../../../src/engine/graphics/texture/sampler/sampler2d_to_html_canvas.js";
+import { sampler2d_transfer_data } from "../../../../src/engine/graphics/texture/sampler/sampler2d_transfer_data.js";
 import { MouseEvents } from "../../../../src/engine/input/devices/events/MouseEvents.js";
 import { CanvasView } from "../../../../src/view/elements/CanvasView.js";
 import EmptyView from "../../../../src/view/elements/EmptyView.js";
@@ -102,7 +100,7 @@ function enable_drop(parent, element, field) {
 
                 sampler.resize(width, height, false);
 
-                copy_Sampler2D_channel_data(file_data_sampler, sampler);
+                sampler2d_transfer_data(file_data_sampler, sampler);
             };
 
 

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.118.8",
+  "version": "2.118.11",
   "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/samples/terrain/editor.js

@@ -16,10 +16,10 @@ import { EngineConfiguration } from "../../src/engine/EngineConfiguration.js";
 import { EngineHarness } from "../../src/engine/EngineHarness.js";
 import { load_and_set_cubemap_v0 } from "../../src/engine/graphics/load_and_set_cubemap_v0.js";
 import CheckersTextureURI from "../../src/engine/graphics/texture/CheckersTextureURI.js";
-import { copy_Sampler2D_channel_data } from "../../src/engine/graphics/texture/sampler/copy_Sampler2D_channel_data.js";
 import { sampler2d_scale } from "../../src/engine/graphics/texture/sampler/resize/sampler2d_scale.js";
 import { Sampler2D } from "../../src/engine/graphics/texture/sampler/Sampler2D.js";
 import sampler2d_to_html_canvas from "../../src/engine/graphics/texture/sampler/sampler2d_to_html_canvas.js";
+import { sampler2d_transfer_data } from "../../src/engine/graphics/texture/sampler/sampler2d_transfer_data.js";
 import { NativeListController } from "../../src/view/controller/controls/NativeListController.js";
 import { CanvasView } from "../../src/view/elements/CanvasView.js";
 import EmptyView from "../../src/view/elements/EmptyView.js";
@@ -120,12 +120,12 @@ class TextureLayerEditor {
                 const layer = layers.get(this.index);
 
                 target.resize(layer.diffuse.width, layer.diffuse.height);
-                copy_Sampler2D_channel_data(layer.diffuse, target);
+                sampler2d_transfer_data(layer.diffuse, target);
             },
             write: (source) => {
                 const layer = this.__terrain.layers.get(this.index);
 
-                copy_Sampler2D_channel_data(source, layer.diffuse);
+                sampler2d_transfer_data(source, layer.diffuse);
 
                 this.__terrain.layers.writeLayerDataIntoTexture(this.index);
             },

package/src/core/bvh2/binary/2/BinaryUint32BVH.d.ts

@@ -110,31 +110,13 @@ export class BinaryUint32BVH {
      */
     readLeafPayload(leaf_index: number): number;
     compute_total_surface_area(): number;
-    /**
-     *
-     * @param {number} a address
-     * @param {number} b address
-     * @param {number} c address
-     * @returns {number}
-     * @private
-     */
-    private __compute_bounds_area_of_3_boxes;
-    /**
-     *
-     * @param {number} a
-     * @param {number} b
-     * @returns {number}
-     * @private
-     */
-    private __fitness_function_should_swap_leaves_sah;
-    sort_bubble_sah(): void;
     /**
      * Sort leaf nodes according to their morton codes
      * @param {number[]} bounds
      */
     sort_morton(bounds: number[]): void;
     /**
-     *
+     * Does not update intermediate node bounds
      * @param {number} i
      * @param {number} j
      * @private

package/src/core/bvh2/binary/2/BinaryUint32BVH.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BinaryUint32BVH.d.ts","sourceRoot":"","sources":["../../../../../../src/core/bvh2/binary/2/BinaryUint32BVH.js"],"names":[],"mappings":"AAcA;;;GAGG;AACH,gCAFU,MAAM,CAEmB;AAEnC;;;;GAIG;AACH,mCAFU,MAAM,CAEsB;AACtC;;;GAGG;AACH,iCAFU,MAAM,CAEoB;AAiDpC;IACI;;;;OAIG;IACH,sBAAc;IAEd;;;;OAIG;IACH,gCAAe;IAEf;;;;OAIG;IACH,+BAAc;IAEd;;;;OAIG;IACH,4BAAwB;IAExB;;;;OAIG;IACH,0BAAsB;IA0CtB;;;OAGG;IACH,2BAOC;IAED,wBAEC;IAnDD;;;OAGG;IACH,oBAFa,MAAM,CAIlB;IAED,2BAEC;IAED,gCAEC;IAED,8BAEC;IAED;;;OAGG;IACH,uBAFa,MAAM,CAIlB;IAED,4BAEC;IAED,0BAEC;IAmBD;;;;OAIG;IACH,2BAHW,MAAM,GACJ,MAAM,CAalB;IAED,6BASC;IAED;;;OAGG;IACH,oBAFW,MAAM,QAgBhB;IAED;;;;OAIG;IACH,sBAHW,MAAM,GACL,MAAM,CASjB;IAED;;;;;;;;;;OAUG;IACH,mBATW,MAAM,WACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,QAoChB;IAED;;;;;OAKG;IACH,oBAJW,MAAM,eACN,MAAM,EAAE,GAAC,YAAY,sBACrB,MAAM,QAIhB;IAED;;;;OAIG;IACH,4BAHW,MAAM,GACJ,MAAM,CAQlB;IAED,qCAoBC;IAED;;;;;;;OAOG;IACH,yCAYC;IAED;;;;;;OAMG;IACH,kDAuBC;IAED,wBAUC;IAGD;;;OAGG;IACH,oBAFW,MAAM,EAAE,QAkElB;IAED;;;;;OAKG;IACH,sBAUC;IAED;;OAEG;IACH,cAsEC;CACJ"}
+{"version":3,"file":"BinaryUint32BVH.d.ts","sourceRoot":"","sources":["../../../../../../src/core/bvh2/binary/2/BinaryUint32BVH.js"],"names":[],"mappings":"AAUA;;;GAGG;AACH,gCAFU,MAAM,CAEmB;AAEnC;;;;GAIG;AACH,mCAFU,MAAM,CAEsB;AACtC;;;GAGG;AACH,iCAFU,MAAM,CAEoB;AAiDpC;IACI;;;;OAIG;IACH,sBAAc;IAEd;;;;OAIG;IACH,gCAAe;IAEf;;;;OAIG;IACH,+BAAc;IAEd;;;;OAIG;IACH,4BAAwB;IAExB;;;;OAIG;IACH,0BAAsB;IA0CtB;;;OAGG;IACH,2BAOC;IAED,wBAEC;IAnDD;;;OAGG;IACH,oBAFa,MAAM,CAIlB;IAED,2BAEC;IAED,gCAEC;IAED,8BAEC;IAED;;;OAGG;IACH,uBAFa,MAAM,CAIlB;IAED,4BAEC;IAED,0BAEC;IAmBD;;;;OAIG;IACH,2BAHW,MAAM,GACJ,MAAM,CAalB;IAED,6BASC;IAED;;;OAGG;IACH,oBAFW,MAAM,QAgBhB;IAED;;;;OAIG;IACH,sBAHW,MAAM,GACL,MAAM,CASjB;IAED;;;;;;;;;;OAUG;IACH,mBATW,MAAM,WACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,QAoChB;IAED;;;;;OAKG;IACH,oBAJW,MAAM,eACN,MAAM,EAAE,GAAC,YAAY,sBACrB,MAAM,QAIhB;IAED;;;;OAIG;IACH,4BAHW,MAAM,GACJ,MAAM,CAQlB;IAED,qCAoBC;IAED;;;OAGG;IACH,oBAFW,MAAM,EAAE,QAqElB;IAED;;;;;OAKG;IACH,sBAUC;IAED;;OAEG;IACH,cAsEC;CACJ"}

package/src/core/bvh2/binary/2/BinaryUint32BVH.js

@@ -7,10 +7,6 @@ import { aabb3_array_combine } from "../../../geom/3d/aabb/aabb3_array_combine.j
 import { aabb3_array_set } from "../../../geom/3d/aabb/aabb3_array_set.js";
 import { aabb3_compute_half_surface_area } from "../../../geom/3d/aabb/aabb3_compute_half_surface_area.js";
 import { v3_morton_encode_bounded } from "../../../geom/3d/morton/v3_morton_encode_bounded.js";
-import { max2 } from "../../../math/max2.js";
-import { max3 } from "../../../math/max3.js";
-import { min2 } from "../../../math/min2.js";
-import { min3 } from "../../../math/min3.js";
 
 /**
  * @readonly
@@ -325,73 +321,6 @@ export class BinaryUint32BVH {
         return result;
     }
 
-    /**
-     *
-     * @param {number} a address
-     * @param {number} b address
-     * @param {number} c address
-     * @returns {number}
-     * @private
-     */
-    __compute_bounds_area_of_3_boxes(a, b, c) {
-        const float32 = this.__data_float32;
-
-        const x0 = min3(float32[a + 0], float32[b + 0], float32[c + 0]);
-        const y0 = min3(float32[a + 1], float32[b + 1], float32[c + 1]);
-        const z0 = min3(float32[a + 2], float32[b + 2], float32[c + 2]);
-
-        const x1 = max3(float32[a + 3], float32[b + 3], float32[c + 3]);
-        const y1 = max3(float32[a + 4], float32[b + 4], float32[c + 4]);
-        const z1 = max3(float32[a + 5], float32[b + 5], float32[c + 5]);
-
-        return aabb3_compute_half_surface_area(x0, y0, z0, x1, y1, z1);
-    }
-
-    /**
-     *
-     * @param {number} a
-     * @param {number} b
-     * @returns {number}
-     * @private
-     */
-    __fitness_function_should_swap_leaves_sah(a, b) {
-        const a_0 = max2(a - 1, 0);
-        const a_1 = min2(a + 1, this.__node_count_leaf - 1);
-
-        const leaf_block_offset = this.getLeafBlockAddress();
-
-        const a_c_address = a * BVH_LEAF_NODE_SIZE + leaf_block_offset;
-        const a_0_address = a_0 * BVH_LEAF_NODE_SIZE + leaf_block_offset;
-        const a_1_address = a_1 * BVH_LEAF_NODE_SIZE + leaf_block_offset;
-
-
-        const b_0 = max2(b - 1, 0);
-        const b_1 = min2(b + 1, this.__node_count_leaf - 1);
-
-        const b_c_address = b * BVH_LEAF_NODE_SIZE + leaf_block_offset;
-        const b_0_address = b_0 * BVH_LEAF_NODE_SIZE + leaf_block_offset;
-        const b_1_address = b_1 * BVH_LEAF_NODE_SIZE + leaf_block_offset;
-
-
-        const current_area = this.__compute_bounds_area_of_3_boxes(a_0_address, a_c_address, a_1_address) + this.__compute_bounds_area_of_3_boxes(b_0_address, b_c_address, b_1_address);
-        const swap_area = this.__compute_bounds_area_of_3_boxes(a_0_address, b_c_address, a_1_address) + this.__compute_bounds_area_of_3_boxes(b_0_address, a_c_address, b_1_address);
-
-        return current_area - swap_area;
-    }
-
-    sort_bubble_sah() {
-        const n = this.__node_count_leaf;
-
-        for (let i = 0; i < n; i++) {
-            for (let j = i + 1; j < n; j++) {
-                if (this.__fitness_function_should_swap_leaves_sah(i, j) > 0) {
-                    this.__swap_leaves(i, j);
-                }
-            }
-        }
-    }
-
-
     /**
      * Sort leaf nodes according to their morton codes
      * @param {number[]} bounds
@@ -405,15 +334,17 @@ export class BinaryUint32BVH {
             return;
         }
 
-        let stackPointer = 2;
+        const stack_top = stack.pointer;
+
+        let stackPointer = stack_top;
         let i, j;
 
-        stack[0] = 0; // first node
-        stack[1] = this.__node_count_leaf - 1; // last node
+        stack[stackPointer++] = 0; // first node
+        stack[stackPointer++] = this.__node_count_leaf - 1; // last node
 
         const data = this.__data_float32;
 
-        while (stackPointer > 0) {
+        while (stackPointer > stack_top) {
             stackPointer -= 2;
 
             const right = stack[stackPointer + 1];
@@ -422,14 +353,15 @@ export class BinaryUint32BVH {
             i = left;
             j = right;
 
-            const pivotIndex = (left + right) >> 1;
+            const pivot_index = (left + right) >> 1;
 
-            const pivot_address = pivotIndex * BVH_LEAF_NODE_SIZE + leaf_block_address;
+            const pivot_address = pivot_index * BVH_LEAF_NODE_SIZE + leaf_block_address;
 
             const pivot = build_morton(data, pivot_address, bounds);
 
             /* partition */
             while (i <= j) {
+
                 while (build_morton(data, i * BVH_LEAF_NODE_SIZE + leaf_block_address, bounds) < pivot) {
                     i++;
                 }
@@ -463,7 +395,7 @@ export class BinaryUint32BVH {
     }
 
     /**
-     *
+     * Does not update intermediate node bounds
      * @param {number} i
      * @param {number} j
      * @private

package/src/core/bvh2/bvh3/build_triangle_morton_codes.js

@@ -1,4 +1,4 @@
-import morton from "../../geom/3d/morton/Morton.js";
+import morton from "../../geom/3d/morton/v3_morton_encode.js";
 
 /**
  * Compute morton codes for each triangle

package/src/core/bvh2/bvh3/ebvh_build_for_geometry_morton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ebvh_build_for_geometry_morton.d.ts","sourceRoot":"","sources":["../../../../../src/core/bvh2/bvh3/ebvh_build_for_geometry_morton.js"],"names":[],"mappings":"AAWA;;;;;;;;;GASG;AACH,sEANW,MAAM,EAAE,GAAC,WAAW,GAAC,WAAW,kBAChC,MAAM,EAAE,GAAC,YAAY,GAAC,YAAY,iBAClC,WAAW,WACX,KAAK,YACL,MAAM,QAiHhB;sBAjIqB,6BAA6B"}
+{"version":3,"file":"ebvh_build_for_geometry_morton.d.ts","sourceRoot":"","sources":["../../../../../src/core/bvh2/bvh3/ebvh_build_for_geometry_morton.js"],"names":[],"mappings":"AAWA;;;;;;;;;GASG;AACH,sEANW,MAAM,EAAE,GAAC,WAAW,GAAC,WAAW,kBAChC,MAAM,EAAE,GAAC,YAAY,GAAC,YAAY,iBAClC,WAAW,WACX,KAAK,YACL,MAAM,QAmHhB;sBAnIqB,6BAA6B"}

package/src/core/bvh2/bvh3/ebvh_build_for_geometry_morton.js

@@ -50,16 +50,11 @@ export function ebvh_build_for_geometry_morton(
 
     const node_total_count = node_leaf_count + node_bin_count;
 
-    const nodes = new Uint32Array(node_total_count);
 
     // skip allocation calls, allocate exactly as many nodes as we need
     bvh.node_capacity = node_total_count;
     bvh.__size = node_total_count;
 
-    for (let i = 0; i < node_total_count; i++) {
-        // store nodes in reverse order so that top-level nodes end up on top
-        nodes[i] = (node_total_count - 1) - i;
-    }
 
 
     // indices of triangles, but sorted by morton codes
@@ -102,7 +97,7 @@ export function ebvh_build_for_geometry_morton(
 
     // assign leaves
     for (let i = 0; i < tri_count; i++) {
-        const node = nodes[i];
+        const node_id = (node_total_count - 1) - i;
 
         const triangle_index = sorted_triangle_order[i];
 
@@ -112,7 +107,7 @@ export function ebvh_build_for_geometry_morton(
         const b_index = index_array[triangle_index3 + 1];
         const c_index = index_array[triangle_index3 + 2];
 
-        const node_address = ELEMENT_WORD_COUNT * node;
+        const node_address = ELEMENT_WORD_COUNT * node_id;
 
         aabb3_compute_from_triangle(
             bvh_float32, node_address,
@@ -124,6 +119,13 @@ export function ebvh_build_for_geometry_morton(
         bvh_uint32[node_address + COLUMN_HEIGHT] = 0;
     }
 
+
+    const nodes = new Uint32Array(node_total_count);
+    for (let i = 0; i < node_total_count; i++) {
+        // store nodes in reverse order so that top-level nodes end up on top
+        nodes[i] = (node_total_count - 1) - i;
+    }
+
     // record newly generated nodes as "unprocessed"
     const unprocessed_nodes = new Uint32Array(tri_count);
     array_copy(nodes, 0, unprocessed_nodes, 0, tri_count);

package/src/core/collection/array/isArrayEqualStrict.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isArrayEqualStrict.d.ts","sourceRoot":"","sources":["../../../../../src/core/collection/array/isArrayEqualStrict.js"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,sCAJW,QAAM,UAAU,KAChB,QAAM,UAAU,GACd,OAAO,CAoBnB"}
+{"version":3,"file":"isArrayEqualStrict.d.ts","sourceRoot":"","sources":["../../../../../src/core/collection/array/isArrayEqualStrict.js"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,sCAJW,QAAM,UAAU,GAAC,YAAY,KAC7B,QAAM,UAAU,GAAC,YAAY,GAC3B,OAAO,CAoBnB"}

package/src/core/collection/array/isArrayEqualStrict.js

@@ -1,7 +1,7 @@
 /**
  *
- * @param {Array|Uint8Array} a
- * @param {Array|Uint8Array} b
+ * @param {Array|Uint8Array|Float32Array} a
+ * @param {Array|Uint8Array|Float32Array} b
  * @returns {boolean}
  */
 export function isArrayEqualStrict(a, b) {

package/src/core/collection/array/iterator/ArrayIteratorSequential.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArrayIteratorSequential.d.ts","sourceRoot":"","sources":["../../../../../../src/core/collection/array/iterator/ArrayIteratorSequential.js"],"names":[],"mappings":"AAEA;IACI,cAIC;IADG,YAAY;IAGhB,4BAIC;IAED,wBAcC;CACJ;sCA9BqC,4BAA4B"}
+{"version":3,"file":"ArrayIteratorSequential.d.ts","sourceRoot":"","sources":["../../../../../../src/core/collection/array/iterator/ArrayIteratorSequential.js"],"names":[],"mappings":"AAEA;;IAGI,YAAQ;IAGR,4BAIC;IAED,wBAcC;CACJ;sCA7BqC,4BAA4B"}