@woosh/meep-engine 2.70.0 → 2.72.0

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

@@ -1,56 +1,108 @@
-import * as THREE from "three";
-import { fragment, vertex } from "./ShaderUsage.js";
+import { GUI } from "dat.gui";
+import {
+    AmbientLight,
+    Clock,
+    DirectionalLight,
+    Mesh,
+    MeshStandardMaterial,
+    PerspectiveCamera,
+    Scene,
+    TextureLoader,
+    TorusGeometry,
+    Vector2,
+    WebGLRenderer
+} from "three";
 import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js";
+import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js";
+import EmptyView from "../../../../../view/elements/EmptyView.js";
+import { UsagePyramidDebugView } from "./UsagePyramidDebugView.js";
+import { VirtualTextureManager } from "./VirtualTextureManager.js";
+
+let camera,
+    /**
+     * @type {WebGLRenderer}
+     */
+    renderer,
+    clock,
+    /**
+     * @type {Scene}
+     */
+    scene;
+
+let mesh;
+
+const virtualTextureManager = new VirtualTextureManager();
+virtualTextureManager.setTextureParameters(
+    // 2048,
+    16384,
+    128,
+    3
+);
+
+const container_view = new EmptyView();
+//
+// const usageDebugView = new UsageDebugView();
+// container_view.addChild(usageDebugView);
+
+// 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 usagePyramidDebugView = new UsagePyramidDebugView();
+usagePyramidDebugView.setImageURL(TEXTURE_URL);
 
-let camera, renderer, clock, scene;
+container_view.addChild(usagePyramidDebugView);
 
-let uniforms, mesh;
+const options = {
+    spin: true
+};
 
 init();
 animate();
 
