@woosh/meep-engine 2.35.15 → 2.36.0

package/engine/graphics/micron/prototypeMicronProxyBuild.js

@@ -0,0 +1,227 @@
+import { PLYLoader } from "three/examples/jsm/loaders/PLYLoader.js";
+import {
+    AmbientLight,
+    CubeTextureLoader,
+    DirectionalLight,
+    FrontSide,
+    Mesh,
+    MeshBasicMaterial,
+    MeshStandardMaterial,
+    PerspectiveCamera,
+    PointLight,
+    RepeatWrapping,
+    Scene,
+    SphereGeometry,
+    sRGBEncoding,
+    TextureLoader,
+    VSMShadowMap,
+    WebGLRenderer
+} from "three";
+import Stats from "three/examples/jsm/libs/stats.module.js";
+import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js";
+import { buildMicronGeometryFromBufferGeometry } from "./build/buildMicronGeometryFromBufferGeometry.js";
+
+const background = new TextureLoader().load('data/textures/utility/checkers_white_grey_256x256.png');
+background.repeat.set(50, 30);
+background.wrapS = RepeatWrapping;
+background.wrapT = RepeatWrapping;
+
+let container, stats;
+
+let camera, scene, renderer;
+let directionalLight;
+let pointLight;
+
+let windowHalfX = window.innerWidth / 2;
+let windowHalfY = window.innerHeight / 2;
+
+
+function init() {
+
+    container = document.createElement("div");
+    document.body.appendChild(container);
+
+    camera = new PerspectiveCamera(45, window.innerWidth / window.innerHeight, 1, 1000000);
+    camera.position.z = -4000;
+
+    //
+
+
+    scene = new Scene();
+
+    window.scene = scene;
+
+    // LIGHTS
+
+    const ambient = new AmbientLight(0xffffff, 0.1);
+    scene.add(ambient);
+
+    pointLight = new PointLight(0x6666ff, 0.5);
+    pointLight.position.y = 1000;
+    scene.add(pointLight);
+
+    // light representation
+
+    const sphere = new SphereGeometry(100, 16, 8);
+
+    const mesh = new Mesh(sphere, new MeshBasicMaterial({ color: 0xffffff }));
+    mesh.scale.set(0.5, 0.5, 0.5);
+    pointLight.add(mesh);
+
+    // add directional light
+    directionalLight = new DirectionalLight(0xFFAAAA, 0.8);
+    directionalLight.position.set(-500, 1000, 300);
+    directionalLight.castShadow = true;
+    const shadow_camera = directionalLight.shadow.camera;
+    // small bias to prevent shadow acne
+    directionalLight.shadow.bias = -0.0001;
+    // directionalLight.shadow.mapSize.set(4096, 4096);
+    directionalLight.shadow.mapSize.set(1024, 1024);
+    directionalLight.shadow.autoUpdate = false;
+
+    window.light = directionalLight;
+    // directionalLight.shadow.autoUpdate = true;
+
+    shadow_camera.near = 0.1;
+    shadow_camera.far = 2000;
+
+    const shadow_camera_size = 15;
+
+    shadow_camera.left = -shadow_camera_size / 2;
+    shadow_camera.right = shadow_camera_size / 2;
+
+    shadow_camera.bottom = -shadow_camera_size / 2;
+    shadow_camera.top = shadow_camera_size / 2;
+
+    shadow_camera.updateProjectionMatrix();
+
+
+    scene.add(directionalLight);
+    // material samples
+
+    const cubeMaterial1 = new MeshStandardMaterial({
+        wireframe: false,
+        side: FrontSide,
+        color: 0xffffff
+    });
+
+    //
+
+    renderer = new WebGLRenderer({
+        antialias: true,
+        preserveDrawingBuffer: true,
+        stencil: false
+    });
+
+    renderer.shadowMap.enabled = true;
+    renderer.shadowMap.type = VSMShadowMap;
+    // renderer.shadowMap.type = BasicShadowMap;
+    renderer.sortObjects = false;
+
+    renderer.setPixelRatio(window.devicePixelRatio);
+    renderer.setSize(window.innerWidth, window.innerHeight);
+    container.appendChild(renderer.domElement);
+
+    stats = new Stats();
+    container.appendChild(stats.dom);
+
+
+    window.addEventListener("resize", onWindowResize);
+
+// envmap
+    const genCubeUrls = function (prefix, postfix) {
+
+        return [
+            prefix + "posx" + postfix, prefix + "negx" + postfix,
+            prefix + "posy" + postfix, prefix + "negy" + postfix,
+            prefix + "posz" + postfix, prefix + "negz" + postfix
+        ];
+
+    };
+
+    const urls = genCubeUrls("data/textures/cubemaps/hip_miramar/32/", ".png");
+
+    new CubeTextureLoader().load(urls, function (cubeTexture) {
+
+        cubeTexture.encoding = sRGBEncoding;
+
+        // scene.background = new Color(0.1, 0.1, 0.1);
+        // scene.background = new ThreeColor(1, 0.3, 0.3);
+        // scene.background = new Color(0.3, 1, 0.3);
+
+        scene.background = background;
+        scene.environment = cubeTexture;
+
+
+        // const lightProbe = new LightProbe();
+        //
+        // lightProbe.copy(LightProbeGenerator.fromCubeTexture(cubeTexture));
+        // lightProbe.intensity = 1.2;
+
+        // scene.add(lightProbe);
+    });
+
+    onWindowResize();
+
+    new PLYLoader().load("data/models/stanford/Lucy100k.ply", async geometry => {
+        geometry.computeVertexNormals();
+
+        const source = new Mesh(geometry, new MeshStandardMaterial({ color: 0xFFFFFF }));
+
+        const micron_g = await buildMicronGeometryFromBufferGeometry(geometry);
+
+        micron_g.buildProxy();
+
+        const proxy = new Mesh(micron_g.proxy, new MeshStandardMaterial({ color: 0xFF0000 }));
+
+        source.position.x += 700;
+        proxy.position.x -= 700;
+
+        console.warn(geometry, micron_g);
+
+        scene.add(source);
+        scene.add(proxy);
+    })
+}
+
+function onWindowResize() {
+
+    const w = window.innerWidth;
+    const h = window.innerHeight;
+
+    windowHalfX = w / 2;
+    windowHalfY = h / 2;
+
+    camera.aspect = w / h;
+    camera.updateProjectionMatrix();
+
+    renderer.setSize(w, h);
+
+    background.repeat.set(w / 20, h / 20);
+}
+
+function animate() {
+
+    requestAnimationFrame(animate);
+
+    render();
+    stats.update();
+
+}
+
+function render() {
+    if (orbitControls !== undefined) {
+        orbitControls.update();
+    }
+
+    const timer = -0.0002 * Date.now();
+
+    pointLight.position.x = 10000 * Math.cos(timer);
+    pointLight.position.z = 10000 * Math.sin(timer);
+
+    renderer.render(scene, camera);
+}
+
+init();
+const orbitControls = new OrbitControls(camera, container);
+animate();

