@woosh/meep-engine 2.109.11 → 2.109.12

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.109.11",
+  "version": "2.109.12",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/core/model/node-graph/node/Port.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Port.d.ts","sourceRoot":"","sources":["../../../../../../src/core/model/node-graph/node/Port.js"],"names":[],"mappings":"AAUA;IAmHI;;;;;OAKG;IACH,iDAFa,IAAI,CAQhB;IA9HD;;;OAGG;IACH,aAAU;IAEV;;;OAGG;IACH,IAFU,MAAM,CAEE;IAElB;;;OAGG;IACH,WAFU,aAAa,GAAC,MAAM,CAEQ;IAEtC;;;OAGG;IACH,UAFU,QAAQ,CAEF;IAEhB;;;OAGG;IACH,UAFU,MAAM,CAEF;IAEd;;;OAGG;IACH,QAFa,MAAM,CAIlB;IAED;;;;OAIG;IACH,cAHW,IAAI,GACF,OAAO,CAenB;IAED,mBAEC;IAED;;;;;MAOC;IAED;;;;;;;OAOG;IACH,4CANW,MAAM,iCAuChB;IAiBL;;;OAGG;IACH,iBAFU,OAAO,CAEI;CANpB;8BAvI6B,oBAAoB;yBADzB,qBAAqB"}
+{"version":3,"file":"Port.d.ts","sourceRoot":"","sources":["../../../../../../src/core/model/node-graph/node/Port.js"],"names":[],"mappings":"AAWA;IAmHI;;;;;OAKG;IACH,iDAFa,IAAI,CAQhB;IA9HD;;;OAGG;IACH,aAAU;IAEV;;;OAGG;IACH,IAFU,MAAM,CAEE;IAElB;;;OAGG;IACH,WAFU,aAAa,GAAC,MAAM,CAEQ;IAEtC;;;OAGG;IACH,UAFU,QAAQ,CAEF;IAEhB;;;OAGG;IACH,UAFU,MAAM,CAEF;IAEd;;;OAGG;IACH,QAFa,MAAM,CAIlB;IAED;;;;OAIG;IACH,cAHW,IAAI,GACF,OAAO,CAenB;IAED,mBAEC;IAED;;;;;MAOC;IAED;;;;;;;OAOG;IACH,4CANW,MAAM,iCAuChB;IAiBL;;;OAGG;IACH,iBAFU,OAAO,CAEI;CANpB;8BAvI6B,oBAAoB;yBAFzB,qBAAqB"}

package/src/core/model/node-graph/node/Port.js

@@ -1,6 +1,7 @@
 import { assert } from "../../../assert.js";
 import { objectKeyByValue } from "../../object/objectKeyByValue.js";
 import { DataType } from "../type/DataType.js";
