@woosh/meep-engine 2.33.58 → 2.33.62

package/engine/graphics/micron/plugin/serialization/BufferGeometrySerializationAdapter.js

@@ -0,0 +1,176 @@
+import { BinaryClassSerializationAdapter } from "../../../../ecs/storage/binary/BinaryClassSerializationAdapter.js";
+import { BufferAttribute, BufferGeometry } from "three";
+
+function typed_array_to_enum(array) {
+    if (array instanceof Uint8Array) {
+        return 0;
+    } else if (array instanceof Uint16Array) {
+        return 1;
+    } else if (array instanceof Uint32Array) {
+        return 2;
+    } else if (array instanceof Uint8Array) {
+        return 3;
+    } else if (array instanceof Uint16Array) {
+        return 4;
+    } else if (array instanceof Uint32Array) {
+        return 5;
+    } else if (array instanceof Float32Array) {
+        return 6;
+    } else if (array instanceof Float64Array) {
+        return 7;
+    } else {
+        throw new Error('Unsupported array type');
+    }
+}
+
+function marker_to_typed_array_constructor(marker) {
+    switch (marker) {
+        case 0:
+            return Uint8Array;
+        case 1:
+            return Uint16Array;
+        case 2:
+            return Uint32Array;
+        case 3:
+            return Int8Array;
+        case 4:
+            return Int16Array;
+        case 5:
+            return Int32Array;
+        case 6:
+            return Float32Array;
+        case 7:
+            return Float64Array;
+        default:
+            throw new Error('Unsupported marker');
+    }
+}
+
+/**
+ *
+ * @param {BinaryBuffer} buffer
+ * @param {Uint8Array|Float32Array|ArrayLike<number>} value
+ */
+function write_typed_array(buffer, value) {
+
+    buffer.writeUint8(typed_array_to_enum(value));
+    buffer.writeUintVar(value.byteLength);
+
+    const data = new Uint8Array(value.buffer, value.byteOffset, value.byteLength);
+    buffer.writeBytes(data, 0, value.byteLength);
+}
+
+function read_typed_array(buffer) {
+    const type_marker = buffer.readUint8();
+    const byte_length = buffer.readUintVar();
+
+    const array = new Uint8Array(byte_length);
+
+    buffer.readBytes(array, 0, byte_length);
+
+    // re-interpret bytes
+    const TypedArray = marker_to_typed_array_constructor(type_marker);
+
+    return new TypedArray(array.buffer, 0);
+}
+
+/**
+ *
+ * @param {BinaryBuffer} buffer
+ * @param {BufferAttribute} value
+ */
+function write_attribute(buffer, value) {
+    buffer.writeUTF8String(value.name);
+    buffer.writeUintVar(value.itemSize);
+    buffer.writeUint8(value.normalized ? 1 : 0);
+    buffer.writeUint32(value.usage);
+
+    write_typed_array(buffer, value.array);
+}
+
+/**
+ *
+ * @param {BinaryBuffer} buffer
+ * @returns {BufferAttribute}
+ */
+function read_attribute(buffer) {
+    const name = buffer.readUTF8String();
+    const itemSize = buffer.readUintVar();
+    const normalized = buffer.readUint8() !== 0;
+    const usage = buffer.readUint32();
+
+    const array = read_typed_array(buffer);
+
+    const attribute = new BufferAttribute(array, itemSize, normalized);
+
+    attribute.usage = usage;
+    attribute.name = name;
+
+    return attribute;
+}
+
+export class BufferGeometrySerializationAdapter extends BinaryClassSerializationAdapter {
+    constructor() {
+        super();
+
+        this.klass = BufferGeometry;
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {BufferGeometry} value
+     */
+    serialize(buffer, value) {
+        // write index if one exists
+        const index = value.getIndex();
+        if (index === null) {
+            buffer.writeUint8(0);
+        } else {
+            buffer.writeUint8(1);
+
+            write_attribute(buffer, index);
+        }
+
+        const attributes = value.attributes;
+        const attribute_keys = Object.keys(attributes);
+
+        const attribute_count = attribute_keys.length;
+        buffer.writeUintVar(attribute_count);
+
+        for (let i = 0; i < attribute_count; i++) {
+            const attribute_key = attribute_keys[i];
+
+            buffer.writeUTF8String(attribute_key);
+
+            const attribute = attributes[attribute_key];
+
+            write_attribute(buffer, attribute);
+        }
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {BufferGeometry} value
+     */
+    deserialize(buffer, value) {
+        const index_flag = buffer.readUint8();
+
+        if (index_flag !== 0) {
+            value.setIndex(read_attribute(buffer));
+        } else {
+            value.setIndex(null);
+        }
+
+        const attribute_count = buffer.readUintVar();
+
+        for (let i = 0; i < attribute_count; i++) {
+            const attribute_key = buffer.readUTF8String();
+
+            const attribute = read_attribute(buffer);
+
+            value.setAttribute(attribute_key, attribute);
+        }
+    }
+}

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/ParticleVolume.d.ts

@@ -19,6 +19,8 @@ export class ParticleVolume {
 
     from(args?: Args): void
 
+    fromJSON(json: any): void
+
     build(): void
 
     readonly attributes: Attributes

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";
@@ -44,7 +43,6 @@ import { ActionBehavior } from "../../../../../../intelligence/behavior/primitiv
 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 +76,7 @@ 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";
 
 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(),
@@ -132,6 +130,7 @@ function makeConfig(engine) {
 
     // Plugins
     config.addPlugin(MicronRenderPlugin);
+    config.addPlugin(AmbientOcclusionPostProcessEffect);
 
 
     // Knowledge
@@ -159,8 +158,6 @@ async function init(harness) {
     await engine.graphics.loadEnvironmentMap(buildCubeURLs('data/textures/cubemaps/hip_miramar/32/', '.png'));
 
 
-    await engine.plugins.acquire(AmbientOcclusionPostProcessEffect);
-
     await harness.initialize();
 
     main(engine);

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";
@@ -84,6 +82,7 @@ import { FogOfWar } from "../../../../ecs/fow/FogOfWar.js";
 import { FogOfWarRevealer } from "../../../../ecs/fow/FogOfWarRevealer.js";
 import Team from "../../../../../../model/game/ecs/component/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/forward_plus/query/query_bvh_frustum_from_texture.js

@@ -116,14 +116,16 @@ export function query_bvh_frustum_from_texture(
                 const radius = source_data[light_address + 3];
 
                 if (!point_light_inside_volume(light_x, light_y, light_z, radius, points, planes)) {
+                    // cull
                     continue;
                 }
+
             } else if (light_type === 3) {
                 // decal
                 debugger;
 
             } else {
-                throw new Error('Unsupported light type');
+                throw new Error(`Unsupported light type ${light_type}`);
             }
 
             // write to output

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(),