@woosh/meep-engine 2.75.2 → 2.75.4

package/src/engine/graphics/texture/virtual/v2/prototype.js

@@ -1,29 +1,26 @@
-import { GUI } from "dat.gui";
 import {
     AmbientLight,
     Clock,
     DirectionalLight,
-    DoubleSide,
     Matrix4,
     Mesh,
-    MeshBasicMaterial,
     PerspectiveCamera,
     PlaneBufferGeometry,
     Scene,
-    TextureLoader,
     Vector2,
     WebGLRenderer
 } from "three";
 import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js";
-import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js";
+import Signal from "../../../../../core/events/signal/Signal.js";
+import { CSS_ABSOLUTE_POSITIONING } from "../../../../../view/CSS_ABSOLUTE_POSITIONING.js";
 import EmptyView from "../../../../../view/elements/EmptyView.js";
 import { AssetManager } from "../../../../asset/AssetManager.js";
 import { GameAssetType } from "../../../../asset/GameAssetType.js";
 import { ImageRGBADataLoader } from "../../../../asset/loaders/image/ImageRGBADataLoader.js";
-import { ResidencyDebugView } from "./debug/ResidencyDebugView.js";
-import { UsageDebugView } from "./debug/UsageDebugView.js";
-import { UsagePyramidDebugView } from "./debug/UsagePyramidDebugView.js";
-import { PageTexture } from "./PageTexture.js";
+import { buildCanvasViewFromTexture } from "../../../render/visibility/hiz/buildCanvasViewFromTexture.js";
+import { VirtualTextureMaterial } from "./VirtualTextureMaterial.js";
+import { VirtualTextureMemoryMapping } from "./VirtualTextureMemoryMapping.js";
+import { VirtualTexturePage } from "./VirtualTexturePage.js";
 import { VirtualTextureUsageUpdater } from "./VirtualTextureUsageUpdater.js";
 
 let camera,
@@ -37,40 +34,53 @@ let camera,
      */
     scene;
 
-let mesh;
+// let mesh;
 
-const TEXTURE_URL = "data/textures/utility/uv_map_reference.png";
+const signal_render = new Signal();
+
+// const TEXTURE_URL = "data/textures/utility/uv_map_reference.png";
+// const TEXTURE_URL = "data/textures/utility/maurus_uv_checker_8k/UV-CheckerMap_Maurus_01_8K.png";
 // const TEXTURE_URL = "data/textures/utility/4096x4096TexelDensityTexture1.png";
 // const TEXTURE_URL = "data/textures/utility/Lenna.png";
 // const TEXTURE_URL = "data/textures/utility/TESTIMAGES/SAMPLING/8BIT/RGB/2448x2448/SRC/img_2448x2448_3x8bit_SRC_RGB_cards_a.png";
 // const TEXTURE_URL = "data/models/LowPolyTownshipSet/Town_Hall//diffuse_2048.png";
 
 const virtualTextureManager = new VirtualTextureUsageUpdater();
-const sparseTexture = new PageTexture();
-const residencyDebugView = new ResidencyDebugView();
+const virtualTexturePage = new VirtualTexturePage();
+// const residencyDebugView = new ResidencyDebugView({ scale: 1 });
+const memoryMapping = new VirtualTextureMemoryMapping();
+
+
+// const usageDebugView = new UsageDebugView();
+// usageDebugView.position.set(0,256);
+
+window.page = virtualTexturePage;
+window.mapping = memoryMapping;
+window.usage = virtualTextureManager.usage_metadata;
 
 const container_view = new EmptyView();
 
 const options = {
-    spin: false
+    spin: false,
+    get jitter_samples() {
+        return virtualTextureManager.frame_jitter_enabled
+    },
+    set jitter_samples(v) {
+        virtualTextureManager.frame_jitter_enabled = v;
+    }
 };
 
 init();
 
