@woosh/meep-engine 2.138.3 → 2.138.5

package/src/engine/graphics/impostors/octahedral/shader/ImpostorShaderWireframeV0.js

@@ -8,54 +8,139 @@ import {
     Vector3
 } from "three";
 
-/*
- *
- * For ray projection using projection matrix : https://encreative.blogspot.com/2019/05/computing-ray-origin-and-direction-from.html
- */
+// The wireframe must trace the SAME card geometry that ImpostorShaderV0
+// produces, otherwise the red outline lies about where the impostor surface
+// actually is. So this vertex shader is the geometry half of the main V0
+// vertex shader, minus everything the fragment shader doesn't read (no
+// vUv, vViewPos, vTangent/vBinormal/vNormal, no per-frame xforms, no
+// atlas lookup).
 const shader_vx = `
-    
+
     in vec3 position;
-    
+
     uniform mat4 modelViewMatrix;
     uniform mat4 projectionMatrix;
-    uniform mat3 normalMatrix;
-    
+
     uniform vec3 uOffset;
     uniform float uRadius;
     uniform float uFrames;
-    
+    uniform bool uIsFullSphere;
+
+    // ----- direction -> octahedral grid coord (range -1..+1) -----
+
+    vec2 VecToSphereOct(vec3 pivotToCamera)
+    {
+        vec3 octant = sign(pivotToCamera);
+        float sum = dot(pivotToCamera, octant);
+        vec3 octahedron = pivotToCamera / sum;
+        if (octahedron.y < 0.0) {
+            vec3 absolute = abs(octahedron);
+            octahedron.xz = octant.xz * vec2(1.0 - absolute.z, 1.0 - absolute.x);
+        }
+        return octahedron.xz;
+    }
+
+    vec2 VecToHemiSphereOct(vec3 v)
+    {
+        v.y = max(v.y, 0.001);
+        v = normalize(v);
+        vec3 octant = sign(v);
+        float sum = dot(v, octant);
+        vec3 octahedron = v / sum;
+        return vec2(
+            octahedron.x + octahedron.z,
+            octahedron.z - octahedron.x
+        );
+    }
+
+    vec2 VectorToGrid(vec3 v)
+    {
+        return uIsFullSphere ? VecToSphereOct(v) : VecToHemiSphereOct(v);
+    }
+
+    // ----- octahedral grid coord (range 0..1) -> direction -----
+
+    vec3 OctaSphereDec(vec2 coord)
+    {
+        coord = (coord - 0.5) * 2.0;
+        vec3 p = vec3(coord.x, 0.0, coord.y);
+        vec2 a = abs(p.xz);
+        p.y = 1.0 - a.x - a.y;
+        if (p.y < 0.0) {
+            p.xz = sign(p.xz) * vec2(1.0 - a.y, 1.0 - a.x);
+        }
+        return p;
+    }
+
+    vec3 OctaHemiSphereDec(vec2 coord)
+    {
+        vec3 p = vec3(coord.x - coord.y, 0.0, -1.0 + coord.x + coord.y);
+        vec2 a = abs(p.xz);
+        p.y = 1.0 - a.x - a.y;
+        return p;
+    }
+
+    vec3 GridToVector(vec2 coord)
+    {
+        return uIsFullSphere ? OctaSphereDec(coord) : OctaHemiSphereDec(coord);
+    }
+
+    vec3 FrameToRay(vec2 frame, vec2 framesMinusOne)
+    {
+        vec2 f = clamp(frame / framesMinusOne, 0.0, 1.0);
+        return normalize(GridToVector(f));
+    }
+
+    vec4 BilinearWeights(vec2 frac_uv)
+    {
+        vec2 omuv = vec2(1.0) - frac_uv;
+        return vec4(
+            omuv.x * omuv.y,
+            frac_uv.x * omuv.y,
+            omuv.x * frac_uv.y,
+            frac_uv.x * frac_uv.y
+        );
+    }
+
     void main() {
-        
-        vec2 framesMinusOne = uFrames - vec2(1.0);
-        
-        mat4 m4 = modelViewMatrix;
-        
-        m4[0][0] = 1.0;
-        m4[0][1] = 0.0;
-        m4[0][2] = 0.0;
+        // Pivot-to-camera direction in object-local space; same as V0.
+        vec3 cameraPos_OS = (inverse(modelViewMatrix) * vec4(0.0, 0.0, 0.0, 1.0)).xyz;
+        vec3 pivotToCameraRay = normalize(cameraPos_OS);
 
-        m4[1][0] = 0.0;
-        m4[1][1] = 1.0;
-        m4[1][2] = 0.0;
+        // Pick the cell and its 4-corner bilinear weights, then blend the
+        // four corner rays into the "effective" bake direction the card is
+        // showing. Mirrors V0.
+        vec2 framesMinusOne = vec2(uFrames - 1.0);
+        vec2 octahedral_uv = clamp(VectorToGrid(pivotToCameraRay) * 0.5 + 0.5, 0.0, 1.0);
+        vec2 grid = octahedral_uv * framesMinusOne;
+        vec2 gridFloor = min(floor(grid), framesMinusOne - 1.0);
+        vec4 weights = BilinearWeights(grid - gridFloor);
 
-        m4[2][0] = 0.0;
-        m4[2][1] = 0.0;
-        m4[2][2] = 1.0;
-        
-        vec3 object_scale = vec3(
-            length(modelViewMatrix[0].xyz),
-            length(modelViewMatrix[1].xyz),
-            length(modelViewMatrix[2].xyz)
-        ); 
-        
-        // scale by object's baking bounding sphere's radius
-        float card_diameter = uRadius*2.0;
-        object_scale *= card_diameter;
-        
-        vec4 mvPosition = m4 * vec4( object_scale*(position+uOffset/card_diameter), 1.0 );
-                
-        gl_Position = projectionMatrix * mvPosition;
-        
+        vec3 ray00 = FrameToRay(gridFloor + vec2(0.0, 0.0), framesMinusOne);
+        vec3 ray10 = FrameToRay(gridFloor + vec2(1.0, 0.0), framesMinusOne);
+        vec3 ray01 = FrameToRay(gridFloor + vec2(0.0, 1.0), framesMinusOne);
+        vec3 ray11 = FrameToRay(gridFloor + vec2(1.0, 1.0), framesMinusOne);
+        vec3 projectedRay = normalize(
+            ray00 * weights.x +
+            ray10 * weights.y +
+            ray01 * weights.z +
+            ray11 * weights.w
+        );
+
+        // TBN construction identical to V0 so the card spans the same plane.
+        vec3 normal_OS = projectedRay;
+        vec3 up_OS = abs(normal_OS.y) > 0.999
+                     ? vec3(0.0, 0.0, -1.0)
+                     : vec3(0.0, 1.0,  0.0);
+        vec3 tangent_OS  = normalize(cross(up_OS, normal_OS));
+        vec3 binormal_OS = cross(normal_OS, tangent_OS);
+
+        float card_diameter = uRadius * 2.0;
+        vec3 pos_OS = uOffset
+                    + position.x * card_diameter * tangent_OS
+                    + position.y * card_diameter * binormal_OS;
+
+        gl_Position = projectionMatrix * modelViewMatrix * vec4(pos_OS, 1.0);
     }
 `;
 const shader_fg = `

package/src/engine/graphics/impostors/octahedral/util/makeImpostorAtlasPreview.d.ts

@@ -2,7 +2,7 @@
  *
  * @param {ImpostorDescription} impostor
  * @param {THREE.WebGLRenderer} renderer
- * @param {'albedo'|'normal'|'depth'|'alpha'} [mode]
+ * @param {'albedo'|'normal'|'depth'|'alpha'|'orm'} [mode]
  * @param {boolean} [show_grid]
  * @return {View}
  */

package/src/engine/graphics/impostors/octahedral/util/makeImpostorAtlasPreview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"makeImpostorAtlasPreview.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/impostors/octahedral/util/makeImpostorAtlasPreview.js"],"names":[],"mappings":"AA4CA;;;;;;;GAOG;AACH,6GAsDC"}
+{"version":3,"file":"makeImpostorAtlasPreview.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/impostors/octahedral/util/makeImpostorAtlasPreview.js"],"names":[],"mappings":"AA4CA;;;;;;;GAOG;AACH,6GA0DC"}

package/src/engine/graphics/impostors/octahedral/util/makeImpostorAtlasPreview.js

@@ -1,6 +1,6 @@
-import { buildCanvasViewFromTexture } from "../../../render/visibility/hiz/buildCanvasViewFromTexture.js";
-import EmptyView from "../../../../../view/elements/EmptyView.js";
 import { CanvasView } from "../../../../../view/elements/CanvasView.js";
+import EmptyView from "../../../../../view/elements/EmptyView.js";
+import { buildCanvasViewFromTexture } from "../../../render/visibility/hiz/buildCanvasViewFromTexture.js";
 
 /**
  * @param {ImpostorDescription} impostor
@@ -46,7 +46,7 @@ function makeGrid(impostor) {
  *
  * @param {ImpostorDescription} impostor
  * @param {THREE.WebGLRenderer} renderer
- * @param {'albedo'|'normal'|'depth'|'alpha'} [mode]
+ * @param {'albedo'|'normal'|'depth'|'alpha'|'orm'} [mode]
  * @param {boolean} [show_grid]
  * @return {View}
  */
@@ -73,6 +73,10 @@ export function makeImpostorAtlasPreview({
             options.swizzle = ['a', 'a', 'a', 1];
             options.texture = impostor.rt.texture[1]
             break;
+        case "orm":
+            options.swizzle = ['r', 'g', 'b', 1];
+            options.texture = impostor.rt.texture[2]
+            break;
         default:
             console.warn(`Unsupported mode '${mode}', defaulting to albedo`);
         //fall-through

package/src/engine/graphics/particles/ecs/ParticleEmitterSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ParticleEmitterSystem.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/particles/ecs/ParticleEmitterSystem.js"],"names":[],"mappings":"AAYA;IAeI;;;;;OAKG;IACH,4BAwBC;IA5CD,yCAA4C;IAE5C,uEAEE;IAEF;;;OAGG;IACH,aAFU,cAAY,IAAI,CAEP;IAEnB,kBAAgB;IAcZ;;;OAGG;IACH,+BAAqC;IAErC;;;OAGG;IACH,2BAAuC;IAEvC;;;OAGG;IACH,gBAFU,gBAAgB,CAE2E;IAIzG,2CAyHC;IAED,4CAEC;IAED;;;;;OAKG;IACH,cAJW,eAAe,aACf,SAAS,qBAoCnB;IAED;;;;;OAKG;IACH,gBAJW,eAAe,aACf,SAAS,qBAenB;IAED,6BAEC;CACJ;uBAtPsB,wBAAwB;gCAIf,iDAAiD;4CANrC,uDAAuD;iCAQlE,0CAA0C;0BALjD,qCAAqC"}
+{"version":3,"file":"ParticleEmitterSystem.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/particles/ecs/ParticleEmitterSystem.js"],"names":[],"mappings":"AAaA;IAeI;;;;;OAKG;IACH,4BAwBC;IA5CD,yCAA4C;IAE5C,uEAEE;IAEF;;;OAGG;IACH,aAFU,cAAY,IAAI,CAEP;IAEnB,kBAAgB;IAcZ;;;OAGG;IACH,+BAAqC;IAErC;;;OAGG;IACH,2BAAuC;IAEvC;;;OAGG;IACH,gBAFU,gBAAgB,CAE2E;IAIzG,2CA8HC;IAED,4CAEC;IAED;;;;;OAKG;IACH,cAJW,eAAe,aACf,SAAS,qBAoCnB;IAED;;;;;OAKG;IACH,gBAJW,eAAe,aACf,SAAS,qBAenB;IAED,6BAEC;CACJ;uBA3PsB,wBAAwB;gCAIf,iDAAiD;4CANrC,uDAAuD;iCAQlE,0CAA0C;0BALjD,qCAAqC"}

package/src/engine/graphics/particles/ecs/ParticleEmitterSystem.js

@@ -1,4 +1,5 @@
 import { assert } from "../../../../core/assert.js";
+import { bvh_query_depth_range_in_frustum } from "../../../../core/bvh2/bvh3/query/bvh_query_depth_range_in_frustum.js";
 import { ResourceAccessKind } from "../../../../core/model/ResourceAccessKind.js";
 import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";
 import { ImageRGBADataLoader } from "../../../asset/loaders/image/ImageRGBADataLoader.js";
@@ -85,6 +86,11 @@ export class ParticleEmitterSystem extends System {
             }
         );
 
+        const bvh = this.particleEngine.bvh;
+        renderLayer.compute_depth_range = (result, frustum, nx, ny, nz, c) => {
+            bvh_query_depth_range_in_frustum(result, bvh, frustum, nx, ny, nz, c);
+        };
+
         renderLayer.visibleSet.onAdded.add((points) => {
             /**
              *

package/src/engine/graphics/render/layers/RenderLayer.d.ts

@@ -17,4 +17,6 @@ export class RenderLayer {
      * @deprecated
      */
     visibleSet: IncrementalDeltaSet<Object3D>
+
+    compute_depth_range: ((result: { near: number; far: number }, frustum: ArrayLike<number>, plane_normal_x: number, plane_normal_y: number, plane_normal_z: number, plane_constant: number) => void) | null
 }

package/src/engine/graphics/render/layers/RenderLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RenderLayer.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/render/layers/RenderLayer.js"],"names":[],"mappings":"AAKA;IAEI;;;OAGG;IACH,OAFU,gBAAgB,CAEK;IAE/B;;;OAGG;IACH,MAFU,SAAO,IAAI,CAET;IAEZ;;;;OAIG;IACH,SAFU,OAAO,CAED;IAEhB;;;OAGG;IACH,2CAAgC;IAEhC;;;;;OAKG;IACH,YAFU,oBAAoB,MAAM,QAAQ,CAAC,CAEe;IAU5D;;;OAGG;IACH,0BAEC;IAdD;;;OAGG;IACH,uBAEC;IAUD;;;;;;;;;OASG;IACH,qDALW,MAAM,OACN,MAAM,sCAMhB;IAED;;;;;;OAMG;IACH,6BALW,MAAM,QAAQ,EAAE,sBAChB,MAAM,qBAEJ,MAAM,CAIlB;CACJ;iCA7EgC,uBAAuB;oCADpB,sCAAsC"}
+{"version":3,"file":"RenderLayer.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/render/layers/RenderLayer.js"],"names":[],"mappings":"AAKA;IAEI;;;OAGG;IACH,OAFU,gBAAgB,CAEK;IAE/B;;;OAGG;IACH,MAFU,SAAO,IAAI,CAET;IAEZ;;;;OAIG;IACH,SAFU,OAAO,CAED;IAEhB;;;OAGG;IACH,2CAAgC;IAEhC;;;;;OAKG;IACH,YAFU,oBAAoB,MAAM,QAAQ,CAAC,CAEe;IAU5D;;;OAGG;IACH,0BAEC;IAdD;;;OAGG;IACH,uBAEC;IAUD;;;;;;;;;OASG;IACH,qDALW,MAAM,OACN,MAAM,sCAMhB;IAED;;;;;;OAMG;IACH,6BALW,MAAM,QAAQ,EAAE,sBAChB,MAAM,qBAEJ,MAAM,CAIlB;IAED;;;;;;;;;;;OAWG;IACH,8BAFmB;QAAC,IAAI,EAAC,MAAM,CAAC;QAAA,GAAG,EAAC,MAAM,CAAA;KAAC,WAAU,UAAU,MAAM,CAAC,kBAAiB,MAAM,kBAAiB,MAAM,kBAAiB,MAAM,kBAAiB,MAAM,KAAK,IAAI,CAEhJ;CAC9B;iCA3FgC,uBAAuB;oCADpB,sCAAsC"}

package/src/engine/graphics/render/layers/RenderLayer.js

@@ -78,4 +78,18 @@ export class RenderLayer {
     buildVisibleSet(destination, destination_offset, view) {
         throw new Error('deprecated');
     }
+
+    /**
+     * Expand a (near, far) depth range to cover this layer's content that
+     * intersects a frustum. Driven by the camera's autoClip path; defaults to
+     * a no-op for layers that don't own a BVH or don't participate in depth
+     * fitting (e.g. screen-space overlays).
+     *
+     * Systems with a BVH wire this from their `startup` alongside
+     * `buildVisibleSet` — typically using
+     * {@link bvh_query_depth_range_in_frustum} against their own BVH.
+     *
+     * @type {((result:{near:number,far:number}, frustum:ArrayLike<number>, plane_normal_x:number, plane_normal_y:number, plane_normal_z:number, plane_constant:number) => void) | null}
+     */
+    compute_depth_range = null;
 }

package/src/engine/intelligence/mcts/MonteCarlo.js

@@ -152,7 +152,7 @@ export class MonteCarloTreeSearch {
                     assert.notNaN(s, 'computed Node score');
                     assert.isFinite(s, `computed Node score`);
 
-                    score = s + randomRoll;
+                    score = s + randomRoll * 1e-5;
                 } else {
 
                     //use a constant value for unexplored nodes

package/src/engine/graphics/ecs/camera/FrustumProjector.d.ts

@@ -1,14 +0,0 @@
-declare namespace _default {
-    export { project };
-}
-export default _default;
-/**
- *
- * @param {Number} nearZ
- * @param {Number} farZ
- * @param {THREE.Camera} camera
- * @param {THREE.Matrix4} matrixWorldInverse
- * @param {AABB3} result
- */
-declare function project(nearZ: number, farZ: number, camera: THREE.Camera, matrixWorldInverse: THREE.Matrix4, result: AABB3): void;
-//# sourceMappingURL=FrustumProjector.d.ts.map

package/src/engine/graphics/ecs/camera/FrustumProjector.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"FrustumProjector.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/ecs/camera/FrustumProjector.js"],"names":[],"mappings":";;;;AAkBA;;;;;;;GAOG;AACH,8DAJW,MAAM,MAAM,sBACZ,MAAM,OAAO,uBAsDvB"}

package/src/engine/graphics/ecs/camera/FrustumProjector.js

@@ -1,86 +0,0 @@
-import { Vector3 as ThreeVector3 } from 'three';
-
-
-const corners = [
-    new ThreeVector3(-1, -1, 0),
-    new ThreeVector3(-1, -1, 0),
-
-    new ThreeVector3(-1, 1, 0),
-    new ThreeVector3(-1, 1, 0),
-
-    new ThreeVector3(1, -1, 0),
-    new ThreeVector3(1, -1, 0),
-
-    new ThreeVector3(1, 1, 0),
-    new ThreeVector3(1, 1, 0)
-];
-
-
-/**
- *
- * @param {Number} nearZ
- * @param {Number} farZ
- * @param {THREE.Camera} camera
- * @param {THREE.Matrix4} matrixWorldInverse
- * @param {AABB3} result
- */
-function project(nearZ, farZ, camera, matrixWorldInverse, result) {
-    corners[0].set(-1, -1, nearZ);
-    corners[1].set(-1, -1, farZ);
-
-    corners[2].set(-1, 1, nearZ);
-    corners[3].set(-1, 1, farZ);
-
-    corners[4].set(1, -1, nearZ);
-    corners[5].set(1, -1, farZ);
-
-    corners[6].set(1, 1, nearZ);
-    corners[7].set(1, 1, farZ);
-
-    //compute corners of view frustum in light space
-    let x0 = Number.POSITIVE_INFINITY;
-    let y0 = Number.POSITIVE_INFINITY;
-    let z0 = Number.POSITIVE_INFINITY;
-
-    let x1 = Number.NEGATIVE_INFINITY;
-    let y1 = Number.NEGATIVE_INFINITY;
-    let z1 = Number.NEGATIVE_INFINITY;
-
-
-    for (let i = 0; i < 8; i++) {
-        const corner = corners[i];
-        corner.unproject(camera);
-        corner.applyMatrix4(matrixWorldInverse);
-
-        if (corner.x < x0) {
-            x0 = corner.x;
-        }
-        if (corner.x > x1) {
-            x1 = corner.x;
-        }
-
-        if (corner.y < y0) {
-            y0 = corner.y;
-        }
-        if (corner.y > y1) {
-            y1 = corner.y;
-        }
-
-        if (corner.z < z0) {
-            z0 = corner.z;
-        }
-        if (corner.z > z1) {
-            z1 = corner.z;
-        }
-    }
-
-    result.setBounds(x0, y0, z0, x1, y1, z1);
-}
-
-
-export default {
-    /**
-     * @deprecated use non-threejs specific code
-     */
-    project,
-};