@woosh/meep-engine 2.75.6 → 2.75.8

package/src/engine/graphics/render/buffer/RenderGraph.js

@@ -1,28 +1,28 @@
-import { RenderProgramInstance } from "./node/RenderProgramInstance.js";
-import { ProgramValueSlotConnectionEndpoint } from "./conection/ProgramValueSlotConnectionEndpoint.js";
-import { ProgramValueSlotConnection } from "./conection/ProgramValueSlotConnection.js";
 import { assert } from "../../../../core/assert.js";
+import { ProgramValueSlotConnection } from "./conection/ProgramValueSlotConnection.js";
+import { ProgramValueSlotConnectionEndpoint } from "./conection/ProgramValueSlotConnectionEndpoint.js";
+import { RenderProgramInstance } from "./node/RenderProgramInstance.js";
 import { ProgramValueType } from "./slot/ProgramValueType.js";
 
 export class RenderGraph {
-    constructor() {
-        /**
-         *
-         * @type {RenderProgramInstance[]}
-         */
-        this.nodes = [];
-        /**
-         *
-         * @type {ProgramValueSlotConnection[]}
-         */
-        this.connections = [];
-
-        /**
-         *
-         * @type {ProgramValueSlotConnectionEndpoint|null}
-         */
-        this.finalOutput = null;
-    }
+
+    /**
+     *
+     * @type {RenderProgramInstance[]}
+     */
+    nodes = [];
+    /**
+     *
+     * @type {ProgramValueSlotConnection[]}
+     */
+    connections = [];
+
+    /**
+     *
+     * @type {ProgramValueSlotConnectionEndpoint|null}
+     */
+    finalOutput = null;
+
 
     /**
      *

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

@@ -33,9 +33,9 @@ import HeadsUpDisplaySystem from "../../../../ecs/gui/hud/HeadsUpDisplaySystem.j
 import ViewportPositionSystem from "../../../../ecs/gui/position/ViewportPositionSystem.js";
 import { InverseKinematicsSystem } from "../../../../ecs/ik/InverseKinematicsSystem.js";
 import Renderable from "../../../../ecs/renderable/Renderable.js";
+import RenderSystem from "../../../../ecs/renderable/RenderSystem.js";
 import AnimationSystem from "../../../../ecs/systems/AnimationSystem.js";
 import MotionSystem from "../../../../ecs/systems/MotionSystem.js";
-import RenderSystem from "../../../../ecs/systems/RenderSystem.js";
 import ScriptSystem from "../../../../ecs/systems/ScriptSystem.js";
 import SteeringSystem from "../../../../ecs/systems/SteeringSystem.js";
 import TagSystem from "../../../../ecs/systems/TagSystem.js";

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

@@ -1,8 +1,38 @@
 //
 
+import { RenderTextureManager } from "./RenderTextureManager.js";
+
 /**
  * Abstracts rendering context, such as "WebGLRenderer" in THREE.js or WebGL/WebGPU
  */
 export class IRenderContext {
-//TODO implement
+
+    resource_manager = new RenderTextureManager();
+
+    constructor() {
+        this.resource_manager.attach(this);
+    }
+
+
+    /**
+     *
+     * @param {TextureDescriptor} descriptor
+     * @returns {RenderTarget}
+     */
+    createRenderTarget(descriptor) {
+        throw new Error('Not Implemented')
+    }
+
+    /**
+     *
+     * @param {RenderTarget} target
+     * @returns {boolean}
+     */
+    destroyRenderTarget(target) {
+        throw new Error('Not Implemented')
+    }
+
+    destroy() {
+        // override as necessary
+    }
 }

package/src/engine/graphics/render/frame_graph/RenderGraph.js

@@ -1,10 +1,10 @@
-import { RenderGraphBuilder } from "./RenderGraphBuilder.js";
-import { RenderPassNode } from "./RenderPassNode.js";
-import { ResourceNode } from "./ResourceNode.js";
 import { assert } from "../../../../core/assert.js";
 import LineBuilder from "../../../../core/codegen/LineBuilder.js";
+import { RenderGraphBuilder } from "./RenderGraphBuilder.js";
+import { RenderPassNode } from "./RenderPassNode.js";
 import { RenderPassResources } from "./RenderPassResources.js";
 import { ResourceEntry } from "./ResourceEntry.js";
+import { ResourceNode } from "./ResourceNode.js";
 
 /**
  * Based on the Frostbite's GDC paper "FrameGraph: Extensible Rendering Architecture in Frostbite" by Yuriy O'Donnell
@@ -319,7 +319,7 @@ export class RenderGraph {
 
             for (const id of node.resource_creates) {
                 // allocate resource
-                this.getResourceEntry(id).create();
+                this.getResourceEntry(id).create(context.resource_manager);
             }
 
             const resources = new RenderPassResources();
@@ -331,7 +331,7 @@ export class RenderGraph {
             for (const entry of this.__resource_registry) {
                 if (entry.last === node && entry.isTransient()) {
                     // this was the last user of the resource and the resource is transient (no external usage)
-                    entry.destroy();
+                    entry.destroy(context.resource_manager);
                 }
             }
 

package/src/engine/graphics/render/frame_graph/RenderTarget.js

@@ -0,0 +1,9 @@
+export class RenderTarget {
+    /**
+     *
+     * @type {TextureDescriptor|null}
+     */
+    descriptor = null
+
+    handle = -1
+}