-function makeMesh() {
-    const size = 0.65;
+function makeMesh(mat) {
+    const size = 10;
 
-    const map = new TextureLoader().load(TEXTURE_URL);
-    map.flipY = false;
 
     // const geo = new TetrahedronBufferGeometry(size,30);
     // const geo = new TorusGeometry(size, 0.3, 30, 30);
     const geo = new PlaneBufferGeometry(size, size);
 
-    mesh = new Mesh(geo, new MeshBasicMaterial({
-        map,
-        side: DoubleSide
-    }));
+    const mesh = new Mesh(geo, mat);
     const m4 = new Matrix4();
 
     // m4.makeRotationZ(-Math.PI/2);
@@ -81,16 +91,8 @@ function makeMesh() {
     // mesh.rotation.x = 0.3;
 
     scene.add(mesh);
-}
-
-function makeGLTF(path) {
-
-    new GLTFLoader().load(path, (gltf) => {
-
-        mesh = gltf.scene;
-        scene.add(mesh);
 
-    });
+    return mesh;
 }
 
 async function init() {
@@ -100,39 +102,60 @@ async function init() {
     am.startup();
 
     virtualTextureManager.setTextureParameters(
-        2048,
+        // 32768,
+        // 16384,
+        // 8192,
+        // 2048,
         // 16384,
+        512,
         32,
+        // 128,
         3
     );
 
-    sparseTexture.path = "data/textures/utility/vt/uv_map_reference";
-    // sparseTexture.path = "data/textures/utility/vt/Lenna";
+    virtualTexturePage.tile_resolution = virtualTextureManager.tile_resolution;
+
+    // virtualTexturePage.path = "data/textures/utility/maurus_uv_checker_8k/vt-01-32";
+    // virtualTexturePage.path = "data/textures/utility/maurus_uv_checker_8k/vt-01-128";
+    // virtualTexturePage.path = "data/textures/utility/azeroth/vt-01-128";
+    // virtualTexturePage.path = "data/textures/utility/aco-greece/vt-01-128";
+    // sparseTexture.path = "data/textures/utility/vt/uv_map_reference";
+    // virtualTexturePage.path = "data/textures/utility/vt/Lenna";
+    virtualTexturePage.path = "data/textures/utility/Lenna/vt-01-32";
     // sparseTexture.path = "data/textures/utility/vt/TexelDensity1";
-    sparseTexture.page_texture_size = [128, 768];
-    sparseTexture.tile_resolution = virtualTextureManager.tile_resolution;
-    sparseTexture.asset_manager = am;
+    // virtualTexturePage.page_texture_size = [32, 64];
+    // virtualTexturePage.page_texture_size = [256, 256];
+    // virtualTexturePage.page_texture_size = [280, 280];
+    // virtualTexturePage.page_texture_size = [256,512];
+    virtualTexturePage.page_texture_size = [512, 512];
+    // virtualTexturePage.page_texture_size = [480, 480];
+    // virtualTexturePage.page_texture_size = [384, 1280];
+    // virtualTexturePage.page_texture_size = [1024, 1024];
+    // virtualTexturePage.page_texture_size = [2048, 2048];
+    // virtualTexturePage.page_texture_size = [4096, 4096];
+    virtualTexturePage.asset_manager = am;
 
+    memoryMapping.resolution = virtualTextureManager.texture_resolution / virtualTextureManager.tile_resolution;
 
-    console.log(sparseTexture);
+
+    console.log(virtualTexturePage);
 
 
     //
-    const usageDebugView = new UsageDebugView();
-    usageDebugView.mip_levels = virtualTextureManager.max_mip_level;
+    // usageDebugView.mip_levels = virtualTextureManager.max_mip_level;
     // container_view.addChild(usageDebugView);
 
 
-    const usagePyramidDebugView = new UsagePyramidDebugView();
-    usagePyramidDebugView.setImageURL(TEXTURE_URL);
-    container_view.addChild(usagePyramidDebugView);
+    // const usagePyramidDebugView = new UsagePyramidDebugView();
+    // usagePyramidDebugView.setImageURL(TEXTURE_URL);
+    // container_view.addChild(usagePyramidDebugView);
 
-    residencyDebugView.texture = sparseTexture;
-    residencyDebugView.css({
-        bottom: 0,
-        right: 0
-    });
-    container_view.addChild(residencyDebugView);
+    // residencyDebugView.texture = virtualTexturePage;
+    // residencyDebugView.css({
+    //     bottom: 0,
+    //     right: 0
+    // });
+    // container_view.addChild(residencyDebugView);
 
     // ===================
 
@@ -144,14 +167,45 @@ async function init() {
     container_view.link();
 
     camera = new PerspectiveCamera(35, window.innerWidth / window.innerHeight, 0.1, 100);
-    camera.position.z = 4;
+    camera.position.z = 30;
 
     scene = new Scene();
+    // scene.background = new Color("#002D62");
 
     clock = new Clock();
 
+    //
+    // const map = new TextureLoader().load(TEXTURE_URL);
+    // map.flipY = false;
+    //
+    // const material = new MeshBasicMaterial({
+    //     map,
+    //     side: DoubleSide
+    // });
+
+    const material = new VirtualTextureMaterial({
+        page: virtualTexturePage,
+        mapping: memoryMapping
+    })
+
+    console.log(material.uniforms);
+
     // makeTorus();
-    makeMesh();
+    const virt = makeMesh(material);
+    // virt.position.x = -0.4
+
+    // const original_texture = new TextureLoader().load("data/textures/utility/maurus_uv_checker_8k/UV-CheckerMap_Maurus_01_8K.png");
+    // original_texture.flipY = false;
+    // original_texture.generateMipmaps = true;
+    // original_texture.anisotropy = 4;
+
+    // const ref = makeMesh(new MeshBasicMaterial({
+    //     // map: original_texture,
+    //     color: 0xFFFFFF,
+    //     side: DoubleSide
+    // }));
+    //
+    // ref.position.x = 0.4;
 
     // makeGLTF("data/models/LowPolyTownshipSet/Town_Hall/model.gltf");
 
@@ -162,10 +216,13 @@ async function init() {
     //
 
     renderer = new WebGLRenderer({ antialias: true });
+    renderer.setClearColor("#002D62",1);
+
     renderer.setPixelRatio(window.devicePixelRatio);
     container.appendChild(renderer.domElement);
     renderer.autoClear = false;
 
+    window.renderer = renderer;
 
     //
 
@@ -179,13 +236,38 @@ async function init() {
     new OrbitControls(camera, renderer.domElement);
 
 
-    const gui = new GUI();
+    // const gui = new GUI();
+    //
+    // Object.keys(options).forEach(key => {
+    //     gui.add(options, key);
+    // });
+
+    virtualTexturePage.renderer = renderer;
 
-    Object.keys(options).forEach(key => {
-        gui.add(options, key);
-    });
 
     animate();
+
+    const mappingPreview = buildCanvasViewFromTexture({
+        texture: virtualTexturePage.texture,
+        renderer,
+        swizzle: ['r', 'g', 'b', 1],
+        width: 256,
+        height: 256,
+        flipY: false
+    });
+
+    mappingPreview.view.css(CSS_ABSOLUTE_POSITIONING);
+    mappingPreview.view.css({
+        // border: "1px solid red"
+        boxShadow: "0 0 8px rgba(0,0,0,0.4)"
+    });
+    mappingPreview.view.position.set(0, 0);
+
+    signal_render.add(() => {
+        mappingPreview.render();
+    });
+
+    container_view.addChild(mappingPreview.view);
 }
 
 function onWindowResize() {
@@ -210,11 +292,11 @@ function animate() {
 function render() {
 
     const delta = 5 * clock.getDelta();
-
-    if (options.spin && mesh !== undefined) {
-        mesh.rotation.y += 0.0125 * delta;
-        mesh.rotation.x += 0.05 * delta;
-    }
+    //
+    // if (options.spin && mesh !== undefined) {
+    //     mesh.rotation.y += 0.0125 * delta;
+    //     mesh.rotation.x += 0.05 * delta;
+    // }
 
     const view_port_size = renderer.getSize(new Vector2());
     view_port_size.multiplyScalar(renderer.getPixelRatio());
@@ -222,8 +304,10 @@ function render() {
 
     virtualTextureManager.setViewportResolution(view_port_size.x, view_port_size.y);
     virtualTextureManager.updateUsage(renderer, scene, camera);
-    sparseTexture.update_usage(virtualTextureManager.usage_metadata);
+    virtualTexturePage.update_usage(virtualTextureManager.usage_metadata);
+    memoryMapping.residency = virtualTexturePage;
 
+    // renderer.setViewport(0, 0, view_port_size.x, view_port_size.y);
     renderer.clear();
     renderer.render(scene, camera)
 
@@ -232,5 +316,7 @@ function render() {
     // usagePyramidDebugView.setTextureParameters(virtualTextureManager.texture_resolution, virtualTextureManager.tile_resolution);
     // usagePyramidDebugView.usage = virtualTextureManager.usage_metadata;
 
-    residencyDebugView.update();
+    // residencyDebugView.update();
+
+    signal_render.send0();
 }

package/src/engine/graphics/texture/virtual/v2/tile/VirtualTextureTile.js

@@ -1,5 +1,9 @@
 export class VirtualTextureTile {
 
+    /**
+     *
+     * @type {number}
+     */
     finder_print = 0;
 
     last_used_time = 0;

package/src/core/bvh2/sah/surfaceAreaHeuristic.js

@@ -1,15 +0,0 @@
-import { surfaceAreaHeuristicFull } from "./surfaceAreaHeuristicFull.js";
-
-/**
- * Surface Area Heuristic
- * @param {number} saV Surface Area of the volume being split
- * @param {number} saVL Surface Area of Left Volume
- * @param {number} saVR Surface Area of Right Volume
- * @param {number|int} nL Number of leaf nodes in Left Volume
- * @param {number|int} nR Number of leaf nodes in Right Volume
- * @returns {number}
- */
-export function surfaceAreaHeuristic(saV, saVL, saVR, nL, nR) {
-    return surfaceAreaHeuristicFull(saV, saVL, saVR, nL, nR, 1, 1);
-}
-

package/src/core/bvh2/sah/surfaceAreaHeuristicFull.js

@@ -1,14 +0,0 @@
-/**
- * Surface Area Heuristic
- * @param {number} saV Surface Area of the volume being split
- * @param {number} saVL Surface Area of Left Volume
- * @param {number} saVR Surface Area of Right Volume
- * @param {number|int} nL Number of leaf nodes in Left Volume
- * @param {number|int} nR Number of leaf nodes in Right Volume
- * @param {number} kT constant for the estimated cost of a traversal step
- * @param {number} kI constant for the estimated cost of a intersection
- * @returns {number}
- */
-export function surfaceAreaHeuristicFull(saV, saVL, saVR, nL, nR, kT, kI) {
-    return kT + kI * (saVL * nL / saV + saVR * nR / saV);
-}

package/src/core/geom/3d/aabb/computeBoundingBoxFromVertexData.js

@@ -1,12 +0,0 @@
-import { aabb3_from_v3_array } from "./aabb3_from_v3_array.js";
-
-/**
- * @deprecated use {@link aabb3_from_v3_array} instead
- * @param {Float32Array} data must be x,y,z sequence
- * @param {AABB3} aabb
- */
-export function computeBoundingBoxFromVertexData(data, aabb) {
-
-    aabb3_from_v3_array(aabb, data, data.length);
-
-}

package/src/core/geom/3d/frustum/array_normalize_plane.js

@@ -1,25 +0,0 @@
-import { v3_length } from "../../Vector3.js";
-
-/**
- * Normalize a plane in-place
- * @param {number[]} source
- * @param {number} source_offset
- */
-function array_normalize_plane(source, source_offset) {
-    const _x = source[source_offset];
-    const _y = source[source_offset + 1];
-    const _z = source[source_offset + 2];
-
-    const length = v3_length(_x, _y, _z);
-
-    const inverseNormalLength = 1.0 / length;
-
-    /*
-    By re-using values already in the registers instead of using *= we save a few extra READ ops
-     */
-    source[source_offset] = _x * inverseNormalLength;
-    source[source_offset + 1] = _y * inverseNormalLength;
-    source[source_offset + 2] = _z * inverseNormalLength;
-
-    source[source_offset + 3] *= inverseNormalLength;
-}

package/src/core/geom/3d/plane/lerp_planes_to_array.js

@@ -1,53 +0,0 @@
-import { v3_dot } from "../../vec3/v3_dot.js";
-
-/**
- * Calculate a plane that is a linear interpolation between two other planes A and B with interpolation factor between 0 and 1
- * Result is places into destination array at the given array index offset
- * NOTE: Based on https://stackoverflow.com/a/57824137/3973586
- *
- * @param {number[]|Float32Array|Float64Array} destination
- * @param {number} destination_offset
- * @param {number} fraction
- * @param {number} a_normal_x
- * @param {number} a_normal_y
- * @param {number} a_normal_z
- * @param {number} a_distance
- * @param {number} b_normal_x
- * @param {number} b_normal_y
- * @param {number} b_normal_z
- * @param {number} b_distance
- */
-function lerp_planes_to_array(
-    destination,
-    destination_offset,
-    fraction,
-    a_normal_x, a_normal_y, a_normal_z, a_distance,
-    b_normal_x, b_normal_y, b_normal_z, b_distance
-) {
-
-    // e = cross(a.normal, b.normal)
-    const e_x = a_normal_y * b_normal_z - a_normal_z * b_normal_y;
-    const e_y = a_normal_z * b_normal_x - a_normal_x * b_normal_z;
-    const e_z = a_normal_x * b_normal_y - a_normal_y * b_normal_x;
-
-    // n = slerp( a.normal, b.normal, fraction)
-    const dot = v3_dot(
-        a_normal_x, a_normal_y, a_normal_z,
-        b_normal_x, b_normal_y, b_normal_z
-    );
-
-    const theta = Math.acos(dot);
-
-    const sin_theta = Math.sin(theta);
-
-    const scale_0 = Math.sin((1 - fraction) * theta) / sin_theta;
-    const scale_1 = Math.sin((fraction) * theta) / sin_theta;
-
-    const n_x = a_normal_x * scale_0 + b_normal_x * scale_1;
-    const n_y = a_normal_y * scale_0 + b_normal_y * scale_1;
-    const n_z = a_normal_z * scale_0 + b_normal_z * scale_1;
-
-    //compute R
-
-    throw new Error("Not Implemented");
-}

package/src/core/geom/3d/plane/planeRayIntersection.js

@@ -1,14 +0,0 @@
-import { plane3_compute_ray_intersection } from "./plane3_compute_ray_intersection.js";
-
-/**
- *
- * @param {Vector3} out Result will be written here
- * @param {Vector3} origin Ray origin
- * @param {Vector3} direction Ray direction
- * @param {Vector3} normal Plane normal
- * @param {number} dist Plane distance
- * @returns {boolean} true if intersection is found, false otherwise
- */
-export function planeRayIntersection(out, origin, direction, normal, dist) {
-    return plane3_compute_ray_intersection(out, origin.x, origin.y, origin.z, direction.x, direction.y, direction.z, normal.x, normal.y, normal.z, dist)
-}

package/src/core/geom/3d/voxel/DenseBitVolume3D.js

@@ -1,87 +0,0 @@
-import Vector3 from "../../Vector3.js";
-import { BitSet } from "../../../binary/BitSet.js";
-
-export class DenseBitVolume3D {
-    constructor() {
-        this.size = new Vector3(1, 1, 1);
-
-        this.__data = new BitSet();
-        this.__data.preventShrink();
-    }
-
-    clear() {
-        this.__data.reset();
-    }
-
-    resize(x, y, z) {
-        // TODO consider how we can resize while keeping the data
-        this.clear();
-
-        this.size.set(x, y, z);
-    }
-
-    /**
-     *
-     * @param {number} x
-     * @param {number} y
-     * @param {number} z
-     * @return {number}
-     * @private
-     */
-    __compute_address(x, y, z) {
-
-        const size = this.size;
-
-        const dx = size.x;
-        const dy = size.y;
-
-        return y * dx + z * dx * dy + x;
-    }
-
-    /**
-     *
-     * @param {number} x
-     * @param {number} y
-     * @param {number} z
-     * @return {boolean}
-     */
-    get(x, y, z) {
-        const address = this.__compute_address(x, y, z);
-
-        return this.__data.get(address)
-    }
-
-    /**
-     *
-     * @param {boolean} value
-     * @param {number} x
-     * @param {number} y
-     * @param {number} z
-     */
-    set(value, x, y, z) {
-        const address = this.__compute_address(x, y, z);
-
-        this.__data.set(address, value);
-    }
-
-    /**
-     *
-     * @param {number} u x-coordinate, normalized to [0,1] range
-     * @param {number} v y-coordinate, normalized to [0,1] range
-     * @param {number} w z-coordinate, normalized to [0,1] range
-     * @returns {boolean}
-     */
-    sampleNearest(u, v, w) {
-        const s = this.size;
-
-        const dx = s.x;
-        const dy = s.y;
-        const dz = s.z;
-
-        const x = Math.round(dx * u) % dx
-        const y = Math.round(dy * v) % dy
-        const z = Math.round(dz * w) % dz
-
-        return this.get(x, y, z);
-    }
-}

package/src/core/geom/3d/voxel/buildVolumeFromProjectedGeometry.js

@@ -1,23 +0,0 @@
-/**
- * Build a world-space oriented volume
- * @param {DenseBitVolume3D} volume
- * @param {AABB3} bounds
- * @param {{raycast:function(source_x:number, source_y:number, source_z:number, direction_x:number, direction_y:number, direction_z:number):number}} sampler
- * @param {number[]} frustum 3d frustum, defined as series of 6 planes in order: normal_x, normal_y, normal_z, plane_offset
- */
-export function buildVolumeFromProjectedGeometry({ volume, sampler, frustum }) {
-    // get frustum corners
-
-    // get first hits from "front" plane to seed the volume
-    for (let x = 0; x < 64; x++) {
-        for (let y = 0; y < 64; y++) {
-
-        }
-    }
-
-    // fit volume to the frustum
-
-    // create a connectivity graph to identify disconnected regions
-
-    // clear out disconnected regions starting from smallest until only one is left
-}

package/src/engine/graphics/texture/virtual/v2/ResidentTileTexture.js

@@ -1,46 +0,0 @@
-import { compose_tile_address } from "./tile/compose_tile_address.js";
-
-/**
- * Represents entire mip pyramid of tiles, where each tile slot points to an actual resident tile
- */
-export class ResidentTileTexture {
-    #resolution = 0;
-    #pyramid = new Uint32Array(0);
-
-
-    /**
-     *
-     * @param {number} resolution
-     */
-    set resolution(resolution) {
-        this.#resolution = resolution;
-
-
-        //max mip
-        const mip_level = Math.log2(resolution);
-
-        compose_tile_address(mip_level, 0, 0);
-
-        this.#pyramid = new Uint32Array(mip_level);
-    }
-
-    get resolution() {
-        return this.#resolution;
-    }
-
-    /**
-     *
-     * @param {PageTexture} page
-     */
-    set residency(page) {
-
-        const tiles = page.resident_tiles;
-        const tile_count = tiles.length;
-
-        for (let i = 0; i < tile_count; i++) {
-            const tile = tiles[i];
-        }
-
-    }
-
-}