package/engine/graphics/micron/render/refinement/ActivePatchList.js

@@ -2,7 +2,7 @@ import { ActivePatchRecord } from "./ActivePatchRecord.js";
 import { ActivePatchFlags } from "./ActivePatchFlags.js";
 import { aabb3_project_to_2d } from "../../../../../core/geom/3d/aabb/aabb3_compute_projected_area.js";
 import { BitSet } from "../../../../../core/binary/BitSet.js";
-import { aabb3_intersects_frustum_array } from "../../../../../core/bvh2/aabb3/aabb3_intersects_frustum_array.js";
+import { aabb3_array_intersects_frustum_array } from "../../../../../core/bvh2/aabb3/aabb3_array_intersects_frustum_array.js";
 
 export class ActivePatchList {
     constructor() {
@@ -199,7 +199,7 @@ export class ActivePatchList {
              check if node is in view frustum
              NOTE: following suggestion in "FastMesh: Efficient View-dependent Meshing" by Renato Pajarola et al, we can do a more coarse frustum test approximating frustum as a cone initially
              */
-            const in_view_frustum = aabb3_intersects_frustum_array(node.bounding_box, frustum_planes);
+            const in_view_frustum = aabb3_array_intersects_frustum_array(node.bounding_box, frustum_planes);
 
             if (!in_view_frustum) {
                 // outside of view frustum, cull

package/engine/graphics/micron/render/refinement/get_geometry_patch_cut.js

@@ -1,5 +1,5 @@
 import { BitSet } from "../../../../../core/binary/BitSet.js";
-import { aabb3_intersects_frustum_array } from "../../../../../core/bvh2/aabb3/aabb3_intersects_frustum_array.js";
+import { aabb3_array_intersects_frustum_array } from "../../../../../core/bvh2/aabb3/aabb3_array_intersects_frustum_array.js";
 import { aabb3_estimate_projected_area2 } from "../../../../../core/geom/3d/aabb/aabb3_estimate_projected_area2.js";
 
 
@@ -67,7 +67,7 @@ export function get_geometry_patch_cut(
          check if node is in view frustum
          NOTE: following suggestion in "FastMesh: Efficient View-dependent Meshing" by Renato Pajarola et al, we can do a more coarse frustum test approximating frustum as a cone initially
          */
-        const in_view_frustum = aabb3_intersects_frustum_array(patch.bounding_box, frustum_planes);
+        const in_view_frustum = aabb3_array_intersects_frustum_array(patch.bounding_box, frustum_planes);
 
         if (!in_view_frustum) {
             continue;

package/engine/graphics/render/forward_plus/LightManager.js

@@ -9,7 +9,7 @@ import {
     LinearMipMapLinearFilter,
     NearestFilter,
     RGBAFormat,
-    RGBIntegerFormat,
+    RGBAIntegerFormat,
     UnsignedByteType,
     UnsignedShortType
 } from "three";
@@ -158,8 +158,8 @@ export class LightManager {
         this.__cluster_texture.minFilter = NearestFilter;
 
         this.__cluster_texture.type = UnsignedShortType;
-        this.__cluster_texture.format = RGBIntegerFormat;
-        this.__cluster_texture.internalFormat = "RGB16UI";
+        this.__cluster_texture.format = RGBAIntegerFormat;
+        this.__cluster_texture.internalFormat = "RGBA16UI";
 
         /**
          *
@@ -347,7 +347,7 @@ export class LightManager {
 
         const texture = this.__cluster_texture;
 
-        const channelCount = 3;
+        const channelCount = 4;
 
         texture.dispose();
 
@@ -826,7 +826,7 @@ export class LightManager {
 
                     const tile_index = slice_offset + (i_y_0 * tr_x) + i_x_0;
 
-                    const tile_address = tile_index * 3;
+                    const tile_address = tile_index * 4;
 
 
                     // construct tile data

package/engine/graphics/render/forward_plus/data/channelCountToThreIntegerTextureType.js

@@ -1,4 +1,4 @@
-import { RedIntegerFormat, RGBAIntegerFormat, RGBIntegerFormat, RGIntegerFormat } from "three";
+import { RedIntegerFormat, RGBAIntegerFormat, RGIntegerFormat } from "three";
 
 export function channelCountToThreIntegerTextureType(channel_count) {
     switch (channel_count) {
@@ -6,10 +6,10 @@ export function channelCountToThreIntegerTextureType(channel_count) {
             return RedIntegerFormat;
         case 2:
             return RGIntegerFormat;
-        case 3:
-            return RGBIntegerFormat;
         case 4:
             return RGBAIntegerFormat;
+        case 3:
+        // see https://github.com/mrdoob/three.js/pull/23228
         default:
             throw new Error(`Unsupported channel count '${channel_count}'`);
     }

package/engine/graphics/texture/channelCountToThreeTextureFormat.js

@@ -1,4 +1,4 @@
-import { RedFormat, RGBAFormat, RGBFormat, RGFormat } from "three";
+import { RedFormat, RGBAFormat, RGFormat } from "three";
 
 /**
  *
@@ -12,7 +12,7 @@ export function channelCountToThreeTextureFormat(count) {
         case 2:
             return RGFormat;
         case 3:
-            return RGBFormat;
+        // see https://github.com/mrdoob/three.js/pull/23228
         case 4:
             return RGBAFormat;
         default:

package/engine/graphics/util/composeMatrix4.js

@@ -1,56 +1,4 @@
-/**
- *
- * @param {number[]|Float32Array|mat4} result
- * @param {Vector3} position
- * @param {Quaternion} rotation
- * @param {Vector3} scale
- */
-export function compose_matrix4_array(result, position, rotation, scale) {
-    const x = rotation.x;
-    const y = rotation.y;
-    const z = rotation.z;
-    const w = rotation.w;
-
-    const x2 = x + x;
-    const y2 = y + y;
-    const z2 = z + z;
-
-    const xx = x * x2;
-    const xy = x * y2;
-    const xz = x * z2;
-
-    const yy = y * y2;
-    const yz = y * z2;
-    const zz = z * z2;
-
-    const wx = w * x2;
-    const wy = w * y2;
-    const wz = w * z2;
-
-    const sx = scale.x;
-    const sy = scale.y;
-    const sz = scale.z;
-
-    result[0] = (1 - (yy + zz)) * sx;
-    result[1] = (xy + wz) * sx;
-    result[2] = (xz - wy) * sx;
-    result[3] = 0;
-
-    result[4] = (xy - wz) * sy;
-    result[5] = (1 - (xx + zz)) * sy;
-    result[6] = (yz + wx) * sy;
-    result[7] = 0;
-
-    result[8] = (xz + wy) * sz;
-    result[9] = (yz - wx) * sz;
-    result[10] = (1 - (xx + yy)) * sz;
-    result[11] = 0;
-
-    result[12] = position.x;
-    result[13] = position.y;
-    result[14] = position.z;
-    result[15] = 1;
-}
+import { compose_matrix4_array } from "../../../core/geom/3d/compose_matrix4_array.js";
 
 /**
  *

package/engine/graphics/util/composeMatrix4RotationScale.js

@@ -1,5 +1,5 @@
-import { compose_matrix4_array } from "./composeMatrix4.js";
 import Vector3 from "../../../core/geom/Vector3.js";
+import { compose_matrix4_array } from "../../../core/geom/3d/compose_matrix4_array.js";
 
 /**
  *

package/engine/intelligence/behavior/ecs/BehaviorComponent.js

@@ -31,7 +31,7 @@ export class BehaviorComponent {
 
     /**
      *
-     * @param {function} f
+     * @param {function(timeDelta:number)} f
      * @param {*} [thisArg]
      * @returns {BehaviorComponent}
      */

package/engine/intelligence/blackboard/AbstractBlackboard.js

@@ -48,6 +48,15 @@ export class AbstractBlackboard {
         return this.acquire(name, DataType.Number, initialValue);
     }
 
+    /**
+     *
+     * @param {string} name
+     * @returns {void}
+     */
+    incrementNumber(name) {
+        this.acquireNumber(name).increment();
+    }
+
     /**
      *
      * @param {string} name

package/engine/navigation/grid/FastBinaryHeap.js

@@ -6,12 +6,15 @@ import { assert } from "../../../core/assert.js";
  */
 class BinaryHeap {
     /**
-     * @template T
-     * @param {function(T):number} scoreFunction
+     * @param {(T)=>number} scoreFunction
      * @constructor
      */
     constructor(scoreFunction) {
 
+        /**
+         *
+         * @type {function(T): number}
+         */
         this.scoreFunction = scoreFunction;
 
         /**
@@ -165,6 +168,14 @@ class BinaryHeap {
         }
     }
 
+    /**
+     *
+     * @returns {T|undefined}
+     */
+    peek() {
+        return this.data[0];
+    }
+
     /**
      *
      * @param {T} node

package/engine/notify/Notification.js

@@ -16,7 +16,7 @@ export class Notification {
      * @constructor
      */
     constructor({ title = "", description = "", image = "", classList = [] }) {
-        assert.ok(Array.isArray(classList), 'classList must be an array, was something else instead');
+        assert.isArray(classList, 'classList');
 
         this.title = title;
 

package/engine/ui/notification/ViewEmitter.js

@@ -1,7 +1,9 @@
 import Vector2 from "../../../core/geom/Vector2.js";
 import { AnimatedObjectEmitter } from "./AnimatedObjectEmitter.js";
 
-
+/**
+ * @template T
+ */
 class ViewEmitter {
     /**
      *
@@ -24,6 +26,10 @@ class ViewEmitter {
             return view;
         };
 
+        /**
+         *
+         * @type {(T)=>View}
+         */
         this.viewFactory = null;
 
         /**

package/engine/ui/notification/notificationGenerator.js

@@ -41,7 +41,7 @@ function notificationGenerator(callback, timeout = 5) {
  *
  * @param {NotificationManager} notifications
  */
-function testNotifications(notifications) {
+export function testNotifications(notifications) {
     notificationGenerator(n => {
         notifications.addNotification(n, NotificationAreaKind.Primary);
     }, 1.3);

package/engine/ui/scene/SceneGUIContext.js

@@ -1,135 +1,7 @@
 import { ModalStack } from "../modal/ModalStack.js";
 import LinearModifier from "../../../core/model/stat/LinearModifier.js";
 import { NotificationManager } from "../notification/NotificationManager.js";
-import ViewEmitter from "../notification/ViewEmitter.js";
-import AnimationTrack from "../../animation/keyed2/AnimationTrack.js";
-import TransitionFunctions from "../../animation/TransitionFunctions.js";
-import { assert } from "../../../core/assert.js";
-import NotificationView from "../../../view/elements/notify/NotificationView.js";
-import { NotificationAreaKind } from "../GUIEngine.js";
-
-/**
- *
- * @param {NotificationManager} manager
- */
-function initializeNotifications(manager) {
-    function makePrimary() {
-        const viewEmitter = new ViewEmitter();
-        viewEmitter.setRushThreshold(1);
-
-        const animationTrack = new AnimationTrack(["alpha", "scale"]);
-        animationTrack.addKey(0, [0, 1.3]);
-        animationTrack.addKey(0.6, [1, 1]);
-        animationTrack.addKey(2.9, [1, 1]);
-        animationTrack.addKey(3.4, [0, 1]);
-
-        animationTrack.addTransition(0, TransitionFunctions.EaseIn);
-        animationTrack.addTransition(2, TransitionFunctions.EaseOut);
-
-        viewEmitter.setAnimation(animationTrack, function (alpha, scale) {
-            /**
-             * @type View
-             */
-            const view = this;
-
-            view.el.style.opacity = alpha;
-            view.scale.set(scale, scale);
-        });
-
-        viewEmitter.viewFactory = function (options) {
-            assert.notEqual(options, undefined, 'options is undefined');
-
-            const notificationView = new NotificationView(options);
-
-            return notificationView;
-        };
-
-
-        return viewEmitter;
-    }
-
-    function makeSecondary() {
-        const viewEmitter = new ViewEmitter();
-        viewEmitter.setRushThreshold(1);
-
-        const animationTrack = new AnimationTrack(["alpha", "position.y", "scale"]);
-        animationTrack.addKey(0, [0.2, 0, 1.1]);
-        animationTrack.addKey(0.17, [1, 0, 1]);
-        animationTrack.addKey(3.2, [1, -60, 1]);
-        animationTrack.addKey(3.7, [0, -70, 1]);
-
-        animationTrack.addTransition(0, TransitionFunctions.EaseIn);
-        animationTrack.addTransition(1, TransitionFunctions.Linear);
-        animationTrack.addTransition(2, TransitionFunctions.EaseOut);
-
-        viewEmitter.setAnimation(animationTrack, function (alpha, positionY, scale) {
-            /**
-             * @type View
-             */
-            const view = this;
-
-            view.el.style.opacity = alpha;
-            view.position.setY(positionY);
-            view.scale.set(scale, scale);
-        });
-
-
-        viewEmitter.viewFactory = function (options) {
-            const notificationView = new NotificationView(options);
-
-            return notificationView;
-        };
-
-        return viewEmitter;
-    }
-
-
-    function makeToast() {
-        const displayDuration = 7.5;
-
-        const viewEmitter = new ViewEmitter();
-        viewEmitter.setRushThreshold(5);
-
-        const animationTrack = new AnimationTrack(["alpha", "position.x"]);
-        animationTrack.addKey(0, [0.2, 100]);
-        animationTrack.addKey(0.17, [1, 0]);
-        animationTrack.addKey(displayDuration, [1, 0]);
-        animationTrack.addKey(displayDuration + 0.5, [0, 0]);
-
-        animationTrack.addTransition(0, TransitionFunctions.EaseIn);
-        animationTrack.addTransition(1, TransitionFunctions.Linear);
-        animationTrack.addTransition(2, TransitionFunctions.EaseOut);
-
-        viewEmitter.setAnimation(animationTrack, function (alpha, positionY) {
-            /**
-             * @type View
-             */
-            const view = this;
-
-            view.el.style.opacity = alpha;
-            view.position.setX(positionY);
-        });
-
-
-        viewEmitter.viewFactory = function (options) {
-            const notificationView = new NotificationView(options);
-
-            return notificationView;
-        };
-
-        return viewEmitter;
-    }
-
-    manager.createChannel(NotificationAreaKind.Primary);
-    manager.createChannel(NotificationAreaKind.Secondary);
-    manager.createChannel(NotificationAreaKind.Toast);
-
-    manager.addEmitterDisplay(NotificationAreaKind.Primary, makePrimary());
-    manager.addEmitterDisplay(NotificationAreaKind.Secondary, makeSecondary());
-    manager.addEmitterDisplay(NotificationAreaKind.Toast, makeToast(), 'managed-toast-notifications');
-
-    // testNotifications(manager);
-}
+import { initializeNotifications } from "./initializeNotifications.js";
 
 export class SceneGUIContext {
     constructor() {
@@ -138,6 +10,11 @@ export class SceneGUIContext {
          * @type {Scene}
          */
         this.scene = null;
+
+        /**
+         *
+         * @type {ModalStack}
+         */
         this.modals = new ModalStack();
 
         /**
@@ -146,6 +23,10 @@ export class SceneGUIContext {
          */
         this.notifications = new NotificationManager();
 
+        /**
+         *
+         * @type {LinearModifier}
+         */
         this.clockModifierZero = new LinearModifier(0, 0);
     }
 
@@ -165,7 +46,7 @@ export class SceneGUIContext {
      *
      * @param {number} timeDelta
      */
-    tick(timeDelta){
+    tick(timeDelta) {
         this.notifications.tick(timeDelta);
     }