@woosh/meep-engine 2.33.60 → 2.33.64

package/engine/graphics/geometry/buffered/deinterleaveBufferGeometry.js

@@ -0,0 +1,50 @@
+import { BufferGeometry } from "three";
+import { deinterleaveBufferAttribute } from "./deinterleaveBufferAttribute.js";
+
+/**
+ *
+ * @param {THREE.BufferGeometry} geometry
+ * @returns {THREE.BufferGeometry}
+ */
+export function deinterleaveBufferGeometry(geometry) {
+    const result = new BufferGeometry();
+
+    if (geometry.getIndex() !== null) {
+        result.setIndex(deinterleaveBufferAttribute(geometry.getIndex()));
+    }
+
+    for (const attribute_key in geometry.attributes) {
+        const source_attribute = geometry.attributes[attribute_key];
+
+        result.setAttribute(attribute_key, deinterleaveBufferAttribute(source_attribute));
+    }
+
+    // copy other bits
+    result.name = geometry.name;
+
+    result.morphTargetsRelative = geometry.morphTargetsRelative;
+
+    for (const attribute_key in geometry.morphAttributes) {
+        const source_attributes = geometry.morphAttributes[attribute_key];
+
+        const result_attributes = [];
+
+        result.morphAttributes[attribute_key] = result_attributes;
+
+        for (let i = 0; i < source_attributes.length; i++) {
+            const source_attribute = source_attributes[i];
+            result_attributes[i] = deinterleaveBufferAttribute(source_attribute);
+        }
+    }
+
+    result.groups = geometry.groups.slice();
+
+
+    result.boundingBox = geometry.boundingBox !== null ? geometry.boundingBox.clone() : null;
+    result.boundingSphere = geometry.boundingSphere !== null ? geometry.boundingSphere.clone() : null;
+    result.drawRange.start = geometry.drawRange.start;
+    result.drawRange.count = geometry.drawRange.count;
+    result.userData = JSON.parse(JSON.stringify(geometry.userData));
+
+    return result;
+}

package/engine/graphics/geometry/buffered/query/GeometrySpatialQueryAccelerator.js

@@ -2,6 +2,7 @@ import { Cache } from "../../../../../core/cache/Cache.js";
 import { buildUnsorted } from "../../bvh/buffered/BinaryBVHFromBufferGeometry.js";
 import { ClippingPlaneContainmentComputingVisitor } from "./ClippingPlaneContainmentComputingVisitor.js";
 import { RaycastNearestHitComputingVisitor } from "./RaycastNearestHitComputingVisitor.js";
