@woosh/meep-engine 2.74.0 → 2.75.1

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

@@ -3,12 +3,14 @@ import {
     AmbientLight,
     Clock,
     DirectionalLight,
+    DoubleSide,
+    Matrix4,
     Mesh,
-    MeshStandardMaterial,
+    MeshBasicMaterial,
     PerspectiveCamera,
+    PlaneBufferGeometry,
     Scene,
     TextureLoader,
-    TorusGeometry,
     Vector2,
     WebGLRenderer
 } from "three";
@@ -21,8 +23,8 @@ import { ImageRGBADataLoader } from "../../../../asset/loaders/image/ImageRGBADa
 import { ResidencyDebugView } from "./debug/ResidencyDebugView.js";
 import { UsageDebugView } from "./debug/UsageDebugView.js";
 import { UsagePyramidDebugView } from "./debug/UsagePyramidDebugView.js";
-import { SparseTexture } from "./SparseTexture.js";
-import { VirtualTextureManager } from "./VirtualTextureManager.js";
+import { PageTexture } from "./PageTexture.js";
+import { VirtualTextureUsageUpdater } from "./VirtualTextureUsageUpdater.js";
 
 let camera,
     /**
@@ -37,71 +39,46 @@ let camera,
 
 let mesh;
 
-const am = new AssetManager();
-am.registerLoader(GameAssetType.Image, new ImageRGBADataLoader());
-am.startup();
-
-const virtualTextureManager = new VirtualTextureManager();
-virtualTextureManager.setTextureParameters(
-    4096,
-    // 16384,
-    32,
-    3
-);
-
-const sparseTexture = new SparseTexture();
-sparseTexture.path = "data/textures/utility/vt/TexelDensity1";
-sparseTexture.page_texture_size = [512, 512];
-sparseTexture.tile_resolution = virtualTextureManager.tile_resolution;
-sparseTexture.asset_manager = am;
-
-
-console.log(sparseTexture);
-
-// const TEXTURE_URL = "data/textures/utility/uv_map_reference.png";
-const TEXTURE_URL = "data/textures/utility/4096x4096TexelDensityTexture1.png";
+const TEXTURE_URL = "data/textures/utility/uv_map_reference.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 container_view = new EmptyView();
-//
-const usageDebugView = new UsageDebugView();
-usageDebugView.mip_levels = virtualTextureManager.max_mip_level;
-// container_view.addChild(usageDebugView);
-
-
-const usagePyramidDebugView = new UsagePyramidDebugView();
-usagePyramidDebugView.setImageURL(TEXTURE_URL);
-container_view.addChild(usagePyramidDebugView);
-
+const virtualTextureManager = new VirtualTextureUsageUpdater();
+const sparseTexture = new PageTexture();
 const residencyDebugView = new ResidencyDebugView();
-residencyDebugView.texture = sparseTexture;
-residencyDebugView.css({
-    bottom: 0,
-    right: 0
-});
-container_view.addChild(residencyDebugView);
+
+const container_view = new EmptyView();
 
 const options = {
-    spin: true
+    spin: false
 };
 
 init();
-animate();
 
-
-function makeTorus() {
+function makeMesh() {
     const size = 0.65;
 
     const map = new TextureLoader().load(TEXTURE_URL);
     map.flipY = false;
 
-    mesh = new Mesh(new TorusGeometry(size, 0.3, 30, 30), new MeshStandardMaterial({
-        roughness: 0.4,
-        map
+    // 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
     }));
-    mesh.rotation.x = 0.3;
+    const m4 = new Matrix4();
+
+    // m4.makeRotationZ(-Math.PI/2);
+    m4.makeScale(1, -1, -1);
+
+    geo.applyMatrix4(m4);
+
+    // mesh.rotation.x = 0.3;
 
     scene.add(mesh);
 }
@@ -116,7 +93,48 @@ function makeGLTF(path) {
     });
 }
 
-function init() {
+async function init() {
+
+    const am = new AssetManager();
+    await am.registerLoader(GameAssetType.Image, new ImageRGBADataLoader());
+    am.startup();
+
+    virtualTextureManager.setTextureParameters(
+        2048,
+        // 16384,
+        32,
+        3
+    );
+
+    sparseTexture.path = "data/textures/utility/vt/uv_map_reference";
+    // sparseTexture.path = "data/textures/utility/vt/Lenna";
+    // sparseTexture.path = "data/textures/utility/vt/TexelDensity1";
+    sparseTexture.page_texture_size = [128, 768];
+    sparseTexture.tile_resolution = virtualTextureManager.tile_resolution;
+    sparseTexture.asset_manager = am;
+
+
+    console.log(sparseTexture);
+
+
+    //
+    const usageDebugView = new UsageDebugView();
+    usageDebugView.mip_levels = virtualTextureManager.max_mip_level;
+    // container_view.addChild(usageDebugView);
+
+
+    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);
+
+    // ===================
 
     const container = document.body;
 
@@ -125,14 +143,15 @@ function init() {
     container.appendChild(container_view.el);
     container_view.link();
 
-    camera = new PerspectiveCamera(35, window.innerWidth / window.innerHeight, 0.1, 300);
+    camera = new PerspectiveCamera(35, window.innerWidth / window.innerHeight, 0.1, 100);
     camera.position.z = 4;
 
     scene = new Scene();
 
     clock = new Clock();
 
-    makeTorus();
+    // makeTorus();
+    makeMesh();
 
     // makeGLTF("data/models/LowPolyTownshipSet/Town_Hall/model.gltf");
 
@@ -166,7 +185,7 @@ function init() {
         gui.add(options, key);
     });
 
-
+    animate();
 }
 
 function onWindowResize() {
@@ -208,10 +227,10 @@ function render() {
     renderer.clear();
     renderer.render(scene, camera)
 
-    usageDebugView.usage = virtualTextureManager.usage_metadata;
+    // usageDebugView.usage = virtualTextureManager.usage_metadata;
 
-    usagePyramidDebugView.setTextureParameters(virtualTextureManager.texture_resolution, virtualTextureManager.tile_resolution);
-    usagePyramidDebugView.usage = virtualTextureManager.usage_metadata;
+    // usagePyramidDebugView.setTextureParameters(virtualTextureManager.texture_resolution, virtualTextureManager.tile_resolution);
+    // usagePyramidDebugView.usage = virtualTextureManager.usage_metadata;
 
     residencyDebugView.update();
 }

package/src/engine/graphics/texture/virtual/v2/tile/{TextureTile.js → VirtualTextureTile.js}

@@ -1,4 +1,4 @@
-export class TextureTile {
+export class VirtualTextureTile {
 
     finder_print = 0;
 
@@ -18,7 +18,7 @@ export class TextureTile {
 
     /**
      *
-     * @param {TextureTile} other
+     * @param {VirtualTextureTile} other
      * @returns {boolean}
      */
     equals(other) {

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

@@ -1,3 +1,4 @@
+import { assert } from "../../../../../../core/assert.js";
 import { split_by_2 } from "../../../../../../core/geom/3d/morton/split_by_2.js";
 
 /**
@@ -12,6 +13,9 @@ export function compose_tile_address(mip, x, y) {
     // figure out resolution of this mip level
     const mip_resolution = 1 << mip;
 
+    assert.lessThan(x, mip_resolution);
+    assert.lessThan(y, mip_resolution);
+
     // this is basically converting something like 0100 to 0011;
     const mip_mask = mip_resolution - 1;