package/src/engine/graphics/render/frame_graph/RenderTextureManager.js

@@ -0,0 +1,57 @@
+import { ImmutableObjectPool } from "../../../../core/model/object/ImmutableObjectPool.js";
+
+
+export class RenderTextureManager {
+
+
+    /**
+     *
+     * @type {IRenderContext|null}
+     */
+    #ctx = null;
+
+    /**
+     *
+     * @type {ImmutableObjectPool<TextureDescriptor, RenderTarget>}
+     */
+    #cache = new ImmutableObjectPool();
+
+    attach(ctx) {
+        this.#ctx = ctx;
+    }
+
+    constructor() {
+        this.#cache.onRemoved.add((descriptor, texture) => {
+
+            this.#ctx.destroyRenderTarget(texture);
+
+        });
+    }
+
+    /**
+     *
+     * @param {TextureDescriptor} descriptor
+     * @returns {RenderTarget}
+     */
+    get(descriptor) {
+        const existing = this.#cache.get(descriptor);
+
+        if (existing !== undefined) {
+            return existing;
+        }
+
+        // nothing in cache, create a new one
+        return this.#ctx.createRenderTarget(descriptor);
+
+    }
+
+    /**
+     *
+     * @param {RenderTarget} handle
+     */
+    release(handle) {
+
+        this.#cache.add(handle.descriptor, handle);
+
+    }
+}

package/src/engine/graphics/render/frame_graph/ResourceEntry.js

@@ -1,5 +1,5 @@
-import { TextureDescriptor } from "./TextureDescriptor.js";
 import { assert } from "../../../../core/assert.js";
+import { TextureDescriptor } from "./TextureDescriptor.js";
 
 /**
  * @template T
@@ -39,20 +39,22 @@ export class ResourceEntry {
 
     /**
      * Creates actual resource
+     * @param {RenderTextureManager} resources
      */