+import { deserializeDataTypeFromJSON } from "../type/deserializeDataTypeFromJSON.js";
 import { PortDirection } from "./PortDirection.js";
 
 /**
@@ -98,7 +99,7 @@ export class Port {
         this.name = name;
         this.direction = PortDirection[direction];
 
-        let _type = dataType !== null ? DataType.fromJSON(dataType) : null;
+        let _type = dataType !== null ? deserializeDataTypeFromJSON(dataType) : null;
 
         if (registry !== undefined && _type !== null) {
             assert.equal(registry.isNodeRegistry, true, 'registry.isNodeRegistry !== true');

package/src/engine/graphics/sh3/gi/material/common.glsl

@@ -126,7 +126,7 @@ float SampleBlended(sampler2D tex, vec2 uv0, vec2 uv1, vec2 uv2, vec4 weights) {
     return samp0 * weights.x + samp1 * weights.y + samp2 * weights.z;
 }
 
-vec2 lpv_probe_getDepth(uint probe_index, vec3 direction) {
+vec2 lpv_probe_getDepthTriangular(uint probe_index, vec3 direction) {
     // get offset
     uint depth_tile_resolution = lpv_u_probe_depth_resolution;
     uvec2 atlas_size = uvec2(4096u);
@@ -174,6 +174,60 @@ vec2 lpv_probe_getDepth(uint probe_index, vec3 direction) {
     return vec2(mean, mean2);
 }
 
+float lpv_bilinear_lerp(float v00, float v01, float v10, float v11, vec2 fraction) {
+
+    float x0 = mix(v00, v01, fraction.x);
+    float x1 = mix(v10, v11, fraction.x);
+
+    return mix(x0, x1, fraction.y);
+}
+
+vec2 lpv_sample_bilinear(sampler2D tex, ivec2 texel_position, vec2 fraction) {
+
+    float texel_00 = texelFetch(tex, texel_position, 0).r;
+    float texel_01 = texelFetch(tex, texel_position + ivec2(1, 0), 0).r;
+    float texel_10 = texelFetch(tex, texel_position + ivec2(0, 1), 0).r;
+    float texel_11 = texelFetch(tex, texel_position + ivec2(1, 1), 0).r;
+
+    return vec2(
+        lpv_bilinear_lerp(
+        texel_00, texel_01,
+        texel_10, texel_11,
+        fraction
+    ),
+        lpv_bilinear_lerp(
+            texel_00*texel_00, texel_01*texel_01,
+            texel_10*texel_10, texel_11*texel_11,
+            fraction
+        )
+    );
+}
+
+vec2 lpv_probe_getDepthBilinear(uint probe_index, vec3 direction) {
+    // get offset
+    uint depth_tile_resolution = lpv_u_probe_depth_resolution;
+    uvec2 atlas_size = uvec2(4096u);
+
+    uint tiles_per_row = atlas_size.x / depth_tile_resolution;
+
+    uint tile_x = probe_index % tiles_per_row;
+    uint tile_y = probe_index / tiles_per_row;
+
+    vec2 tile_offset = vec2(
+        tile_x * depth_tile_resolution,
+        tile_y * depth_tile_resolution
+    );
+
+    // convert direction to UV
+    vec2 octahedral_uv = clamp(VecToSphereOct(direction) * 0.5 + 0.5, 0.0, 1.0);
+    vec2 grid = octahedral_uv * vec2(depth_tile_resolution - 1u);
+
+    vec2 gridFrac = fract(grid);
+    vec2 gridFloor = floor(grid);
+
+    return lpv_sample_bilinear(lpv_t_probe_depth, ivec2(gridFloor+tile_offset),gridFrac);
+}
+
 vec3 lpv_probe_getPosition(uint probe_index) {
     return texelFetch(lpv_t_probe_positions, lpv_index_to_256_coordinate(probe_index), 0).rgb;
 }
@@ -254,7 +308,7 @@ float lpv_probe_getVisibilityMask(vec3 position, uint probe_index) {
 
     vec3 direction = local_probe_offset / distToProbe;
 
-    vec2 temp = lpv_probe_getDepth(probe_index, direction);
+    vec2 temp = lpv_probe_getDepthBilinear(probe_index, direction);
 
     float mean = temp.x;
     float variance = abs(mean * mean - temp.y);

package/src/engine/graphics/sh3/lpv/PathTracerProbeRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PathTracerProbeRenderer.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/lpv/PathTracerProbeRenderer.js"],"names":[],"mappings":"AAuBA;IACI,mBAA0B;IAC1B,yBAAqB;IACrB,qBAAoB;IACpB,qBAAyB;IAEzB,uBAA6B;IAE7B;;;;;;;;OAQG;IACH,kCAPW,MAAM,aACN,MAAM,YACN,MAAM,EAAE,mBACR,MAAM,UACN,MAAM,EAAE,iBACR,MAAM,QAahB;IAED,iFAuCC;IAKD,mBACC;IAED,4BAKC;CACJ;8BA5F6B,oBAAoB;2BAHvB,8BAA8B;gCADzB,mCAAmC"}
+{"version":3,"file":"PathTracerProbeRenderer.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/lpv/PathTracerProbeRenderer.js"],"names":[],"mappings":"AAuBA;IACI,mBAA0B;IAC1B,yBAAqB;IACrB,qBAAmB;IACnB,qBAAyB;IAEzB,uBAA6B;IAE7B;;;;;;;;OAQG;IACH,kCAPW,MAAM,aACN,MAAM,YACN,MAAM,EAAE,mBACR,MAAM,UACN,MAAM,EAAE,iBACR,MAAM,QAahB;IAED,iFAuCC;IAKD,mBACC;IAED,4BAKC;CACJ;8BA5F6B,oBAAoB;2BAHvB,8BAA8B;gCADzB,mCAAmC"}

package/src/engine/graphics/sh3/lpv/PathTracerProbeRenderer.js

@@ -24,7 +24,7 @@ const sampled_irradiance = new Float32Array(3);
 export class PathTracerProbeRenderer extends ProbeRenderer {
     tracer = new PathTracer();
     max_bounce_count = 7;
-    sample_count = 4096;
+    sample_count = 192;
     random = seededRandom(0);
 
     scene = new PathTracedScene()

package/src/engine/graphics/sh3/prototypeSH3Probe.js

@@ -243,7 +243,7 @@ async function getVolume({
         engine,
         ecd,
         bounds: mesh_bounds,
-        density: 5000
+        density: 500
     });
 
     const buffer = new BinaryBuffer();