@woosh/meep-engine 2.39.28 → 2.39.31

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (31) hide show
  1. package/core/bvh2/BVHTasks.js +1 -1
  2. package/core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy.d.ts +3 -0
  3. package/core/process/executor/ConcurrentExecutor.d.ts +4 -0
  4. package/core/process/executor/ConcurrentExecutor.js +28 -4
  5. package/core/process/executor/ConcurrentExecutor.spec.js +1 -1
  6. package/core/process/task/Task.d.ts +11 -1
  7. package/core/process/task/Task.js +1 -1
  8. package/core/process/task/TaskGroup.d.ts +2 -2
  9. package/core/process/task/TaskSignal.d.ts +6 -0
  10. package/core/process/task/TaskSignal.js +1 -3
  11. package/core/process/task/TaskUtils.js +1 -1
  12. package/editor/process/symbolic/makeGridPositionSymbolDisplay.js +1 -1
  13. package/engine/ecs/foliage/ecs/InstancedMeshUtils.js +1 -1
  14. package/engine/ecs/storage/BinaryBufferDeSerializer.js +1 -1
  15. package/engine/ecs/terrain/ecs/splat/SplatMapOptimizer.js +1 -1
  16. package/engine/ecs/terrain/util/loadVisibleTerrainTiles.js +1 -1
  17. package/engine/graphics/ecs/compileAllMaterials.js +1 -1
  18. package/engine/graphics/ecs/mesh/createTaskWaitForMeshesToLoad.js +1 -1
  19. package/engine/graphics/ecs/mesh-v2/ShadedGeometrySystem.d.ts +3 -0
  20. package/engine/graphics/ecs/mesh-v2/ShadedGeometrySystem.js +11 -3
  21. package/engine/intelligence/optimization/OptimizationTask.js +1 -1
  22. package/engine/knowledge/database/StaticKnowledgeDataTable.js +1 -1
  23. package/generation/grid/generation/GridTaskApplyActionToCells.js +1 -1
  24. package/generation/grid/generation/GridTaskDensityMarkerDistribution.js +1 -1
  25. package/generation/grid/generation/GridTaskExecuteRuleTimes.js +1 -1
  26. package/generation/grid/generation/discrete/GridTaskConnectRooms.js +1 -1
  27. package/generation/grid/generation/discrete/layer/GridTaskBuildSourceDistanceMap.js +1 -1
  28. package/generation/markers/actions/MarkerNodeProcessingRuleSet.js +1 -1
  29. package/generation/theme/ThemeEngine.js +1 -1
  30. package/package.json +1 -1
  31. package/view/tooltip/TooltipManager.js +1 -1
@@ -1,6 +1,6 @@
1
1
  import { RingBuffer } from "../collection/RingBuffer.js";
2
2
  import Task from "../process/task/Task.js";
3
- import TaskSignal from "../process/task/TaskSignal.js";
3
+ import { TaskSignal } from "../process/task/TaskSignal.js";
4
4
  import { optimize } from "./transform/RotationOptimizer.js";
5
5
 
6
6
 
@@ -0,0 +1,3 @@
1
+ export class ExplicitBinaryBoundingVolumeHierarchy {
2
+
3
+ }
@@ -9,4 +9,8 @@ export default class ConcurrentExecutor {
9
9
  run(t: Task): void
10
10
 
11
11
  runMany(tasks: Task[]): void
12
+
13
+ removeGroup(t:TaskGroup):void
14
+
15
+ removeTask():boolean
12
16
  }
@@ -5,10 +5,18 @@ import { assert } from "../../assert.js";
5
5
  import Signal from "../../events/signal/Signal.js";
6
6
  import { IllegalStateException } from "../../fsm/exceptions/IllegalStateException.js";
7
7
  import { objectKeyByValue } from "../../model/object/objectKeyByValue.js";
8
- import TaskSignal from "../task/TaskSignal.js";
8
+ import { TaskSignal } from "../task/TaskSignal.js";
9
9
  import TaskState from "../task/TaskState.js";
10
10
  import { clamp } from "../../math/clamp.js";
11
11
 
12
+ /**
13
+ *
14
+ * @param {TaskGroup|Task} t
15
+ * @returns {boolean}
16
+ */
17
+ function isGroup(t) {
18
+ return t.children instanceof Array;
19
+ }
12
20
 