-    create() {
+    create(resources) {
         assert.ok(this.isTransient(), 'Only transient resources can be allocated');
 
-        throw new Error('Not Implemented');
+        this.resource = resources.get(this.resource_descriptor)
     }
 
     /**
      * De-allocated memory for the resource
+     * @param {RenderTextureManager} resources
      */
-    destroy() {
+    destroy(resources) {
         assert.ok(this.isTransient(), 'Only transient resources can be destroyed, that is resources that are created by the graph itself');
 
-        throw new Error('Not Implemented');
+        resources.release(this.resource);
     }
 
     isImported() {

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

@@ -1,48 +1,63 @@
 import { BinaryDataType } from "../../../../core/binary/type/BinaryDataType.js";
+import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
+import { computeStringHash } from "../../../../core/primitives/strings/computeStringHash.js";
+import { TextureInitialState } from "./TextureInitialState.js";
+
+export class TextureDescriptor {
 
-export const TextureInitialState = {
     /**
-     * Clear the texture.
+     *
+     * @type {number}
      */
-    Clear: 0,
+    height = 0;
     /**
-     * Doesn't matter. No need to clear
+     *
+     * @type {number}
      */
-    Undefined: 1
-};
+    width = 0;
 
-export class TextureDescriptor {
-    constructor() {
-        /**
-         *
-         * @type {number}
-         */
-        this.height = 0;
-        /**
-         *
-         * @type {number}
-         */
-        this.width = 0;
+    /**
+     * Render texture type
+     * @type {BinaryDataType}
+     */
+    format = BinaryDataType.Uint8;
+
+    /**
+     *
+     * @type {number}
+     */
+    channel_count = 1;
 
-        /**
-         * Render texture type
-         * @type {BinaryDataType}
-         */
-        this.format = BinaryDataType.Uint8;
+    /**
+     * What should the texture be initialized to
+     * @type {number}
+     */
+    initial_state = TextureInitialState.Clear;
 
-        /**
-         *
-         * @type {number}
-         */
-        this.channel_count = 1;
+    hash() {
+        return computeHashIntegerArray(
+            this.width,
+            this.height,
+            computeStringHash(this.format),
+            this.channel_count,
+        )
+    }
 
-        /**
-         * What should the texture be initialized to
-         * @type {number}
-         */
-        this.initial_state = TextureInitialState.Clear;
+    /**
+     *
+     * @param {TextureDescriptor} other
+     * @returns {boolean}
+     */
+    equals(other) {
+        return this.width === other.width
+            && this.height === other.height
+            && this.format === other.format
+            && this.channel_count === other.channel_count
+            && this.initial_state === other.initial_state
+            ;
     }
 
+
     static from({
                     height = 0,
                     width = 0,

package/src/engine/graphics/render/frame_graph/TextureInitialState.js

@@ -0,0 +1,14 @@
+/**
+ *
+ * @enum {number}
+ */
+export const TextureInitialState = {
+    /**
+     * Clear the texture.
+     */
+    Clear: 0,
+    /**
+     * Doesn't matter. No need to clear
+     */
+    Undefined: 1
+};

package/src/engine/graphics/render/frame_graph/sample/deferred/CopyPass.js

@@ -0,0 +1,20 @@
+import { RenderPass } from "../../RenderPass.js";
+
+export class CopyPass extends RenderPass {
+    name = "Copy"
+
+    setup(builder, { input, output }) {
+
+        builder.read(input);
+
+        const destination = builder.write(output);
+
+        return {
+            output: destination
+        }
+    }
+
+    execute(data, resources, render_context) {
+
+    }
+}

package/src/engine/graphics/render/frame_graph/sample/deferred/LightingPass.js

@@ -21,4 +21,8 @@ export class LightingPass extends RenderPass {
             output: destination
         };
     }
+
+    execute(data, resources, render_context) {
+        // TODO implement
+    }
 }

package/src/engine/graphics/render/frame_graph/sample/deferred/run.js

@@ -1,8 +1,8 @@
-import { GBufferDrawPass } from "./GBufferDrawPass.js";
-import { LightingPass } from "./LightingPass.js";
 import { RenderGraph } from "../../RenderGraph.js";
-import { WebGLRenderContext } from "../../webgl/WebGLRenderContext.js";
 import { TextureDescriptor } from "../../TextureDescriptor.js";
+import { WebGLRenderContext } from "../../webgl/WebGLRenderContext.js";
+import { GBufferDrawPass } from "./GBufferDrawPass.js";
+import { LightingPass } from "./LightingPass.js";
 
 
 const graph = new RenderGraph();
@@ -23,9 +23,37 @@ const p_p = new LightingPass({
 });
 graph.add(p_p);
 
-const ctx = new WebGLRenderContext();
+function makeContext() {
+    const canvas = document.createElement('canvas');
 
-graph.compile();
 
+    canvas.width = 800;
+    canvas.height = 600;
+
+    document.body.appendChild(canvas);
+
+    const ctx = canvas.getContext("webgl2");
+
+    return new WebGLRenderContext(ctx);
+}
+
+const ctx = makeContext();
+
+
+graph.compile();
 console.log(graph.exportToDot());
-graph.execute(ctx);
+
+
+function render() {
+    graph.compile();
+
+    graph.execute(ctx);
+}
+
+function update() {
+    requestAnimationFrame(update);
+
+    render();
+}
+
+update();

package/src/engine/graphics/render/frame_graph/webgl/WebGLRenderContext.js

@@ -1,5 +1,39 @@
 import { IRenderContext } from "../IRenderContext.js";
+import { RenderTarget } from "../RenderTarget.js";
 
 export class WebGLRenderContext extends IRenderContext {
+    /**
+     *
+     * @type {WebGL2RenderingContext|null}
+     */
+    #gl = null;
 
+    /**
+     *
+     * @param {WebGL2RenderingContext} ctx
+     */
+    constructor(ctx) {
+        super();
+
+        this.#gl = ctx;
+    }
+
+    /**
+     *
+     * @param {TextureDescriptor} descriptor
+     */
+    createRenderTarget(descriptor) {
+        console.log("createRenderTarget", descriptor)
+
+        const rt = new RenderTarget();
+
+        rt.descriptor = descriptor;
+        rt.handle = 0;
+
+        return rt;
+    }
+
+    destroyRenderTarget(target) {
+        return true;
+    }
 }

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

@@ -1,5 +1,6 @@
 import { mat4 } from "gl-matrix";
 import FacingDirectionSystem from "../../../../../../../model/game/ecs/system/FacingDirectionSystem.js";
+import { initializeEditor } from "../../../../../../../model/game/initializeEditor.js";
 import { makeEngineOptionsModel } from "../../../../../../../model/game/options/makeEngineOptionsModel.js";
 import { enableEditor } from "../../../../../../editor/enableEditor.js";
 import { AABB3 } from "../../../../../core/geom/3d/aabb/AABB3.js";
@@ -26,9 +27,9 @@ import HeadsUpDisplaySystem from "../../../../ecs/gui/hud/HeadsUpDisplaySystem.j
 import ViewportPosition from "../../../../ecs/gui/position/ViewportPosition.js";
 import ViewportPositionSystem from "../../../../ecs/gui/position/ViewportPositionSystem.js";
 import { InverseKinematicsSystem } from "../../../../ecs/ik/InverseKinematicsSystem.js";
+import RenderSystem from "../../../../ecs/renderable/RenderSystem.js";
 import AnimationSystem from "../../../../ecs/systems/AnimationSystem.js";
 import MotionSystem from "../../../../ecs/systems/MotionSystem.js";
-import RenderSystem from "../../../../ecs/systems/RenderSystem.js";
 import ScriptSystem from "../../../../ecs/systems/ScriptSystem.js";
 import SteeringSystem from "../../../../ecs/systems/SteeringSystem.js";
 import TagSystem from "../../../../ecs/systems/TagSystem.js";
@@ -151,7 +152,7 @@ async function init(harness) {
 
     await makeConfig(engine).apply(engine);
 
-    enableEditor(engine);
+    enableEditor(engine, initializeEditor);
 
     await load_and_set_cubemap_v0(engine.graphics, 'data/textures/cubemaps/hip_miramar/32/', '.png');
 

package/src/engine/graphics/sh3/gi/prototypeSHGI.js

@@ -0,0 +1,92 @@
+import { make_justified_point_grid } from "../../../../core/geom/3d/util/make_justified_point_grid.js";
+import Vector2 from "../../../../core/geom/Vector2.js";
+import Vector3 from "../../../../core/geom/Vector3.js";
+import { GameAssetType } from "../../../asset/GameAssetType.js";
+import { GLTFAssetLoader } from "../../../asset/loaders/GLTFAssetLoader.js";
+import { TextureAssetLoader } from "../../../asset/loaders/texture/TextureAssetLoader.js";
+import Entity from "../../../ecs/Entity.js";
+import { TransformAttachmentSystem } from "../../../ecs/transform-attachment/TransformAttachmentSystem.js";
+import { Transform } from "../../../ecs/transform/Transform.js";
+import { EngineHarness } from "../../../EngineHarness.js";
+import { BehaviorSystem } from "../../../intelligence/behavior/ecs/BehaviorSystem.js";
+import { SGMesh } from "../../ecs/mesh-v2/aggregate/SGMesh.js";
+import { SGMeshSystem } from "../../ecs/mesh-v2/aggregate/SGMeshSystem.js";
+import { ShadedGeometry } from "../../ecs/mesh-v2/ShadedGeometry.js";
+import { ShadedGeometrySystem } from "../../ecs/mesh-v2/ShadedGeometrySystem.js";
+
+
+/**
+ *
+ * @param {AABB3} bounds
+ * @param {number} [spacing]
+ */
+function buildProbeGrid(bounds, spacing = 1) {
+    const positions = [];
+
+    make_justified_point_grid(bounds, spacing, (x, y, z) => {
+        positions.push(x, y, z);
+    })
+
+}
+
+/**
+ *
+ * @param {Engine} engine
+ */
+async function buildGI(engine) {
+
+    const ecd = engine.entityManager.dataset;
+
+    ecd.traverseEntities([ShadedGeometry, Transform], (sg, transform, entity) => {
+
+    });
+
+    new Entity()
+        .add(SGMesh.fromURL("moicon/gnutti_not_optimized/model.gltf"))
+        .add(Transform.fromJSON({
+            position: { x: 10, y: 3, z: 10 },
+            scale: 1.5
+        }));
+
+}
+
+
+function init() {
+
+    /**
+     *
+     * @param {Engine} engine
+     */
+    async function main(engine) {
+
+        await EngineHarness.buildBasics({
+            engine,
+            focus: new Vector3(128, 0, 128),
+            distance: 30,
+            terrainResolution: 1,
+            terrainSize: new Vector2(128, 128),
+            enableWater: false,
+        });
+
+    }
+
+    new EngineHarness().initialize({
+        configuration(config, engine) {
+            config.addLoader(GameAssetType.Texture, new TextureAssetLoader());
+
+            const gltfAssetLoader = new GLTFAssetLoader();
+
+            config.addLoader(GameAssetType.ModelGLTF_JSON, gltfAssetLoader);
+            config.addLoader(GameAssetType.ModelGLTF, gltfAssetLoader);
+
+            config.addSystem(new BehaviorSystem(engine))
+            config.addSystem(new SGMeshSystem(engine));
+            config.addSystem(new ShadedGeometrySystem(engine));
+            config.addSystem(new TransformAttachmentSystem(engine));
+        }
+    })
+        .then(main);
+}
+
+
+init();

package/src/engine/graphics/texture/virtual/{v2/VirtualTextureMemoryMapping.js → VirtualTextureMemoryMapping.js}

@@ -1,6 +1,6 @@
 import { ClampToEdgeWrapping, DataTexture, NearestFilter, RedIntegerFormat, UnsignedIntType } from "three";
-import { assert } from "../../../../../core/assert.js";
-import { UINT32_MAX } from "../../../../../core/binary/UINT32_MAX.js";
+import { assert } from "../../../../core/assert.js";
+import { UINT32_MAX } from "../../../../core/binary/UINT32_MAX.js";
 import { compose_tile_address } from "./tile/compose_tile_address.js";
 import { decompose_finger_print } from "./tile/decompose_finger_print.js";
 
@@ -51,8 +51,6 @@ export class VirtualTextureMemoryMapping {
 
         texture.magFilter = NearestFilter;
         texture.minFilter = NearestFilter;
-        // texture.minFilter = NearestMipMapNearestFilter;
-        // texture.magFilter = NearestMipMapNearestFilter;
     }
 
     /**
@@ -91,28 +89,6 @@ export class VirtualTextureMemoryMapping {
         texture.image.width = texture_dimension;
         texture.image.height = texture_dimension;
 
-        // texture.mipmaps.splice(0, texture.mipmaps.length);
-        // let buffer_offset = 0;
-        // for (let mip_level = 0; mip_level <= max_mip_level; mip_level++) {
-        //     const mip_resolution = 1 << mip_level;
-        //
-        //     const texel_count = mip_resolution * mip_resolution;
-        //     texture.mipmaps[mip_level] = {
-        //         data: new Uint32Array(arrayBuffer, buffer_offset, texel_count),
-        //         width: mip_resolution,
-        //         height: mip_resolution
-        //     };
-        //
-        //     buffer_offset += texel_count * 4;
-        // }
-        //
-        // texture.mipmaps.reverse();
-        //
-        // const top_mip = texture.mipmaps[0];
-        // texture.image.data = top_mip.data;
-        // texture.image.width = top_mip.width;
-        // texture.image.height = top_mip.height;
-
         texture.needsUpdate = true;
     }
 

package/src/engine/graphics/texture/virtual/{v2/VirtualTexturePage.js → VirtualTexturePage.js}

@@ -1,14 +1,14 @@
 import { ClampToEdgeWrapping, DataTexture, LinearFilter, NearestFilter, Vector2 } from "three";
-import { assert } from "../../../../../core/assert.js";
-import { BitSet } from "../../../../../core/binary/BitSet.js";
-import { Cache } from "../../../../../core/cache/Cache.js";
-import { array_copy } from "../../../../../core/collection/array/array_copy.js";
-import { HashMap } from "../../../../../core/collection/map/HashMap.js";
-import { passThrough, strictEquals } from "../../../../../core/function/Functions.js";
-import { max2 } from "../../../../../core/math/max2.js";
-import { min2 } from "../../../../../core/math/min2.js";
-import { Sampler2D } from "../../sampler/Sampler2D.js";
-import { writeSample2DDataToDataTexture } from "../../sampler/writeSampler2DDataToDataTexture.js";
+import { assert } from "../../../../core/assert.js";
+import { BitSet } from "../../../../core/binary/BitSet.js";
+import { Cache } from "../../../../core/cache/Cache.js";
+import { array_copy } from "../../../../core/collection/array/array_copy.js";
+import { HashMap } from "../../../../core/collection/map/HashMap.js";
+import { passThrough, strictEquals } from "../../../../core/function/Functions.js";
+import { max2 } from "../../../../core/math/max2.js";
+import { min2 } from "../../../../core/math/min2.js";
+import { Sampler2D } from "../sampler/Sampler2D.js";
+import { writeSample2DDataToDataTexture } from "../sampler/writeSampler2DDataToDataTexture.js";
 import { tile_address_to_finger_print } from "./tile/tile_address_to_finger_print.js";
 import { VirtualTextureTileLoader } from "./VirtualTextureTileLoader.js";