@woosh/meep-engine 2.47.3 → 2.47.10

package/src/engine/graphics/render/visibility/IncrementalDeltaSet.js

@@ -229,18 +229,31 @@ export class IncrementalDeltaSet {
     finalizeUpdate() {
         assert.equal(this.state, IncrementalDeltaSetState.Building, `Expected BUILDING state, instead got '${this.state}'`);
 
-        this.size = this.__elements_cursor;
+        const array_main_count = this.__elements_cursor;
+        const array_previous_count = this.__swap_elements_count;
+
+        this.size = array_main_count;
 
         // sort newly populated elements array
-        array_shrink_to_size(this.__elements, this.size);
-        this.__elements.sort(this.__compare);
+        const array_main = this.__elements;
+        const array_previous = this.__swap_elements;
+
+        const compare = this.__compare;
+
+        const onAdded = this.onAdded;
+        const onRemoved = this.onRemoved;
+
+        array_shrink_to_size(array_main, array_main_count);
+        array_main.sort(compare);
+
 
         let i0 = 0, i1 = 0;
-        while (i0 < this.size && i1 < this.__swap_elements_count) {
-            const el_0 = this.__elements[i0];
-            const el_1 = this.__swap_elements[i1];
 
-            const diff = this.__compare(el_0, el_1);
+        while (i0 < array_main_count && i1 < array_previous_count) {
+            const el_0 = array_main[i0];
+            const el_1 = array_previous[i1];
+
+            const diff = compare(el_0, el_1);
 
             if (diff === 0) {
                 i0++;
@@ -249,20 +262,20 @@ export class IncrementalDeltaSet {
             } else if (diff < 0) {
                 i0++;
                 // addition
-                this.onAdded.send1(el_0);
+                onAdded.send1(el_0);
             } else {
                 i1++;
                 // removal
-                this.onRemoved.send1(el_1);
+                onRemoved.send1(el_1);
             }
         }
 
         // process remainders
-        for (; i0 < this.size; i0++) {
-            this.onAdded.send1(this.__elements[i0]);
+        for (; i0 < array_main_count; i0++) {
+            onAdded.send1(array_main[i0]);
         }
-        for (; i1 < this.__swap_elements_count; i1++) {
-            this.onRemoved.send1(this.__swap_elements[i1]);
+        for (; i1 < array_previous_count; i1++) {
+            onRemoved.send1(array_previous[i1]);
         }
 
         this.state = IncrementalDeltaSetState.Ready;

package/src/engine/graphics/sh3/path_tracer/GeometryBVHBatched.js

@@ -2,7 +2,9 @@ import {
     ExplicitBinaryBoundingVolumeHierarchy
 } from "../../../../core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy.js";
 import { bvh_query_leaves_ray } from "../../../../core/bvh2/bvh3/query/bvh_query_leaves_ray.js";
-import { aabb3_signed_distance_sqr_to_point } from "../../../../core/bvh2/aabb3/aabb3_signed_distance_sqr_to_point.js";
+import {
+    aabb3_signed_distance_sqr_to_point
+} from "../../../../core/geom/3d/aabb/aabb3_signed_distance_sqr_to_point.js";
 import {
     computeTriangleRayIntersectionBarycentric
 } from "../../../../core/geom/3d/triangle/computeTriangleRayIntersection.js";
@@ -197,7 +199,11 @@ export class GeometryBVHBatched {
 
                 bvh.node_get_aabb(node_id, temp_aabb3);
 
-                const distance = aabb3_signed_distance_sqr_to_point(temp_aabb3[0], temp_aabb3[1], temp_aabb3[2], temp_aabb3[3], temp_aabb3[4], temp_aabb3[5], ray[0], ray[1], ray[2]);
+                const distance = aabb3_signed_distance_sqr_to_point(
+                    temp_aabb3[0], temp_aabb3[1], temp_aabb3[2],
+                    temp_aabb3[3], temp_aabb3[4], temp_aabb3[5],
+                    ray[0], ray[1], ray[2]
+                );
 
                 if (distance > best_t * best_t) {
                     // whole AABB is too far

package/src/engine/graphics/sh3/path_tracer/PathTracer.js

@@ -92,8 +92,8 @@ export class PathTracer {
         this.geo_cache = new Map();
 
         /**
-         *
-         * @type {Map<THREE.Texture, Sampler2D>}
+         * Maps {@link Texture.id} to relevant sampler
+         * @type {Map<number, Sampler2D>}
          */
         this.textures = new Map();
 
@@ -171,7 +171,7 @@ export class PathTracer {
 
     /**
      *
-     * @param {THREE.Light} light
+     * @param {AbstractLight} light
      */
     addLight(light) {
         this.__lights.push(light);

package/src/engine/graphics/sh3/path_tracer/prototypePathTracer.js

@@ -397,8 +397,8 @@ function* render(target, pt, camera, progress = { current: 0, total: 0 }) {
     camera.matrixWorldInverse.copy(camera.matrixWorld);
     camera.matrixWorldInverse.invert();
 
-    const out = [];
-    const out2 = [];
+    const pixel_color = [];
+    const pixel_accummulation = [];
     const ray = [];
 
     const ray_origin = new Vector3();
@@ -414,7 +414,7 @@ function* render(target, pt, camera, progress = { current: 0, total: 0 }) {
     const pixel_scale_x = 1 / (width - 1);
     const pixel_scale_y = 1 / (height - 1);
 
-    const pixel_sample_count = 500;
+    const pixel_sample_count = 4;
 
     progress.total = width * height;
 
@@ -446,9 +446,13 @@ function* render(target, pt, camera, progress = { current: 0, total: 0 }) {
                     const u = x * pixel_scale_x;
                     const _x = u * 2 - 1;
 
-                    out2[0] = 0;
-                    out2[1] = 0;
-                    out2[2] = 0;
+                    pixel_accummulation[0] = 0;
+                    pixel_accummulation[1] = 0;
+                    pixel_accummulation[2] = 0;
+
+                    const pixel_address = ((max_y - y) * width + x) * 4;
+
+                    target.data[pixel_address + 3] = 255;
 
                     for (let i = 0; i < pixel_sample_count; i++) {
 
@@ -464,22 +468,20 @@ function* render(target, pt, camera, progress = { current: 0, total: 0 }) {
                             ray_direction.x, ray_direction.y, ray_direction.z
                         );
 
-                        pt.path_trace(out, ray, Infinity, 4, random);
+                        pt.path_trace(pixel_color, ray, Infinity, 4, random);
 
-                        out2[0] += out[0];
-                        out2[1] += out[1];
-                        out2[2] += out[2];
+                        pixel_accummulation[0] += pixel_color[0];
+                        pixel_accummulation[1] += pixel_color[1];
+                        pixel_accummulation[2] += pixel_color[2];
 
 
                         sample_count++;
                     }
 
-                    const pixel_address = ((max_y - y) * width + x) * 4;
+                    target.data[pixel_address] = float2uint8(pixel_accummulation[0] / pixel_sample_count);
+                    target.data[pixel_address + 1] = float2uint8(pixel_accummulation[1] / pixel_sample_count);
+                    target.data[pixel_address + 2] = float2uint8(pixel_accummulation[2] / pixel_sample_count);
 
-                    target.data[pixel_address] = float2uint8(out2[0] / pixel_sample_count);
-                    target.data[pixel_address + 1] = float2uint8(out2[1] / pixel_sample_count);
-                    target.data[pixel_address + 2] = float2uint8(out2[2] / pixel_sample_count);
-                    target.data[pixel_address + 3] = 255;
 
                     progress.current++;
 
@@ -515,6 +517,7 @@ async function start_renderer(camera) {
     camera.aspect = vCanvas.size.x / vCanvas.size.y;
 
     // const path = 'data/models/LowPolyTownshipSet/Small_house/Small_house.gltf';
+    const path = 'data/models/pica_pica/pica_pica.gltf';
     // const path = 'data/models/road_bike/road_bike.gltf'; //large CAD-type model
 
     // await prepare_scene_lucy(pt, camera);

package/src/engine/graphics/texture/sampler/sampler2d_channel_compute_max.js

@@ -35,7 +35,7 @@ export function sampler2d_channel_compute_max(sampler, channel=0){
 
     }
 
-    const width = this.width;
+    const width = sampler.width;
 
     const itemIndex = (bestIndex / itemSize) | 0;
 

package/src/engine/graphics/texture/sampler/sampler2d_channel_compute_min.js

@@ -35,7 +35,7 @@ export function sampler2d_channel_compute_min(sampler, channel=0){
 
     }
 
-    const width = this.width;
+    const width = sampler.width;
 
     const itemIndex = (bestIndex / itemSize) | 0;
 

package/src/engine/graphics/three/three_computeObjectBoundingBox.js

@@ -0,0 +1,56 @@
+import { Box3 } from "three";
+
+/**
+ *
+ * @param {Object3D} object
+ * @param {AABB3} result
+ */
+export function three_computeObjectBoundingBox(object, result) {
+    const _sX = object.scale.x;
+    const _sY = object.scale.y;
+    const _sZ = object.scale.z;
+
+    object.scale.set(1, 1, 1);
+
+    const box3 = new Box3();
+
+    box3.expandByObject(object);
+
+    object.scale.set(_sX, _sY, _sZ);
+
+    const min = box3.min;
+    const max = box3.max;
+
+    let x0 = min.x;
+    let y0 = min.y;
+    let z0 = min.z;
+    let x1 = max.x;
+    let y1 = max.y;
+    let z1 = max.z;
+
+    // validate and fix missing bounds
+    if (x1 < x0) {
+        // no bounds
+        x0 = 0;
+        x1 = 0;
+    }
+
+    if (y1 < y0) {
+        // no bounds
+        y0 = 0;
+        y1 = 0;
+    }
+
+    if (z1 < z0) {
+        // no bounds
+        z0 = 0;
+        z1 = 0;
+    }
+
+
+    result.setBounds(
+        x0, y0, z0,
+        x1, y1, z1
+    );
+
+}

package/src/engine/input/devices/{InputDeviceButton.d.ts → InputDeviceSwitch.d.ts}

@@ -1,6 +1,6 @@
 import Signal from "../../../core/events/signal/Signal";
 
-export class InputDeviceButton{
+export class InputDeviceSwitch {
     readonly up: Signal
     readonly down: Signal
     readonly is_down: boolean

package/src/engine/input/devices/{InputDeviceButton.js → InputDeviceSwitch.js}

@@ -3,7 +3,7 @@ import Signal from "../../../core/events/signal/Signal.js";
 /**
  * Representation of an input device key
  */
-export class InputDeviceButton {
+export class InputDeviceSwitch {
     /**
      * Button press
      * @type {Signal}

package/src/engine/input/devices/KeyboardDevice.d.ts

@@ -1,4 +1,4 @@
-import {InputDeviceButton} from "./InputDeviceButton";
+import {InputDeviceSwitch} from "./InputDeviceSwitch";
 import Signal from "../../../core/events/signal/Signal";
 
 export default class KeyboardDevice {
@@ -6,7 +6,7 @@ export default class KeyboardDevice {
 
     readonly on: {up:Signal,down:Signal}
 
-    readonly keys:{[key:string]:InputDeviceButton}
+    readonly keys:{[key:string]:InputDeviceSwitch}
 
     start():void
 

package/src/engine/input/devices/KeyboardDevice.js

@@ -5,7 +5,7 @@
 import Signal from "../../../core/events/signal/Signal.js";
 import { KeyCodes } from './KeyCodes.js';
 import { KeyboardEvents } from "./events/KeyboardEvents.js";
-import { InputDeviceButton } from "./InputDeviceButton.js";
+import { InputDeviceSwitch } from "./InputDeviceSwitch.js";
 
 /**
  *
@@ -42,7 +42,28 @@ function isFocusable(el) {
         || isInstanceOf(el, HTMLAreaElement)
 }
 
+/**
+ * @readonly
+ * @type {string[]}
+ */
+const codeToKeyNameMap = [];
+
 class KeyboardDevice {
+
+    /**
+     * @readonly
+     */
+    on = {
+        down: new Signal(),
+        up: new Signal()
+    };
+
+    /**
+     * @readonly
+     * @type {Object<InputDeviceSwitch>}
+     */
+    keys = {};
+
     /**
      *
      * @param {EventTarget|Element} domElement
@@ -62,19 +83,6 @@ class KeyboardDevice {
          */
         this.domElement = domElement;
 
-        this.on = {
-            down: new Signal(),
-            up: new Signal()
-        };
-
-
-        /**
-         *
-         * @type {Object<InputDeviceButton>}
-         */
-        const keys = this.keys = {};
-
-        const codeToKeyNameMap = [];
 
         //initialize separate events for each key
         for (let keyName in KeyCodes) {
@@ -83,51 +91,61 @@ class KeyboardDevice {
 
             codeToKeyNameMap[keyCode] = keyName;
 
-            keys[keyName] = new InputDeviceButton();
+            this.keys[keyName] = new InputDeviceSwitch();
         }
 
-        this.__handlerKeyDown = (event) => {
-            this.on.down.send1(event);
+    }
 
-            //hook up dispatch handler for individual keys
-            const keyCode = event.keyCode;
-            const keyName = codeToKeyNameMap[keyCode];
+    /**
+     *
+     * @param {KeyboardEvent} event
+     * @private
+     */
+    #handlerKeyDown = (event) => {
+        this.on.down.send1(event);
 
-            if (keyName !== undefined) {
-                const button = keys[keyName];
+        //hook up dispatch handler for individual keys
+        const keyCode = event.keyCode;
+        const keyName = codeToKeyNameMap[keyCode];
 
-                button.is_down = true;
-                button.down.send1(event);
+        if (keyName !== undefined) {
+            const button = this.keys[keyName];
+
+            button.is_down = true;
+            button.down.send1(event);
 
-            }
         }
+    }
 
-        this.__handlerKeyUp = (event) => {
-            this.on.up.send1(event);
+    /**
+     *
+     * @param {KeyboardEvent} event
+     * @private
+     */
+    #handlerKeyUp = (event) => {
+        this.on.up.send1(event);
 
-            //hook up dispatch handler for individual keys
-            const keyCode = event.keyCode;
+        //hook up dispatch handler for individual keys
+        const keyCode = event.keyCode;
 
-            const keyName = codeToKeyNameMap[keyCode];
+        const keyName = codeToKeyNameMap[keyCode];
 
-            if (keyName !== undefined) {
-                const button = keys[keyName];
+        if (keyName !== undefined) {
+            const button = this.keys[keyName];
 
-                button.is_down = false;
-                button.up.send1(event);
-            }
+            button.is_down = false;
+            button.up.send1(event);
         }
     }
 
-
     start() {
-        this.domElement.addEventListener(KeyboardEvents.KeyDown, this.__handlerKeyDown);
-        this.domElement.addEventListener(KeyboardEvents.KeyUp, this.__handlerKeyUp);
+        this.domElement.addEventListener(KeyboardEvents.KeyDown, this.#handlerKeyDown);
+        this.domElement.addEventListener(KeyboardEvents.KeyUp, this.#handlerKeyUp);
     }
 
     stop() {
-        this.domElement.removeEventListener(KeyboardEvents.KeyDown, this.__handlerKeyDown);
-        this.domElement.removeEventListener(KeyboardEvents.KeyUp, this.__handlerKeyUp);
+        this.domElement.removeEventListener(KeyboardEvents.KeyDown, this.#handlerKeyDown);
+        this.domElement.removeEventListener(KeyboardEvents.KeyUp, this.#handlerKeyUp);
     }
 }