13
21
  /**
14
22
  * @class
@@ -110,9 +118,6 @@ class ConcurrentExecutor {
110
118
  signalFailure(reason);
111
119
  }
112
120
 
113
- function isGroup(t) {
114
- return t.children instanceof Array;
115
- }
116
121
 
117
122
  if (numChildren > 0) {
118
123
  taskGroup.state.set(TaskState.RUNNING);
@@ -133,6 +138,25 @@ class ConcurrentExecutor {
133
138
  }
134
139
  }
135
140
 
141
+ /**
142
+ *
143
+ * @param {TaskGroup} group
144
+ */
145
+ removeGroup(group) {
146
+ const children = group.children;
147
+ const n = children.length;
148
+
149
+ for (let i = 0; i < n; i++) {
150
+ const child = children[i];
151
+
152
+ if (isGroup(child)) {
153
+ this.removeGroup(child);
154
+ } else {
155
+ this.removeTask(child);
156
+ }
157
+ }
158
+ }
159
+
136
160
  /**
137
161
  *
138
162
  * @param {Task} task
@@ -1,7 +1,7 @@
1
1
  import { jest } from "@jest/globals";
2
2
  import Task from "../task/Task.js"
3
3
  import TaskGroup from "../task/TaskGroup.js";
4
- import TaskSignal from "../task/TaskSignal.js";
4
+ import { TaskSignal } from "../task/TaskSignal.js";
5
5
  import TaskState from "../task/TaskState.js";
6
6
  import { emptyTask, failingTask } from "../task/TaskUtils.js";
7
7
  import ConcurrentExecutor from "./ConcurrentExecutor.js";
@@ -1,5 +1,15 @@
1
1
  import {ITask} from "./ITask";
2
+ import {TaskSignal} from "./TaskSignal";
2
3
 
3
4
  export default class Task extends ITask {
4
- readonly isTask:boolean
5
+ constructor(opt: {
6
+ name: string,
7
+ initializer?: () => any,
8
+ cycleFunction: () => TaskSignal,
9
+ computeProgress?: () => number
10
+ dependencies?: ITask[],
11
+ estimatedDuration?: number
12
+ })
13
+
14
+ readonly isTask: boolean
5
15
  }
@@ -7,7 +7,7 @@ import { assert } from "../../assert.js";
7
7
  import Signal from "../../events/signal/Signal.js";
8
8
  import { noop, returnZero } from "../../function/Functions.js";
9
9
  import ObservedInteger from "../../model/ObservedInteger.js";
10
- import TaskSignal from "./TaskSignal.js";
10
+ import { TaskSignal } from "./TaskSignal.js";
11
11
  import TaskState from "./TaskState.js";
12
12
 
13
13
 
@@ -1,5 +1,5 @@
1
1
  import {ITask} from "./ITask";
2
2
 
3
- export default class TaskGroup extends ITask{
4
-
3
+ export default class TaskGroup extends ITask {
4
+ constructor(subtasks: ITask[], name?: string)
5
5
  }
@@ -0,0 +1,6 @@
1
+ export enum TaskSignal{
2
+ EndSuccess,
3
+ EndFailure,
4
+ Continue,
5
+ Yield
6
+ }
@@ -7,11 +7,9 @@
7
7
  * @readonly
8
8
  * @enum {number}
9
9
  */
