@woosh/meep-engine 2.93.3 → 2.94.1

package/src/engine/graphics/ecs/light/binding/LightBinding.js

@@ -1,3 +1,4 @@
+import { max3 } from "../../../../../core/math/max3.js";
 import { LightType } from "../LightType.js";
 
 export class LightBinding {
@@ -16,6 +17,14 @@ export class LightBinding {
         this.__c_light = null;
     }
 
+    get scaled_distance() {
+        const scale = this.__c_transform.scale;
+        const scale_magnitude = max3(scale.x, scale.y, scale.z);
+        const light_radius = this.__c_light.distance.getValue();
+
+        return light_radius * scale_magnitude;
+    }
+
     set component_transform(v) {
         this.__c_transform = v;
     }
@@ -39,6 +48,7 @@ export class LightBinding {
     link(ctx) {
         this.__c_transform.position.onChanged.add(this.__apply_position, this);
         this.__c_transform.rotation.onChanged.add(this.__apply_rotation, this);
+        this.__c_transform.rotation.onChanged.add(this.__apply_scale, this);
 
         const l = this.__c_light;
 
@@ -64,6 +74,7 @@ export class LightBinding {
 
         this.__apply_position();
         this.__apply_rotation();
+        this.__apply_scale();
 
         this.applySettings(ctx.system.settings);
     }
@@ -75,6 +86,7 @@ export class LightBinding {
     unlink(ctx) {
         this.__c_transform.position.onChanged.remove(this.__apply_position, this);
         this.__c_transform.rotation.onChanged.remove(this.__apply_rotation, this);
+        this.__c_transform.rotation.onChanged.remove(this.__apply_scale, this);
 
         this.__c_light.intensity.onChanged.remove(this.__apply_intensity, this);
         this.__c_light.color.onChanged.remove(this.__apply_color, this);
@@ -92,6 +104,10 @@ export class LightBinding {
 
     }
 
+    __apply_scale(){
+
+    }
+
     __apply_intensity() {
 
     }

package/src/engine/graphics/ecs/light/binding/fp/FPLightBinding.d.ts

@@ -1,5 +1,15 @@
 export class FPLightBinding extends LightBinding {
-    __light: PointLight;
+    /**
+     *
+     * @type {PointLight|null}
+     * @private
+     */
+    private __light;
+    /**
+     *
+     * @type {SignalBinding[]}
+     */
+    bindings: SignalBinding[];
     /**
      * @param {LightContext} ctx
      * @return {ForwardPlusRenderingPlugin}
@@ -8,7 +18,8 @@ export class FPLightBinding extends LightBinding {
     private getPlugin;
     link(ctx: any): void;
     unlink(ctx: any): void;
+    #private;
 }
 import { LightBinding } from "../LightBinding.js";
-import { PointLight } from "../../../../render/forward_plus/model/PointLight.js";
+import { SignalBinding } from "../../../../../../core/events/signal/SignalBinding.js";
 //# sourceMappingURL=FPLightBinding.d.ts.map

package/src/engine/graphics/ecs/light/binding/fp/FPLightBinding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FPLightBinding.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/ecs/light/binding/fp/FPLightBinding.js"],"names":[],"mappings":"AAGA;IAIQ,oBAAmB;IAGvB;;;;OAIG;IACH,kBAEC;IAED,qBA4BC;IAED,uBAUC;CACJ;6BA5D4B,oBAAoB;2BACtB,qDAAqD"}
+{"version":3,"file":"FPLightBinding.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/ecs/light/binding/fp/FPLightBinding.js"],"names":[],"mappings":"AAIA;IAIQ;;;;OAIG;IACH,gBAAmB;IAEnB;;;OAGG;IACH,UAFU,aAAa,EAAE,CAEP;IAGtB;;;;OAIG;IACH,kBAEC;IAMD,qBAwCC;IAED,uBAeC;;CACJ;6BA3F4B,oBAAoB;8BAFnB,uDAAuD"}

package/src/engine/graphics/ecs/light/binding/fp/FPLightBinding.js

@@ -1,11 +1,23 @@
-import { LightBinding } from "../LightBinding.js";
+import { SignalBinding } from "../../../../../../core/events/signal/SignalBinding.js";
 import { PointLight } from "../../../../render/forward_plus/model/PointLight.js";
+import { LightBinding } from "../LightBinding.js";
 
 export class FPLightBinding extends LightBinding {
     constructor() {
         super();
 
+        /**
+         *
+         * @type {PointLight|null}
+         * @private
+         */
         this.__light = null;
+
+        /**
+         *
+         * @type {SignalBinding[]}
+         */
+        this.bindings = [];
     }
 
     /**
@@ -17,6 +29,10 @@ export class FPLightBinding extends LightBinding {
         return ctx.system.__plugin.getValue();
     }
 
+    #updateDistance() {
+        this.__light.radius.set(this.scaled_distance);
+    }
+
     link(ctx) {
         /**
          *
@@ -29,11 +45,17 @@ export class FPLightBinding extends LightBinding {
         const pl = new PointLight();
 
         const cLight = this.__c_light;
+        const cTransform = this.__c_transform;
+
+        this.bindings.push(
+            new SignalBinding(cLight.distance.onChanged, this.#updateDistance, this),
+            new SignalBinding(cTransform.scale.onChanged, this.#updateDistance, this)
+        );
 
         pl.intensity = cLight.intensity;
         pl.color = cLight.color;
-        pl.radius = cLight.distance;
-        pl.position = this.__c_transform.position;
+
+        pl.position = cTransform.position;
 
         /**
          *
@@ -42,9 +64,15 @@ export class FPLightBinding extends LightBinding {
          */
         cLight.__fp_light = pl;
 
+        this.__light = pl;
+
+        this.#updateDistance();
+
         lightManager.addLight(pl);
 
-        this.__light = pl;
+        for (let i = 0; i < this.bindings.length; i++) {
+            this.bindings[i].link();
+        }
     }
 
     unlink(ctx) {
@@ -57,5 +85,10 @@ export class FPLightBinding extends LightBinding {
         const lightManager = fp.getLightManager();
 
         lightManager.removeLight(this.__light);
+
+        for (let i = 0; i < this.bindings.length; i++) {
+            this.bindings[i].unlink();
+        }
+        this.bindings.splice(0, this.bindings.length);
     }
 }

package/src/engine/graphics/ecs/light/binding/three/ThreeLightBinding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ThreeLightBinding.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/ecs/light/binding/three/ThreeLightBinding.js"],"names":[],"mappings":"AAwEA;IAKQ;;;;OAIG;IACH,iBAAoB;IAEpB;;;;OAIG;IACH,qBAAwB;IAExB;;;;OAIG;IACH,qBAAiC;IAGrC,qBAYC;IAED,uBAcC;IAED;;;;OAIG;IACH,yBAEC;IAYD,+BAEC;IAUD,yBAuBC;IAED,2BAgBC;IAED,iCA0BC;IAGD,2BA0CC;IA0CD,mCA6BC;CAEJ;6BA3V4B,oBAAoB"}
+{"version":3,"file":"ThreeLightBinding.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/ecs/light/binding/three/ThreeLightBinding.js"],"names":[],"mappings":"AAwEA;IAKQ;;;;OAIG;IACH,iBAAoB;IAEpB;;;;OAIG;IACH,qBAAwB;IAExB;;;;OAIG;IACH,qBAAiC;IAGrC,qBAYC;IAED,uBAcC;IAED;;;;OAIG;IACH,yBAEC;IAYD,+BAEC;IAUD,yBAuBC;IAED,2BAgBC;IAED,iCA0BC;IAGD,2BA0CC;IA8CD,mCA6BC;CAEJ;6BAzV4B,oBAAoB"}

package/src/engine/graphics/ecs/light/binding/three/ThreeLightBinding.js

@@ -1,12 +1,12 @@
-import { LightBinding } from "../LightBinding.js";
-import { threeEnsureLightObject } from "./threeEnsureLightObject.js";
-import { LightType } from "../../LightType.js";
-import { applyRotation } from "./applyRotation.js";
-import { threeUpdateTransform } from "../../../../util/threeUpdateTransform.js";
-import { ShadowMap } from "../../shadow/ShadowMap.js";
-import { CameraView } from "../../../../render/view/CameraView.js";
 import { DoubleSide, Mesh, MeshDepthMaterial, RGBADepthPacking, Scene } from "three";
 import { ThreeBypassRenderer } from "../../../../render/utils/ThreeBypassRenderer.js";
+import { CameraView } from "../../../../render/view/CameraView.js";
+import { threeUpdateTransform } from "../../../../util/threeUpdateTransform.js";
+import { LightType } from "../../LightType.js";
+import { ShadowMap } from "../../shadow/ShadowMap.js";
+import { LightBinding } from "../LightBinding.js";
+import { applyRotation } from "./applyRotation.js";
+import { threeEnsureLightObject } from "./threeEnsureLightObject.js";
 
 const shadow_scene = new Scene();
 shadow_scene.autoUpdate = false;
@@ -147,7 +147,7 @@ export class ThreeLightBinding extends LightBinding {
     }
 
     __apply_distance(v) {
-        this.__three_getLight().distance = this.__c_light.distance.getValue();
+        this.__three_getLight().distance = this.scaled_distance;
     }
 
     __apply_angle() {
@@ -314,6 +314,10 @@ export class ThreeLightBinding extends LightBinding {
         applyRotation(this.__c_light, this.__c_transform.rotation);
     }
 
+    __apply_scale() {
+        this.__three_getLight().distance = this.scaled_distance;
+    }
+
     applySettings(settings) {
         const light = this.__three_getLight();
 

package/src/engine/graphics/particles/particular/engine/utils/volume/prototypeParticleVolume.js

@@ -1070,7 +1070,7 @@ function create_volume({
  *
  * @param {Vector3} position
  * @param {ParameterLookupTable} lut
- * @return {{position: Vector1}}
+ * @return {{position: Vector1, entity:Entity}}
  */
 function make_symbol_view({
                               position,

package/src/engine/graphics/sh3/path_tracer/GeometryBVHBatched.d.ts

@@ -34,15 +34,6 @@ export class GeometryBVHBatched {
      * @param {THREE.BufferGeometry} geometry
      */
     build(geometry: THREE.BufferGeometry): void;
-    /**
-     *
-     * @param {number[]} output
-     * @param {number} face_index
-     * @param {number} t
-     * @param {number} u
-     * @param {number} v
-     */
-    construct_ray_hit(output: number[], face_index: number, t: number, u: number, v: number): void;
     /**
      *
      * @param {number[]} output

package/src/engine/graphics/sh3/path_tracer/GeometryBVHBatched.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GeometryBVHBatched.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/GeometryBVHBatched.js"],"names":[],"mappings":"AAwBA;IAEQ;;;;OAIG;IACH,cAAsB;IAEtB;;;;OAIG;IACH,mBAAsB;IAEtB;;;;OAIG;IACH,yBAA4B;IAE5B;;;;OAIG;IACH,6BAAgC;IAGhC;;;;OAIG;IACH,yBAAyB;IAG7B;;;OAGG;IACH,gBAFW,MAAM,cAAc,QAwB9B;IAED;;;;;;;OAOG;IACH,0BANW,MAAM,EAAE,cACR,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,QAuDhB;IAED;;;;;;;OAOG;IACH,gBANW,MAAM,EAAE,OACR,MAAM,EAAE,gBACR,MAAM,gBACN,MAAM,GACJ,MAAM,CA4GlB;CACJ"}
+{"version":3,"file":"GeometryBVHBatched.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/GeometryBVHBatched.js"],"names":[],"mappings":"AA4FA;IAEQ;;;;OAIG;IACH,cAAsB;IAEtB;;;;OAIG;IACH,mBAAsB;IAEtB;;;;OAIG;IACH,yBAA4B;IAE5B;;;;OAIG;IACH,6BAAgC;IAGhC;;;;OAIG;IACH,yBAAyB;IAG7B;;;OAGG;IACH,gBAFW,MAAM,cAAc,QAyB9B;IAGD;;;;;;;OAOG;IACH,gBANW,MAAM,EAAE,OACR,MAAM,EAAE,gBACR,MAAM,gBACN,MAAM,GACJ,MAAM,CAwElB;CACJ"}

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

@@ -1,26 +1,94 @@
 import { BVH } from "../../../../core/bvh2/bvh3/BVH.js";
 import { ebvh_build_for_geometry_morton } from "../../../../core/bvh2/bvh3/ebvh_build_for_geometry_morton.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/geom/3d/aabb/aabb3_signed_distance_sqr_to_point.js";
+import { bvh_query_user_data_ray } from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_ray.js";
+
 import {
-    computeTriangleRayIntersectionBarycentric
-} from "../../../../core/geom/3d/triangle/computeTriangleRayIntersectionBarycentric.js";
+    computeTriangleRayIntersectionBarycentricGeometry
+} from "../../../../core/geom/3d/triangle/computeTriangleRayIntersectionBarycentricGeometry.js";
 
 /**
  *
  * @type {number[]}
  */
-const leaf_buffer = [];
+const scratch_uint32_array = [];
 /**
  *
  * @type {number[]}
  */
 const v3_scratch_0 = [];
 
-const temp_aabb3 = new Float32Array(6);
-
+/**
+ *
+ * @param {number[]} output
+ * @param {number[]} indices
+ * @param {number[]} positions
+ * @param {number} face_index
+ * @param {number} t
+ * @param {number} u
+ * @param {number} v
+ */
+function construct_ray_hit(
+    output,
+    indices, positions,
+    face_index,
+    t, u, v
+) {
+
+    const index_offset = face_index * 3;
+
+    const a = indices[index_offset];
+    const b = indices[index_offset + 1];
+    const c = indices[index_offset + 2];
+
+    const a_address = a * 3;
+    const b_address = b * 3;
+    const c_address = c * 3;
+
+    const ax = positions[a_address];
+    const ay = positions[a_address + 1];
+    const az = positions[a_address + 2];
+
+    const bx = positions[b_address];
+    const by = positions[b_address + 1];
+    const bz = positions[b_address + 2];
+
+    const cx = positions[c_address];
+    const cy = positions[c_address + 1];
+    const cz = positions[c_address + 2];
+
+    // normal
+
+    // edge1 = a - b
+    const edge1_x = bx - ax;
+    const edge1_y = by - ay;
+    const edge1_z = bz - az;
+
+    // edge2 = c - a
+    const edge2_x = cx - ax;
+    const edge2_y = cy - ay;
+    const edge2_z = cz - az;
+
+    // compute position of intersection point
+    output[0] = ax + edge1_x * u + edge2_x * v;
+    output[1] = ay + edge1_y * u + edge2_y * v;
+    output[2] = az + edge1_z * u + edge2_z * v;
+
+    // Compute triangle normal
+
+    // normal = edge1 x edge2
+    const normal_x = edge1_y * edge2_z - edge1_z * edge2_y;
+    const normal_y = edge1_z * edge2_x - edge1_x * edge2_z;
+    const normal_z = edge1_x * edge2_y - edge1_y * edge2_x
+
+    output[3] = normal_x;
+    output[4] = normal_y;
+    output[5] = normal_z;
+
+    output[6] = t;
+    output[7] = u;
+    output[8] = v;
+    output[9] = face_index;
+}
 
 export class GeometryBVHBatched {
     constructor() {
@@ -86,71 +154,10 @@ export class GeometryBVHBatched {
         //
         // ebvh_build_for_geometry_incremental(bvh, index_array, array_positions, 1);
 
+        // remove any extra unused space
         bvh.trim();
     }
 
-    /**
-     *
-     * @param {number[]} output
-     * @param {number} face_index
-     * @param {number} t
-     * @param {number} u
-     * @param {number} v
-     */
-    construct_ray_hit(output, face_index, t, u, v) {
-        const indices = this.__geometry_index;
-        const positions = this.__geometry_positions;
-
-        const index_offset = face_index * 3;
-
-        const a = indices[index_offset];
-        const b = indices[index_offset + 1];
-        const c = indices[index_offset + 2];
-
-        const a_address = a * 3;
-        const b_address = b * 3;
-        const c_address = c * 3;
-
-        const ax = positions[a_address];
-        const ay = positions[a_address + 1];
-        const az = positions[a_address + 2];
-
-        const bx = positions[b_address];
-        const by = positions[b_address + 1];
-        const bz = positions[b_address + 2];
-
-        const cx = positions[c_address];
-        const cy = positions[c_address + 1];
-        const cz = positions[c_address + 2];
-
-        // normal
-
-        // edge1 = a - b
-        const edge1_x = bx - ax;
-        const edge1_y = by - ay;
-        const edge1_z = bz - az;
-
-        // edge2 = c - a
-        const edge2_x = cx - ax;
-        const edge2_y = cy - ay;
-        const edge2_z = cz - az;
-
-        // Compute triangle normal
-
-        // normal = edge1 x edge2
-        const normal_x = edge1_y * edge2_z - edge1_z * edge2_y;
-        const normal_y = edge1_z * edge2_x - edge1_x * edge2_z;
-        const normal_z = edge1_x * edge2_y - edge1_y * edge2_x
-
-        output[3] = normal_x;
-        output[4] = normal_y;
-        output[5] = normal_z;
-
-        output[6] = t;
-        output[7] = u;
-        output[8] = v;
-        output[9] = face_index;
-    }
 
     /**
      *
@@ -176,77 +183,44 @@ export class GeometryBVHBatched {
         const bvh = this.__bvh;
 
         // TODO we can unify BVH traversal with ray checks to reduce number of checks
-        const count = bvh_query_leaves_ray(
+        const count = bvh_query_user_data_ray(
             bvh, bvh.root,
-            leaf_buffer, 0,
+            scratch_uint32_array, 0,
             origin_x, origin_y, origin_z,
             direction_x, direction_y, direction_z
         );
 
+        if (count === 0) {
+            // no bvh hit, early exit
+            return -1;
+        }
+
         let best_t = max_distance;
 
         let best_index = -1;
         let best_u = 0;
         let best_v = 0;
 
+        // check triangles found via BVH
         for (let i = 0; i < count; i++) {
-            const node_id = leaf_buffer[i];
-
-
-            if (best_t < max_distance) {
-                // early bail-out
-
-                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]
-                );
-
-                if (distance > best_t * best_t) {
-                    // whole AABB is too far
-                    continue;
-                }
-            }
-
-            const triangle_index = bvh.node_get_user_data(node_id);
+            const triangle_index = scratch_uint32_array[i];
 
-            const index_offset = triangle_index * 3;
-
-            const a = indices[index_offset];
-            const b = indices[index_offset + 1];
-            const c = indices[index_offset + 2];
-
-
-            const a_address = a * 3;
-            const b_address = b * 3;
-            const c_address = c * 3;
-
-
-            const ax = positions[a_address];
-            const ay = positions[a_address + 1];
-            const az = positions[a_address + 2];
-
-            const bx = positions[b_address];
-            const by = positions[b_address + 1];
-            const bz = positions[b_address + 2];
-
-            const cx = positions[c_address];
-            const cy = positions[c_address + 1];
-            const cz = positions[c_address + 2];
-
-            const intersection_found = computeTriangleRayIntersectionBarycentric(
+            const intersection_found = computeTriangleRayIntersectionBarycentricGeometry(
                 v3_scratch_0,
                 origin_x, origin_y, origin_z,
                 direction_x, direction_y, direction_z,
-                ax, ay, az,
-                bx, by, bz,
-                cx, cy, cz
+                indices, triangle_index,
+                positions
             );
 
-            if (intersection_found && v3_scratch_0[0] < best_t && v3_scratch_0[0] > min_distance) {
-                best_t = v3_scratch_0[0];
+            if (!intersection_found) {
+                continue;
+            }
+
+            const t = v3_scratch_0[0];
+
+            if (t < best_t && t > min_distance) {
+                best_t = t;
 
                 best_index = triangle_index;
                 best_u = v3_scratch_0[1];
@@ -256,14 +230,11 @@ export class GeometryBVHBatched {
         }
 
         if (best_t === max_distance) {
+            // no hit
             return -1;
         }
 
-        output[0] = origin_x + direction_x * best_t;
-        output[1] = origin_y + direction_y * best_t;
-        output[2] = origin_z + direction_z * best_t;
-
-        this.construct_ray_hit(output, best_index, best_t, best_u, best_v);
+        construct_ray_hit(output, indices, positions, best_index, best_t, best_u, best_v);
 
         return best_t;
     }

package/src/engine/graphics/sh3/path_tracer/PathTracer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PathTracer.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/PathTracer.js"],"names":[],"mappings":";AAgEA;IAGQ;;;OAGG;IACH,eAFU,GAAG,CAEiB;IAE9B;;;OAGG;IACH,QAFU,IAAI,MAAM,EAAE,cAAc,CAAC,CAEd;IAEvB;;;OAGG;IACH,UAFU,eAAe,CAEP;IAElB;;;OAGG;IACH,WAFU,IAAI,MAAM,cAAc,EAAE,kBAAkB,CAAC,CAE7B;IAE1B;;;OAGG;IACH,UAFU,IAAI,MAAM,YAAY,CAEP;IAEzB;;;;OAIG;IACH,6BAA8C;IAGlD;;;;OAIG;IACH,uBAHW,MAAM,cAAc,GACnB,kBAAkB,CAgB7B;IAED,iBAGC;IAED,uBAoCC;IAED;;;OAGG;IACH,qCAEC;IAED;;;;;OAKG;IACH,aAJW,MAAM,cAAc,YACpB,MAAM,QAAQ,aACd,IAAI,GAAC,MAAM,EAAE,QA6CvB;IAED;;;;;;OAMG;IACH,oBALW,MAAM,EAAE,uBAER,MAAM,KACN,MAAM,QA+ChB;IAED;;;;OAIG;IACH,qBAHW,MAAM,EAAE,OACR,MAAM,EAAE,QAiFlB;IAED;;;;;;;OAOG;IACH,WANW,MAAM,EAAE,OACR,MAAM,EAAE,gBACR,MAAM,gBACN,MAAM,GACL,MAAM,CAyCjB;IAED;;;;;;OAMG;IACH,uBALW,MAAM,EAAE,cACR,MAAM,aACN,MAAM,EAAE,oBACR,MAAM,QAIhB;IAED;;;;;;OAMG;IACH,mBALW,MAAM,EAAE,cACR,MAAM,OACN,MAAM,EAAE,eACR,MAAM,WAgEhB;IAED,gGAyDC;CACJ;oBAniBmB,mCAAmC;+BAexB,qBAAqB;mCAHjB,yBAAyB;qBAtBjC,WAAW"}
+{"version":3,"file":"PathTracer.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/PathTracer.js"],"names":[],"mappings":";AAgEA;IAGQ;;;OAGG;IACH,eAFU,GAAG,CAEiB;IAE9B;;;OAGG;IACH,QAFU,IAAI,MAAM,EAAE,cAAc,CAAC,CAEd;IAEvB;;;OAGG;IACH,UAFU,eAAe,CAEP;IAElB;;;OAGG;IACH,WAFU,IAAI,MAAM,cAAc,EAAE,kBAAkB,CAAC,CAE7B;IAE1B;;;OAGG;IACH,UAFU,IAAI,MAAM,YAAY,CAEP;IAEzB;;;;OAIG;IACH,6BAA8C;IAGlD;;;;OAIG;IACH,uBAHW,MAAM,cAAc,GACnB,kBAAkB,CAgB7B;IAED,iBAGC;IAED,uBAoCC;IAED;;;OAGG;IACH,qCAEC;IAED;;;;;OAKG;IACH,aAJW,MAAM,cAAc,YACpB,MAAM,QAAQ,aACd,IAAI,GAAC,MAAM,EAAE,QA6CvB;IAED;;;;;;OAMG;IACH,oBALW,MAAM,EAAE,uBAER,MAAM,KACN,MAAM,QA+ChB;IAED;;;;OAIG;IACH,qBAHW,MAAM,EAAE,OACR,MAAM,EAAE,QAmFlB;IAED;;;;;;;OAOG;IACH,WANW,MAAM,EAAE,OACR,MAAM,EAAE,gBACR,MAAM,gBACN,MAAM,GACL,MAAM,CAyCjB;IAED;;;;;;OAMG;IACH,uBALW,MAAM,EAAE,cACR,MAAM,aACN,MAAM,EAAE,oBACR,MAAM,QAIhB;IAED;;;;;;OAMG;IACH,mBALW,MAAM,EAAE,cACR,MAAM,OACN,MAAM,EAAE,eACR,MAAM,WAgEhB;IAED,gGAyDC;CACJ;oBAriBmB,mCAAmC;+BAexB,qBAAqB;mCAHjB,yBAAyB;qBAtBjC,WAAW"}

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

@@ -261,7 +261,7 @@ export class PathTracer {
             case LinearFilter:
             case LinearMipmapLinearFilter:
 
-                sampler.sampleBicubicUV(_u, _v, out);
+                sampler.sampleBilinearUV(_u, _v, out);
                 break;
         }
 
@@ -348,9 +348,11 @@ export class PathTracer {
         const material = mesh.material;
 
         if (material.isMeshStandardMaterial) {
-            out[0] *= material.color.r;
-            out[1] *= material.color.g;
-            out[2] *= material.color.b;
+            const material_color = material.color;
+
+            out[0] *= material_color.r;
+            out[1] *= material_color.g;
+            out[2] *= material_color.b;
 
             const diffuse_map = material.map;
 

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

@@ -67,6 +67,12 @@ vCanvas.css({
     overflow: "visible"
 });
 
+/**
+ * How many rays to use per-pixel
+ * @type {number}
+ */
+const PIXEL_SAMPLE_COUNT = 256;
+
 const pt = new PathTracer();
 
 const gltfLoader = new GLTFLoader();
@@ -380,6 +386,7 @@ async function prepare_scene_rtiow(pt, camera) {
 
 }
 
+
 /**
  *
  * @param {Sampler2D} target
@@ -415,7 +422,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 = 4;
+    const pixel_sample_count = PIXEL_SAMPLE_COUNT;
 
     progress.total = width * height;
 
@@ -523,11 +530,11 @@ async function start_renderer(camera) {
 
     // await prepare_scene_lucy(pt, camera);
     // await prepare_scene_rtiow(pt, camera);
-    await prepare_scene_sphere_01(pt, camera);
-    // await prepare_scene_gltf(pt, camera, path);
+    // await prepare_scene_sphere_01(pt, camera);
+    await prepare_scene_gltf(pt, camera, path);
 
     pt.build();
-    pt.optimize();
+    // pt.optimize();
 
     const pixelRatio = 1;
 

package/src/engine/graphics/sh3/path_tracer/sample_triangle_attribute.d.ts

@@ -7,8 +7,8 @@
  * @param {number} c vertex index 0
  * @param {number[]} attribute_array
  * @param {number} dimensions
- * @param {number} u
- * @param {number} v
+ * @param {number} u Barycentric coordinate
+ * @param {number} v Barycentric coordinate
  */
 export function sample_triangle_attribute(out: number[], out_offset: number, a: number, b: number, c: number, attribute_array: number[], dimensions: number, u: number, v: number): void;
 //# sourceMappingURL=sample_triangle_attribute.d.ts.map

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

@@ -7,8 +7,8 @@
  * @param {number} c vertex index 0
  * @param {number[]} attribute_array
  * @param {number} dimensions
- * @param {number} u
- * @param {number} v
+ * @param {number} u Barycentric coordinate
+ * @param {number} v Barycentric coordinate
  */
 export function sample_triangle_attribute(
     out, out_offset,

package/src/engine/graphics/texture/sampler/Sampler2D.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Sampler2D.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/texture/sampler/Sampler2D.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"Sampler2D.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/texture/sampler/Sampler2D.js"],"names":[],"mappings":"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"}