+
+function makeTorus() {
+    const size = 0.65;
+    mesh = new Mesh(new TorusGeometry(size, 0.3, 30, 30), new MeshStandardMaterial({
+        roughness: 0.4,
+        map: new TextureLoader().load(TEXTURE_URL)
+    }));
+    mesh.rotation.x = 0.3;
+}
+
 function init() {
 
     const container = document.body;
 
-    camera = new THREE.PerspectiveCamera(35, window.innerWidth / window.innerHeight, 1, 3000);
-    camera.position.z = 4;
+    container.style.margin = "0";
 
-    scene = new THREE.Scene();
+    container.appendChild(container_view.el);
+    container_view.link();
 
-    clock = new THREE.Clock();
+    camera = new PerspectiveCamera(35, window.innerWidth / window.innerHeight, 0.1, 300);
+    camera.position.z = 4;
 
-    const textureLoader = new THREE.TextureLoader();
+    scene = new Scene();
 
-    uniforms = {
-        "u_mt_params": { value: new THREE.Vector2(0.1, 6) },
-        /**
-         * Format: VT_WIDTH, VT_HEIGHT, VT_TILE_SIZE, VT_ID
-         *   - VT_WIDTH :       width of the virtual texture
-         *   - VT_HEIGHT :      height of the virtual texture
-         *   - VT_TILE_SIZE :   resolution of a single tile
-         *   - VT_ID :          multiple different virtual textures may be used, this identifies current texture
-         */
-        "u_mt_tex": { value: new THREE.Vector4(16384, 16384, 256, 1) }
-    };
+    clock = new Clock();
 
-    const size = 0.65;
 
-    const material = new THREE.ShaderMaterial({
+    new GLTFLoader().load("data/models/LowPolyTownshipSet/Town_Hall/model.gltf", (gltf) => {
 
-        uniforms: uniforms,
-        vertexShader: vertex(),
-        fragmentShader: fragment()
+        mesh = gltf.scene;
+        scene.add(mesh);
 
     });
 
-    mesh = new THREE.Mesh(new THREE.TorusGeometry(size, 0.3, 30, 30), material);
-    mesh.rotation.x = 0.3;
-    scene.add(mesh);
+    scene.add(new DirectionalLight(0xFFFFFF, 0.7));
+    scene.add(new AmbientLight(0xFFFFFF, 0.2));
+
 
     //
 
-    renderer = new THREE.WebGLRenderer({ antialias: true });
+    renderer = new WebGLRenderer({ antialias: true });
     renderer.setPixelRatio(window.devicePixelRatio);
     container.appendChild(renderer.domElement);
     renderer.autoClear = false;
@@ -67,6 +119,14 @@ function init() {
 
     new OrbitControls(camera, renderer.domElement);
 
+
+    const gui = new GUI();
+
+    Object.keys(options).forEach(key => {
+        gui.add(options, key);
+    });
+
+
 }
 
 function onWindowResize() {
@@ -92,10 +152,23 @@ function render() {
 
     const delta = 5 * clock.getDelta();
 
-    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());
+
+
+    virtualTextureManager.setViewportResolution(view_port_size.x, view_port_size.y);
+    virtualTextureManager.updateUsage(renderer, scene, camera);
 
     renderer.clear();
     renderer.render(scene, camera)
 
+    // usageDebugView.usage = virtualTextureManager.usage_metadata;
+
+    usagePyramidDebugView.setTextureParameters(virtualTextureManager.texture_resolution, virtualTextureManager.tile_resolution);
+    usagePyramidDebugView.usage = virtualTextureManager.usage_metadata;
 }

package/src/engine/navigation/ecs/components/PathSerializationAdapter.js

@@ -1,5 +1,5 @@
-import { BinaryClassSerializationAdapter } from "../../../ecs/storage/binary/BinaryClassSerializationAdapter.js";
 import Vector3 from "../../../../core/geom/Vector3.js";
+import { BinaryClassSerializationAdapter } from "../../../ecs/storage/binary/BinaryClassSerializationAdapter.js";
 import Path from "./Path.js";
 
 
@@ -54,8 +54,5 @@ export class PathSerializationAdapter extends BinaryClassSerializationAdapter {
 
             value.setPosition(i, x, y, z);
         }
-
-        // mark length for update
-        value.__length = -1;
     }
 }

package/src/core/binary/ValidatingBitSetWrapper.js

@@ -1,81 +0,0 @@
-//
-
-/**
- * Debug tool to verify correct behavior of a BitSet
- */
-export class ValidatingBitSetWrapper {
-    /**
-     *
-     * @param {BitSet} source
-     */
-    constructor(source) {
-        this.__source = source;
-    }
-
-    preventShrink() {
-        this.__source.preventShrink();
-    }
-
-    setShrinkFactor(x) {
-        this.__source.setShrinkFactor(x);
-    }
-
-    setCapacity(x) {
-        this.__source.setCapacity(x);
-    }
-
-    size() {
-        return this.__source.size();
-    }
-
-    capacity() {
-        return this.__source.capacity();
-    }
-
-    previousSetBit(i) {
-        const bit = this.__source.previousSetBit(i);
-
-        if (bit !== -1 && (this.__source.get(bit) !== true || bit > i)) {
-            debugger;
-        }
-
-        return bit;
-    }
-
-    nextSetBit(i) {
-        const bit = this.__source.nextSetBit(i);
-
-        if (bit !== -1 && (this.__source.get(bit) !== true || bit < i)) {
-            debugger;
-        }
-
-        return bit;
-    }
-
-    nextClearBit(i) {
-        const bit = this.__source.nextClearBit(i);
-
-        if (bit !== -1 && (this.__source.get(bit) !== false || bit < i)) {
-            debugger;
-        }
-
-        return bit;
-    }
-
-    set(x, y) {
-        this.__source.set(x, y);
-    }
-
-    clear(i) {
-        this.__source.clear(i);
-    }
-
-    get(i) {
-        return this.__source.get(i);
-    }
-
-
-    reset() {
-        this.__source.reset();
-    }
-}

package/src/core/binary/jsonToStringToByteArray.js

@@ -1,27 +0,0 @@
-import {stringifyStream} from "../json/JsonUtils.js";
-
-/**
- *
- * @param {Object} json
- * @returns {number[]}
- */
-function jsonToStringToByteArray(json) {
-    const output = [];
-    let p = 0;
-
-    function addToOutput(str) {
-        for (let i = 0; i < str.length; i++) {
-            let c = str.charCodeAt(i);
-            while (c > 0xff) {
-                output[p++] = c & 0xff;
-                c >>= 8;
-            }
-            output[p++] = c;
-        }
-    }
-
-    stringifyStream(json, addToOutput);
-    return output;
-}
-
-export {jsonToStringToByteArray};