10
- const TaskSignal = {
10
+ export const TaskSignal = {
11
11
  EndSuccess: 0,
12
12
  EndFailure: 1,
13
13
  Continue: 2,
14
14
  Yield: 3
15
15
  };
16
-
17
- export default TaskSignal;
@@ -4,7 +4,7 @@
4
4
  import { randomizeArrayElementOrder } from "../../collection/ArrayUtils.js";
5
5
  import { seededRandom } from "../../math/random/seededRandom.js";
6
6
  import Task from "./Task.js";
7
- import TaskSignal from "./TaskSignal.js";
7
+ import { TaskSignal } from "./TaskSignal.js";
8
8
  import { clamp01 } from "../../math/clamp01.js";
9
9
 
10
10
  /**
@@ -1,7 +1,7 @@
1
1
  import { max2 } from "../../../core/math/max2.js";
2
2
  import { min2 } from "../../../core/math/min2.js";
3
3
  import Task from "../../../core/process/task/Task.js";
4
- import TaskSignal from "../../../core/process/task/TaskSignal.js";
4
+ import { TaskSignal } from "../../../core/process/task/TaskSignal.js";
5
5
  import EntityBuilder from "../../../engine/ecs/EntityBuilder.js";
6
6
  import { BufferGeometry, Float32BufferAttribute, Line, LineBasicMaterial } from "three";
7
7
  import Renderable from "../../../engine/ecs/components/Renderable.js";
@@ -6,7 +6,7 @@ import { InstancedMeshComponent } from "./InstancedMeshComponent.js";
6
6
  import { InstancedFoliage } from "../InstancedFoliage.js";
7
7
  import { buildTreeOptimizationTask } from "../../../../core/bvh2/BVHTasks.js";
8
8
  import Task from "../../../../core/process/task/Task.js";
9
- import TaskSignal from "../../../../core/process/task/TaskSignal.js";
9
+ import { TaskSignal } from "../../../../core/process/task/TaskSignal.js";
10
10
  import { countTask, promiseTask } from "../../../../core/process/task/TaskUtils.js";
11
11
  import { assert } from "../../../../core/assert.js";
12
12
  import { InstancedMeshLayer } from "./InstancedMeshLayer.js";
@@ -1,6 +1,6 @@
1
1
  import { emptyTask } from "../../../core/process/task/TaskUtils.js";
2
2
  import Task from "../../../core/process/task/Task.js";
3
- import TaskSignal from "../../../core/process/task/TaskSignal.js";
3
+ import { TaskSignal } from "../../../core/process/task/TaskSignal.js";
4
4
  import { assert } from "../../../core/assert.js";
5
5
  import { BinaryCollectionDeSerializer } from "./binary/collection/BinaryCollectionDeSerializer.js";
6
6
  import { BinaryObjectSerializationAdapter } from "./binary/object/BinaryObjectSerializationAdapter.js";
@@ -7,7 +7,7 @@ import { validateGraphColoring } from "../../../../../core/graph/coloring/valida
7
7
  import ConcurrentExecutor from "../../../../../core/process/executor/ConcurrentExecutor.js";
8
8
  import Task from "../../../../../core/process/task/Task.js";
9
9
  import { actionTask, countTask } from "../../../../../core/process/task/TaskUtils.js";
10
- import TaskSignal from "../../../../../core/process/task/TaskSignal.js";
10
+ import { TaskSignal } from "../../../../../core/process/task/TaskSignal.js";
11
11
 
12
12
  /**
13
13
  * We convert splat mapping into a graph of connecting material patches and solve the overlaps as a "Graph Coloring" problem
@@ -4,7 +4,7 @@ import { obtainTerrain } from "./obtainTerrain.js";
4
4
  import { assert } from "../../../../core/assert.js";
5
5
  import TerrainSystem from "../ecs/TerrainSystem.js";
6
6
  import Task from "../../../../core/process/task/Task.js";
7
- import TaskSignal from "../../../../core/process/task/TaskSignal.js";
7
+ import { TaskSignal } from "../../../../core/process/task/TaskSignal.js";
8
8
 
9
9
  /**
10
10
  *
@@ -1,6 +1,6 @@
1
1
  import { Mesh, PlaneBufferGeometry } from "three";
2
2
  import Task from "../../../core/process/task/Task.js";
3
- import TaskSignal from "../../../core/process/task/TaskSignal.js";
3
+ import { TaskSignal } from "../../../core/process/task/TaskSignal.js";
4
4
  import { collectIteratorValueToArray } from "../../../core/collection/IteratorUtils.js";
5
5
  import { clamp01 } from "../../../core/math/clamp01.js";
6
6
 
@@ -1,7 +1,7 @@
1
1
  import { max2 } from "../../../../core/math/max2.js";
2
2
  import Mesh from "./Mesh.js";
3
3
  import Task from "../../../../core/process/task/Task.js";
4
- import TaskSignal from "../../../../core/process/task/TaskSignal.js";
4
+ import { TaskSignal } from "../../../../core/process/task/TaskSignal.js";
5
5
  import { assert } from "../../../../core/assert.js";
6
6
  import { assetTypeByPath } from "./assetTypeByPath.js";
7
7
  import { collectIteratorValueToArray } from "../../../../core/collection/IteratorUtils.js";
@@ -2,10 +2,13 @@ import {System} from "../../../ecs/System";
2
2
  import Engine from "../../../Engine";
3
3
  import {ShadedGeometry} from "./ShadedGeometry";
4
4
  import {SurfacePoint3} from "../../../../core/geom/3d/SurfacePoint3";
5
+ import {ExplicitBinaryBoundingVolumeHierarchy} from "../../../../core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy";
5
6
 
6
7
  export class ShadedGeometrySystem extends System<ShadedGeometry> {
7
8
  constructor(engine: Engine)
8
9
 
10
+ readonly bvh: ExplicitBinaryBoundingVolumeHierarchy
11
+
9
12
  raycastNearest(
10
13
  contact: SurfacePoint3,
11
14
  origin_x: number, origin_y: number, origin_z: number,
@@ -15,7 +15,7 @@ import { bvh_query_leaves_generic } from "../../../../core/bvh2/bvh3/bvh_query_l
15
15
  import { BVHQueryIntersectsRay } from "../../../../core/bvh2/bvh3/query/BVHQueryIntersectsRay.js";
16
16
  import Task from "../../../../core/process/task/Task.js";
17
17
  import { RuntimeDrawMethodOptimizer } from "./render/optimization/RuntimeDrawMethodOptimizer.js";
18
- import TaskSignal from "../../../../core/process/task/TaskSignal.js";
18
+ import { TaskSignal } from "../../../../core/process/task/TaskSignal.js";
19
19
  import TaskState from "../../../../core/process/task/TaskState.js";
20
20
  import {
21
21
  bvh_query_user_data_overlaps_frustum
@@ -108,6 +108,14 @@ export class ShadedGeometrySystem extends System {
108
108
  });
109
109
  }
110
110
 
111
+ /**
112
+ *
113
+ * @returns {ExplicitBinaryBoundingVolumeHierarchy}
114
+ */
115
+ get bvh() {
116
+ return this.__bvh_binary;
117
+ }
118
+
111
119
  /**
112
120
  * NOTE: DO NOT MODIFY RESULTS
113
121
  * @returns {Map<number,number>}
@@ -386,7 +394,7 @@ export class ShadedGeometrySystem extends System {
386
394
  direction_x, direction_y, direction_z
387
395
  );
388
396
 
389
- const geometry_hit_found = sg.query_raycast_nearest(scratch_point,scratch_ray_0,m4);
397
+ const geometry_hit_found = sg.query_raycast_nearest(scratch_point, scratch_ray_0, m4);
390
398
 
391
399
  if (!geometry_hit_found) {
392
400
  continue;
@@ -467,7 +475,7 @@ export class ShadedGeometrySystem extends System {
467
475
  direction_x, direction_y, direction_z
468
476
  );
469
477
 
470
- const geometry_hit_found = sg.query_raycast_nearest(scratch_point,scratch_ray_0,m4);
478
+ const geometry_hit_found = sg.query_raycast_nearest(scratch_point, scratch_ray_0, m4);
471
479
 
472
480
  if (!geometry_hit_found) {
473
481
  continue;
@@ -1,5 +1,5 @@
1
1
  import Task from "../../../core/process/task/Task.js";
2
- import TaskSignal from "../../../core/process/task/TaskSignal.js";
2
+ import { TaskSignal } from "../../../core/process/task/TaskSignal.js";
3
3
 
4
4
  export class OptimizationTask extends Task {
5
5
  /**
@@ -2,7 +2,7 @@ import { noop } from "../../../core/function/Functions.js";
2
2
  import { countTask } from "../../../core/process/task/TaskUtils.js";
3
3
  import Task from "../../../core/process/task/Task.js";
4
4
  import { assert } from "../../../core/assert.js";
5
- import TaskSignal from "../../../core/process/task/TaskSignal.js";
5
+ import { TaskSignal } from "../../../core/process/task/TaskSignal.js";
6
6
 
7
7
  let id_seed = 0;
8
8
 
@@ -3,7 +3,7 @@ import { assert } from "../../../core/assert.js";
3
3
  import { actionTask } from "../../../core/process/task/TaskUtils.js";
4
4
  import TaskGroup from "../../../core/process/task/TaskGroup.js";
5
5
  import Task from "../../../core/process/task/Task.js";
6
- import TaskSignal from "../../../core/process/task/TaskSignal.js";
6
+ import { TaskSignal } from "../../../core/process/task/TaskSignal.js";
7
7
 
8
8
  export class GridTaskApplyActionToCells extends GridTaskGenerator {
9
9
  constructor() {
@@ -3,7 +3,7 @@ import { min2 } from "../../../core/math/min2.js";
3
3
  import { seededRandom } from "../../../core/math/random/seededRandom.js";
4
4
  import { GridTaskGenerator } from "../GridTaskGenerator.js";
5
5
  import Task from "../../../core/process/task/Task.js";
6
- import TaskSignal from "../../../core/process/task/TaskSignal.js";
6
+ import { TaskSignal } from "../../../core/process/task/TaskSignal.js";
7
7
  import { NumericInterval } from "../../../core/math/interval/NumericInterval.js";
8
8
  import { MarkerNodeMatcherAny } from "../../markers/matcher/MarkerNodeMatcherAny.js";
9
9
  import { assert } from "../../../core/assert.js";
@@ -1,7 +1,7 @@
1
1
  import { seededRandom } from "../../../core/math/random/seededRandom.js";
2
2
  import { GridTaskGenerator } from "../GridTaskGenerator.js";
3
3
  import Task from "../../../core/process/task/Task.js";
4
- import TaskSignal from "../../../core/process/task/TaskSignal.js";
4
+ import { TaskSignal } from "../../../core/process/task/TaskSignal.js";
5
5
  import { BitSet } from "../../../core/binary/BitSet.js";
6
6
  import { PI_HALF } from "../../../core/math/MathUtils.js";
7
7
  import { actionTask } from "../../../core/process/task/TaskUtils.js";
@@ -2,7 +2,7 @@ import { min2 } from "../../../../core/math/min2.js";
2
2
  import { GridTaskGenerator } from "../../GridTaskGenerator.js";
3
3
  import { BitSet } from "../../../../core/binary/BitSet.js";
4
4
  import Task from "../../../../core/process/task/Task.js";
5
- import TaskSignal from "../../../../core/process/task/TaskSignal.js";
5
+ import { TaskSignal } from "../../../../core/process/task/TaskSignal.js";
6
6
  import Vector2 from "../../../../core/geom/Vector2.js";
7
7
  import BinaryHeap from "../../../../core/collection/heap/FastBinaryHeap.js";
8
8
  import { passThrough } from "../../../../core/function/Functions.js";
@@ -2,7 +2,7 @@ import { actionTask, countTask } from "../../../../../core/process/task/TaskUtil
2
2
  import Task from "../../../../../core/process/task/Task.js";
3
3
  import { BitSet } from "../../../../../core/binary/BitSet.js";
4
4
  import TaskGroup from "../../../../../core/process/task/TaskGroup.js";
5
- import TaskSignal from "../../../../../core/process/task/TaskSignal.js";
5
+ import { TaskSignal } from "../../../../../core/process/task/TaskSignal.js";
6
6
  import BinaryHeap from "../../../../../core/collection/heap/FastBinaryHeap.js";
7
7
  import { GridTaskGenerator } from "../../../GridTaskGenerator.js";
8
8
  import { assert } from "../../../../../core/assert.js";
@@ -1,5 +1,5 @@
1
1
  import Task from "../../../core/process/task/Task.js";
2
- import TaskSignal from "../../../core/process/task/TaskSignal.js";
2
+ import { TaskSignal } from "../../../core/process/task/TaskSignal.js";
3
3
  import { assert } from "../../../core/assert.js";
4
4
 
5
5
  export class MarkerNodeProcessingRuleSet {
@@ -5,7 +5,7 @@ import { TerrainLayerRuleAggregator } from "./TerrainLayerRuleAggregator.js";
5
5
  import { actionTask, countTask, emptyTask, futureTask } from "../../core/process/task/TaskUtils.js";
6
6
  import { Sampler2D } from "../../engine/graphics/texture/sampler/Sampler2D.js";
7
7
  import Task from "../../core/process/task/Task.js";
8
- import TaskSignal from "../../core/process/task/TaskSignal.js";
8
+ import { TaskSignal } from "../../core/process/task/TaskSignal.js";
9
9
  import { compareNumbers } from "../../core/primitives/numbers/compareNumbers.js";
10
10
  import TaskGroup from "../../core/process/task/TaskGroup.js";
11
11
  import Future from "../../core/process/Future.js";
package/package.json CHANGED
@@ -5,7 +5,7 @@
5
5
  "productName": "Meep",
6
6
  "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
7
7
  "author": "Alexander Goldring",
8
- "version": "2.39.28",
8
+ "version": "2.39.31",
9
9
  "dependencies": {
10
10
  "gl-matrix": "3.4.3",
11
11
  "fast-levenshtein": "2.0.6",
@@ -6,7 +6,7 @@ import EmptyView from "../elements/EmptyView.js";
6
6
  import AABB2 from "../../core/geom/AABB2.js";
7
7
  import Task from "../../core/process/task/Task.js";
8
8
  import ConcurrentExecutor from "../../core/process/executor/ConcurrentExecutor.js";
9
- import TaskSignal from "../../core/process/task/TaskSignal.js";
9
+ import { TaskSignal } from "../../core/process/task/TaskSignal.js";
10
10
  import TooltipView from "./TooltipView.js";
11
11
  import { PointerDevice } from "../../engine/input/devices/PointerDevice.js";
12
12
  import List from "../../core/collection/list/List.js";