+import { assert } from "../../../../../core/assert.js";
 
 export class GeometrySpatialQueryAccelerator {
     constructor(cache_size = 100 * 1024 * 1024) {
@@ -38,6 +39,8 @@ export class GeometrySpatialQueryAccelerator {
      * @returns {number} -1,0,1. -1 means fully outside, 0 means partially inside, 1 means fully inside
      */
     queryContainmentViaClippingPlanes(geometry, planes) {
+        assert.notNull(geometry, 'geometry');
+        assert.defined(geometry, 'geometry');
 
         const bvh = this.__acquireBVH(geometry);
 
@@ -53,14 +56,25 @@ export class GeometrySpatialQueryAccelerator {
     }
 
     /**
-     * Get the nearest ray intersection
+     *
      * @param {SurfacePoint3} destination
      * @param {THREE.BufferGeometry} geometry
-     * @param {Vector3} ray_origin
-     * @param {Vector3} ray_direction
-     * @returns {boolean} true if hit detected, false otherwise
+     * @param {number} ray_origin_x
+     * @param {number} ray_origin_y
+     * @param {number} ray_origin_z
+     * @param {number} ray_direction_x
+     * @param {number} ray_direction_y
+     * @param {number} ray_direction_z
+     * @return {boolean}
      */
-    queryRaycastNearest(destination, geometry, ray_origin, ray_direction) {
+    queryRaycastNearest_primitive(
+        destination,
+        geometry,
+        ray_origin_x, ray_origin_y, ray_origin_z,
+        ray_direction_x, ray_direction_y, ray_direction_z
+    ) {
+        assert.notNull(geometry, 'geometry');
+        assert.defined(geometry, 'geometry');
 
         const bvh = this.__acquireBVH(geometry);
 
@@ -69,12 +83,12 @@ export class GeometrySpatialQueryAccelerator {
         this.__visitor_raycast.setGeometry(geometry);
         this.__visitor_raycast.setRoot(bvh);
         this.__visitor_raycast.setRay(
-            ray_origin.x,
-            ray_origin.y,
-            ray_origin.z,
-            ray_direction.x,
-            ray_direction.y,
-            ray_direction.z
+            ray_origin_x,
+            ray_origin_y,
+            ray_origin_z,
+            ray_direction_x,
+            ray_direction_y,
+            ray_direction_z
         );
 
         bvh.traversePreOrderStack(this.__visitor_raycast, 0);
@@ -87,6 +101,27 @@ export class GeometrySpatialQueryAccelerator {
         } else {
             return false;
         }
+    }
+
+    /**
+     * Get the nearest ray intersection
+     * @param {SurfacePoint3} destination
+     * @param {THREE.BufferGeometry} geometry
+     * @param {Vector3} ray_origin
+     * @param {Vector3} ray_direction
+     * @returns {boolean} true if hit detected, false otherwise
+     */
+    queryRaycastNearest(destination, geometry, ray_origin, ray_direction) {
+
+        return this.queryRaycastNearest_primitive(
+            destination, geometry,
+            ray_origin.x,
+            ray_origin.y,
+            ray_origin.z,
+            ray_direction.x,
+            ray_direction.y,
+            ray_direction.z
+        );
 
     }
 
@@ -96,6 +131,9 @@ export class GeometrySpatialQueryAccelerator {
      * @returns {IndexedBinaryBVH}
      */
     __acquireBVH(geometry) {
+        assert.notNull(geometry, 'geometry');
+        assert.defined(geometry, 'geometry');
+
         const existing = this.cache.get(geometry);
 
         if (existing !== null) {
@@ -122,3 +160,9 @@ export class GeometrySpatialQueryAccelerator {
     }
 
 }
+
+/**
+ * @readonly
+ * @type {GeometrySpatialQueryAccelerator}
+ */
+GeometrySpatialQueryAccelerator.INSTANCE = new GeometrySpatialQueryAccelerator();

package/engine/graphics/micron/build/buildMicronGeometryFromBufferGeometry.js

@@ -12,6 +12,7 @@ import { expandConnectivityByLocality } from "../../../../core/geom/3d/topology/
 import { build_geometry_info } from "./build_geometry_info.js";
 import { build_leaf_patches_metis } from "./clustering/build_leaf_patches_metis.js";
 import { compute_buffer_geometry_byte_size } from "../../geometry/buffered/compute_buffer_geometry_byte_size.js";
+import { deinterleaveBufferGeometry } from "../../geometry/buffered/deinterleaveBufferGeometry.js";
 
 /**
  * Returns current time in milliseconds
@@ -105,11 +106,13 @@ const PRINT_VERBOSE_STATS = false;
  * @returns {MicronGeometry}
  */
 export async function buildMicronGeometryFromBufferGeometry(input) {
+    const source_geometry = deinterleaveBufferGeometry(input);
+
     // build topology representation
     const topoMesh = new TopoMesh();
 
-    const position_attribute = input.getAttribute("position");
-    const index_attribute = input.index;
+    const position_attribute = source_geometry.getAttribute("position");
+    const index_attribute = source_geometry.index;
 
     const face_index_array = index_attribute.array;
     const vertex_position_array = position_attribute.array;
@@ -183,18 +186,18 @@ export async function buildMicronGeometryFromBufferGeometry(input) {
 
     const r = new MicronGeometry();
 
-    r.proxy = input; // TODO use r.buildProxy(1) instead
+    r.proxy = source_geometry; // TODO use r.buildProxy(1) instead
 
     r.source_triangle_count = index_attribute.count / 3;
-    r.source_vertex_count = input.getAttribute('position').count;
-    r.source_byte_size = compute_buffer_geometry_byte_size(input);
+    r.source_vertex_count = source_geometry.getAttribute('position').count;
+    r.source_byte_size = compute_buffer_geometry_byte_size(source_geometry);
 
     // console.time('build geometry');
 
-    const vertex_attributes = attributes_from_buffer_geometry(input);
+    const vertex_attributes = attributes_from_buffer_geometry(source_geometry);
 
     r.vertex_spec.setAttributes(vertex_attributes);
-    r.root = compilePatchGraph(root, input, r.vertex_spec);
+    r.root = compilePatchGraph(root, source_geometry, r.vertex_spec);
 
     r.initialize();
 

package/engine/graphics/micron/format/MicronGeometry.d.ts

@@ -1,5 +1,9 @@
 import {BufferGeometry} from "three";
+import {VertexDataSpec} from "../../geometry/VertexDataSpec";
 
 export class MicronGeometry {
+    vertex_spec: VertexDataSpec
     public proxy: BufferGeometry
+
+    initialize(): void
 }

package/engine/graphics/micron/render/v1/MaterialContext.js

@@ -82,6 +82,7 @@ export class MaterialContext {
 
         if (material[MATERIAL_FLAG] === undefined) {
             material.onBeforeCompile = composeCompile(this.material.onBeforeCompile, rewrite_material);
+            material.needsUpdate = true;
 
             material[MATERIAL_FLAG] = true;
             material[MATERIAL_VERTEX_DISPLACED] = true;

package/engine/graphics/particles/particular/engine/simulator/SimulationStepFixedPhysics.js

@@ -10,11 +10,26 @@ import {
 } from "../emitter/PARTICLE_ATTRIBUTES.js";
 import { update_parameters } from "./update_parameters.js";
 
-const velocity = [];
-const position = [];
+/**
+ * Common buffer for better memory layout
+ * @type {ArrayBuffer}
+ */
+const scratch_common_buffer = new ArrayBuffer(4 * 3 * 2);
+/**
+ *
+ * @type {Float32Array|number[]|vec3}
+ */
+const velocity = new Float32Array(scratch_common_buffer, 0, 3);
+
+/**
+ *
+ * @type {Float32Array|number[]|vec3}
+ */
+const position = new Float32Array(scratch_common_buffer, 3 * 4, 3);
 
 export class SimulationStepFixedPhysics extends AbstractSimulationStep {
     execute() {
+        let i = 0;
         const particles = this.particles;
         const timeDelta = this.timeDelta;
 
@@ -31,7 +46,7 @@ export class SimulationStepFixedPhysics extends AbstractSimulationStep {
          */
         const layers = emitter.layers.asArray();
 
-        for (let i = 0; i < liveParticleCount; i++) {
+        for (; i < liveParticleCount; i++) {
 
             const layer_position = particles.readAttributeScalar(i, PARTICLE_ATTRIBUTE_LAYER_POSITION);
 
@@ -70,6 +85,7 @@ export class SimulationStepFixedPhysics extends AbstractSimulationStep {
 
             particles.readAttributeVector3(i, PARTICLE_ATTRIBUTE_POSITION, position);
 
+            // Verlet integration
             const p_x = position[0] + velocity[0] * timeDelta;
             const p_y = position[1] + velocity[1] * timeDelta;
             const p_z = position[2] + velocity[2] * timeDelta;

package/engine/graphics/particles/particular/engine/utils/volume/prototypeParticleVolume.js

@@ -3,7 +3,6 @@ import { EngineConfiguration } from "../../../../../../EngineConfiguration.js";
 import GUIElementSystem from "../../../../../../ecs/gui/GUIElementSystem.js";
 import HeadsUpDisplaySystem from "../../../../../../ecs/gui/hud/HeadsUpDisplaySystem.js";
 import TagSystem from "../../../../../../ecs/systems/TagSystem.js";
-import { AttachmentSocketsSystem } from "../../../../../../ecs/sockets/AttachmentSocketsSystem.js";
 import { AttachmentSystem } from "../../../../../../ecs/attachment/AttachmentSystem.js";
 import { SoundEmitterSystem } from "../../../../../../sound/ecs/emitter/SoundEmitterSystem.js";
 import SoundControllerSystem from "../../../../../../sound/ecs/SoundControllerSystem.js";
@@ -43,8 +42,6 @@ import { RepeatBehavior } from "../../../../../../intelligence/behavior/decorato
 import { ActionBehavior } from "../../../../../../intelligence/behavior/primitive/ActionBehavior.js";
 import { pingpong } from "../../../../../../../core/math/pingpong.js";
 import { ParameterLookupTable } from "../../parameter/ParameterLookupTable.js";
-import { pick } from "../../../../../../../../model/game/util/ScreenGridPicker.js";
-import { obtainTerrain } from "../../../../../../../../model/game/scenes/SceneUtils.js";
 import GUIElement from "../../../../../../ecs/gui/GUIElement.js";
 import EmptyView from "../../../../../../../view/elements/EmptyView.js";
 import HeadsUpDisplay from "../../../../../../ecs/gui/hud/HeadsUpDisplay.js";
@@ -78,6 +75,8 @@ import { UnitSphereShape3D } from "../../../../../../../core/geom/3d/shape/UnitS
 import TopDownCameraController from "../../../../../ecs/camera/topdown/TopDownCameraController.js";
 import { randomFloatBetween } from "../../../../../../../core/math/random/randomFloatBetween.js";
 import { MicronRenderPlugin } from "../../../../../micron/plugin/MicronRenderPlugin.js";
+import { obtainTerrain } from "../../../../../../ecs/terrain/util/obtainTerrain.js";
+import { pick } from "../../../../../../../ecs/grid/pick.js";
 
 const engineHarness = new EngineHarness();
 
@@ -99,7 +98,6 @@ function makeConfig(engine) {
 
     config.systems.push(
         new TagSystem(),
-        new AttachmentSocketsSystem(),
         new AttachmentSystem(),
         new SoundEmitterSystem(assetManager, sound.destination, sound.context),
         new SoundControllerSystem(),

package/engine/graphics/render/buffer/buffers/prototypeNormalFrameBuffer.js

@@ -8,7 +8,6 @@ import PathFollowingSystem from "../../../../navigation/ecs/path_following/PathF
 import SteeringSystem from "../../../../ecs/systems/SteeringSystem.js";
 import MotionSystem from "../../../../ecs/systems/MotionSystem.js";
 import TagSystem from "../../../../ecs/systems/TagSystem.js";
-import { AttachmentSocketsSystem } from "../../../../ecs/sockets/AttachmentSocketsSystem.js";
 import { AttachmentSystem } from "../../../../ecs/attachment/AttachmentSystem.js";
 import { SoundEmitterSystem } from "../../../../sound/ecs/emitter/SoundEmitterSystem.js";
 import SoundControllerSystem from "../../../../sound/ecs/SoundControllerSystem.js";
@@ -93,7 +92,6 @@ function makeConfig(engine) {
         new SteeringSystem(),
         new MotionSystem(),
         new TagSystem(),
-        new AttachmentSocketsSystem(),
         new AttachmentSystem(),
         new SoundEmitterSystem(assetManager, sound.destination, sound.context),
         new SoundControllerSystem(),

package/engine/graphics/render/forward_plus/plugin/ptototypeFPPlugin.js

@@ -9,7 +9,6 @@ import PathFollowingSystem from "../../../../navigation/ecs/path_following/PathF
 import SteeringSystem from "../../../../ecs/systems/SteeringSystem.js";
 import MotionSystem from "../../../../ecs/systems/MotionSystem.js";
 import TagSystem from "../../../../ecs/systems/TagSystem.js";
-import { AttachmentSocketsSystem } from "../../../../ecs/sockets/AttachmentSocketsSystem.js";
 import { AttachmentSystem } from "../../../../ecs/attachment/AttachmentSystem.js";
 import { SoundEmitterSystem } from "../../../../sound/ecs/emitter/SoundEmitterSystem.js";
 import SoundControllerSystem from "../../../../sound/ecs/SoundControllerSystem.js";
@@ -70,7 +69,6 @@ import Renderable from "../../../../ecs/components/Renderable.js";
 import { makeHelperSphereGeometry } from "../../../../../editor/process/symbolic/makeHelperSphereGeometry.js";
 import TopDownCameraController from "../../../ecs/camera/topdown/TopDownCameraController.js";
 import ThreeFactory from "../../../three/ThreeFactory.js";
-import { obtainTerrain } from "../../../../../../model/game/scenes/SceneUtils.js";
 import { JsonAssetLoader } from "../../../../asset/loaders/JsonAssetLoader.js";
 import { TextureAssetLoader } from "../../../../asset/loaders/texture/TextureAssetLoader.js";
 import { GameAssetType } from "../../../../asset/GameAssetType.js";
@@ -82,8 +80,9 @@ import { ParticleEmitterSystem } from "../../../particles/ecs/ParticleEmitterSys
 import { ShadedGeometrySystem } from "../../../ecs/mesh-v2/ShadedGeometrySystem.js";
 import { FogOfWar } from "../../../../ecs/fow/FogOfWar.js";
 import { FogOfWarRevealer } from "../../../../ecs/fow/FogOfWarRevealer.js";
-import Team from "../../../../../../model/game/ecs/component/Team.js";
+import Team from "../../../../ecs/team/Team.js";
 import { AmbientOcclusionPostProcessEffect } from "../../buffer/simple-fx/ao/AmbientOcclusionPostProcessEffect.js";
+import { obtainTerrain } from "../../../../ecs/terrain/util/obtainTerrain.js";
 
 const geo_light_center_octahedron = new BoxBufferGeometry(0.1, 0.1, 0.1);
 const engineHarness = new EngineHarness();
@@ -120,7 +119,6 @@ function makeConfig(engine) {
         new SteeringSystem(),
         new MotionSystem(),
         new TagSystem(),
-        new AttachmentSocketsSystem(),
         new AttachmentSystem(),
         new SoundEmitterSystem(assetManager, sound.destination, sound.context),
         new SoundControllerSystem(),

package/engine/graphics/render/frame_graph/FrameGraphBuilder.js

@@ -0,0 +1,36 @@
+import { assert } from "../../../../core/assert.js";
+
+export class FrameGraphBuilder {
+    /**
+     *
+     * @param {TextureDescriptor} descriptor
+     * @returns {Resource}
+     */
+    createTexture(descriptor) {
+        throw new Error('Not Implemented');
+    }
+
+    /**
+     *
+     * @param {Resource} resource
+     * @param {number} flags
+     * @returns {ResourceReference}
+     */
+    read(resource, flags) {
+        assert.equal(resource.isResource, true, 'resource.isResource !== true');
+
+        throw new Error('Not Implemented');
+    }
+
+    /**
+     *
+     * @param {Resource} resource
+     * @param {number} flags
+     * @returns {ResourceReference}
+     */
+    write(resource, flags) {
+        assert.equal(resource.isResource, true, 'resource.isResource !== true');
+
+        throw new Error('Not Implemented');
+    }
+}

package/engine/graphics/render/frame_graph/IRenderContext.js

@@ -0,0 +1,8 @@
+//
+
+/**
+ * Abstracts rendering context, such as "WebGLRenderer" in THREE.js or WebGL/WebGPU
+ */
+export class IRenderContext {
+//TODO implement
+}

package/engine/graphics/render/frame_graph/RenderPass.js

@@ -0,0 +1,32 @@
+const DEFAULT_FLAGS = 0;
+
+export class RenderPass {
+
+    constructor() {
+        this.ref_count = 0;
+        /**
+         *
+         * @type {number|RenderPassFlags}
+         */
+        this.flags = DEFAULT_FLAGS;
+    }
+
+    /**
+     *
+     * @param {FrameGraphBuilder} builder
+     * @param {Object<Resource>} inputs
+     * @returns {Object<Resource>}
+     */
+    setup(builder, inputs) {
+        throw new Error('Not Implemented');
+    }
+
+    /**
+     *
+     * @param {RenderPassResources} resources
+     * @param {IRenderContext} render_context
+     */
+    execute(resources, render_context) {
+        throw new Error('Not Implemented');
+    }
+}

package/engine/graphics/render/frame_graph/RenderPassFlags.js

@@ -0,0 +1,6 @@
+export const RenderPassFlags = {
+    /**
+     * Render pass hidden effects, accessing data from outside
+     */
+    HasSideEffects: 1
+};

package/engine/graphics/render/frame_graph/RenderPassResources.js

@@ -0,0 +1,15 @@
+//
+
+/**
+ * Built by FrameGraphBuilder, maps abstract resource handles to concrete, allocated GPU resources
+ */
+export class RenderPassResources {
+    /**
+     *
+     * @param {Resource} resource
+     * @returns {Texture}
+     */
+    getTexture(resource) {
+        throw new Error('Not Implemented');
+    }
+}

package/engine/graphics/render/frame_graph/Resource.js

@@ -0,0 +1,21 @@
+export class Resource {
+    constructor() {
+        /**
+         *
+         * @type {number}
+         */
+        this.ref_count = 0;
+
+        /**
+         *
+         * @type {TextureDescriptor}
+         */
+        this.descriptor = null;
+    }
+}
+
+/**
+ * @readonly
+ * @type {boolean}
+ */
+Resource.prototype.isResource = true;

package/engine/graphics/render/frame_graph/ResourceReference.js

@@ -0,0 +1,14 @@
+export class ResourceReference {
+    constructor() {
+        /**
+         *
+         * @type {Resource|null}
+         */
+        this.resource = null;
+        /**
+         *
+         * @type {number|UsageModeType}
+         */
+        this.usage = 0;
+    }
+}

package/engine/graphics/render/frame_graph/TextureDescriptor.js

@@ -0,0 +1,30 @@
+import { FloatType } from "three";
+
+const TextureInitialState = {
+    /**
+     * Clear the texture.
+     */
+    Clear: 0,
+    /**
+     * Doesn't matter. No need to clear
+     */
+    Undefined: 1
+};
+
+export class TextureDescriptor {
+    constructor() {
+        this.height = 0;
+        this.width = 0;
+        /**
+         * Render texture type
+         * @type {number}
+         */
+        this.format = FloatType;
+
+        /**
+         * What should the texture be initialized to
+         * @type {number}
+         */
+        this.initialState = TextureInitialState.Clear;
+    }
+}

package/engine/graphics/render/frame_graph/UsageModeType.js

@@ -0,0 +1,5 @@
+export const UsageModeType = {
+    Read: 1,
+    Write: 2,
+    Create: 4
+}

package/engine/graphics/render/frame_graph/sample/deferred/GBufferDrawPass.js

@@ -0,0 +1,27 @@
+import { RenderPass } from "../../RenderPass.js";
+import { TextureDescriptor } from "../../TextureDescriptor.js";
+
+export class GBufferDrawPass extends RenderPass {
+    setup(builder, inputs) {
+        // ignore inputs
+
+        const out_albedo = new TextureDescriptor();
+        const res_albedo = builder.createTexture(out_albedo);
+
+        const out_normal = new TextureDescriptor();
+        const res_normal = builder.createTexture(out_normal);
+
+        const out_depth = new TextureDescriptor();
+        const res_depth = builder.createTexture(out_depth);
+
+        return {
+            albedo: res_albedo,
+            normal: res_normal,
+            depth: res_depth
+        };
+    }
+
+    execute(resources, render_context) {
+
+    }
+}

package/engine/graphics/render/frame_graph/sample/deferred/PresentPass.js

@@ -0,0 +1,17 @@
+import { RenderPass } from "../../RenderPass.js";
+
+export class PresentPass extends RenderPass {
+    /**
+     *
+     * @param builder
+     * @param {Resource} data
+     * @return {{data: ResourceReference}}
+     */
+    setup(builder, { data }) {
+        const input_ref = builder.read(data, 0);
+
+        return {
+            data: input_ref
+        };
+    }
+}

package/engine/graphics/render/visibility/hiz/prototypeHiZ.js

@@ -8,7 +8,6 @@ import PathFollowingSystem from "../../../../navigation/ecs/path_following/PathF
 import SteeringSystem from "../../../../ecs/systems/SteeringSystem.js";
 import MotionSystem from "../../../../ecs/systems/MotionSystem.js";
 import TagSystem from "../../../../ecs/systems/TagSystem.js";
-import { AttachmentSocketsSystem } from "../../../../ecs/sockets/AttachmentSocketsSystem.js";
 import { AttachmentSystem } from "../../../../ecs/attachment/AttachmentSystem.js";
 import { SoundEmitterSystem } from "../../../../sound/ecs/emitter/SoundEmitterSystem.js";
 import SoundControllerSystem from "../../../../sound/ecs/SoundControllerSystem.js";
@@ -97,7 +96,6 @@ function makeConfig(engine) {
         new SteeringSystem(),
         new MotionSystem(),
         new TagSystem(),
-        new AttachmentSocketsSystem(),
         new AttachmentSystem(),
         new SoundEmitterSystem(assetManager, sound.destination, sound.context),
         new SoundControllerSystem(),