@woosh/meep-engine 2.149.0 → 2.150.0

package/package.json

@@ -6,7 +6,7 @@
   "description": "Pure JavaScript game engine. Fully featured and production ready.",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.149.0",
+  "version": "2.150.0",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/engine/graphics/GraphicsEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GraphicsEngine.d.ts","sourceRoot":"","sources":["../../../../src/engine/graphics/GraphicsEngine.js"],"names":[],"mappings":"AA2DA;IAOI;;;;;OAKG;IACH,+BAJW,MAAM,EAuKhB;IA7KD,gCAEC;IAgBG;;;;OAIG;IACH,2BAA+C;IAK/C;;;;;QAOI;;WAEG;;QAEH;;WAEG;;;;;MAMN;IAED;;OAEG;IACH,YAFU,OAAO,CAEe;IAEhC;;;OAGG;IACH,QAFU,kBAAkB,CAEU;IAWtC;;;OAGG;IACH,aAAkB;IAGlB;;;OAGG;IACH,cAFU,KAAK,CAEgB;IAK/B;;;OAGG;IACH,QAFU,MAAM,CAEI;IAEpB;;;OAGG;IACH,UAFU,aAAa,CAEH;IAGpB,+BAA0C;IAU1C;;OAEG;IACH,eAA+B;IAI/B;;;OAGG;IACH,uBAFU,kBAAkB,CAEgB;IAE5C;;;OAGG;IACH,oBAFU,iBAAiB,CAEsB;IAEjD;;;OAGG;IACH,gBAFU,iBAAiB,CAES;IAEpC;;;OAGG;IACH,sBAAoC;IAGpC;;;;OAIG;IACH,UAFU,OAAO,CAEG;IAEpB;;;OAGG;IACH,UAFU,OAAO,CAEG;IAEpB;;;OAGG;IACH,YAFU,MAAM,CAEG;IACnB,kKAcI;IAGR;;;OAGG;IACH,sBAFa,eAAe,CAI3B;IAED;;;OAGG;IACH,eAFa,aAAa,CAIzB;IAED,mBA0BC;IAED;;;OAGG;IACH,iCAOC;IAED;;;OAGG;IACH,0BAFa,MAAM,CAIlB;IAED,+BAcC;IAED,cAgEC;IAzBsB,8BAA0C;IA2BjE;;;OAGG;IACH,cAFa,MAAM,CAYlB;IAED;;OAEG;IACH,aAQC;IAED;;OAEG;IACH,yBAQC;IAED;;;;;;OAMG;IACH,yBALW,MAAM,KACN,MAAM,6CAMhB;IAED;;;;OAIG;IACH,8BAHW,iBAAe,UACf,iBAAe,QAczB;IAED;;;;;OAKG;IACH,8BAQC;IAED,0BAEC;IAED;;;OAGG;IACH,4BAFW,cAAc,QA8BxB;IAED;;OAEG;IACH,qBAqBC;IAED;;OAEG;IACH,0BAeC;IAED;;OAEG;IACH,eA8CC;;CACJ;mBAllBkB,oCAAoC;oBACnC,4BAA4B;mCAab,uCAAuC;sBAjBnE,OAAO;uBAYS,wBAAwB;8BAZxC,OAAO;4BAWc,+BAA+B;mCAKxB,uCAAuC;kCAKxC,gCAAgC;kCADhC,oCAAoC;gCAPtC,uCAAuC;+BAKxC,4BAA4B"}
+{"version":3,"file":"GraphicsEngine.d.ts","sourceRoot":"","sources":["../../../../src/engine/graphics/GraphicsEngine.js"],"names":[],"mappings":"AA4DA;IAOI;;;;;OAKG;IACH,+BAJW,MAAM,EAgLhB;IAtLD,gCAEC;IAgBG;;;;OAIG;IACH,2BAA+C;IAK/C;;;;;QAOI;;WAEG;;QAEH;;WAEG;;;;;MAMN;IAED;;OAEG;IACH,YAFU,OAAO,CAEe;IAEhC;;;;;;OAMG;IACH,4BAFU,OAAO,CAEyB;IAE1C;;;OAGG;IACH,QAFU,kBAAkB,CAEU;IAWtC;;;OAGG;IACH,aAAkB;IAGlB;;;OAGG;IACH,cAFU,KAAK,CAEgB;IAK/B;;;OAGG;IACH,QAFU,MAAM,CAEI;IAEpB;;;OAGG;IACH,UAFU,aAAa,CAEH;IAGpB,+BAA0C;IAU1C;;OAEG;IACH,eAA+B;IAI/B;;;OAGG;IACH,uBAFU,kBAAkB,CAEgB;IAE5C;;;OAGG;IACH,oBAFU,iBAAiB,CAEsB;IAEjD;;;OAGG;IACH,gBAFU,iBAAiB,CAES;IAEpC;;;OAGG;IACH,sBAAoC;IAGpC;;;;OAIG;IACH,UAFU,OAAO,CAEG;IAEpB;;;OAGG;IACH,UAFU,OAAO,CAEG;IAEpB;;;OAGG;IACH,YAFU,MAAM,CAEG;IACnB,kKAcI;IAGR;;;OAGG;IACH,sBAFa,eAAe,CAI3B;IAED;;;OAGG;IACH,eAFa,aAAa,CAIzB;IAED,mBA8BC;IAED;;;;OAIG;IACH,iCAEC;IAED;;;OAGG;IACH,0BAFa,MAAM,CAIlB;IAED,+BAcC;IAED,cAgEC;IAzBsB,8BAA0C;IA2BjE;;;OAGG;IACH,cAFa,MAAM,CAYlB;IAED;;OAEG;IACH,aAQC;IAED;;OAEG;IACH,yBAQC;IAED;;;;;;OAMG;IACH,yBALW,MAAM,KACN,MAAM,6CAMhB;IAED;;;;OAIG;IACH,8BAHW,OAAO,UAAQ,UACf,OAAO,UAAQ,QAczB;IAED;;;;;OAKG;IACH,8BAQC;IAED,0BAEC;IAED;;;OAGG;IACH,4BAFW,cAAc,QA8BxB;IAED;;OAEG;IACH,qBAqBC;IAED;;OAEG;IACH,0BAeC;IAED;;OAEG;IACH,eA8CC;;CACJ;mBA5lBkB,oCAAoC;oBACnC,4BAA4B;wBACxB,4BAA4B;mCAajB,uCAAuC;sBAlBnE,OAAO;uBAaS,wBAAwB;8BAbxC,OAAO;4BAYc,+BAA+B;mCAKxB,uCAAuC;kCAKxC,gCAAgC;kCADhC,oCAAoC;gCAPtC,uCAAuC;+BAKxC,4BAA4B"}

package/src/engine/graphics/GraphicsEngine.js

@@ -12,6 +12,7 @@ import { assert } from "../../core/assert.js";
 
 import Signal from "../../core/events/signal/Signal.js";
 import Vector1 from "../../core/geom/Vector1.js";
+import { Vector2 } from "../../core/geom/Vector2.js";
 import { max2 } from "../../core/math/max2.js";
 import EmptyView from "../../view/elements/EmptyView.js";
 import { globalMetrics } from "../metrics/GlobalMetrics.js";
@@ -114,6 +115,15 @@ export class GraphicsEngine {
          */
         this.pixelRatio = new Vector1(1);
 
+        /**
+         * Final render-target resolution, in device pixels: `viewport.size × pixelRatio × devicePixelRatio`.
+         * Kept in sync by {@link GraphicsEngine#updateSize}. Subscribe to `output_resolution.onChanged` to
+         * react to any change in the actual rendered resolution (viewport resize, supersample, or DPR change).
+         * @readonly
+         * @type {Vector2}
+         */
+        this.output_resolution = new Vector2(0, 0);
+
         /**
          *
          * @type {RenderLayerManager}
@@ -277,19 +287,19 @@ export class GraphicsEngine {
 
         this.layerComposer.setSize(_w, _h);
         this.frameBuffers.setSize(_w, _h);
+
+        // publish the final device-pixel render resolution; `_w/_h` already fold in the engine pixelRatio,
+        // so this matches the framebuffers/composit layers and what getResolution historically computed
+        this.output_resolution.set(_w * devicePixelRatio, _h * devicePixelRatio);
     }
 
     /**
-     *
-     * @param {Vector2|{set:function(x:number,y:number)}} target
+     * @deprecated Read {@link GraphicsEngine#output_resolution} directly (and subscribe to its
+     * `onChanged` signal) instead of polling through this method.
+     * @param {Vector2|{copy:function(v:Vector2)}} target
      */
     getResolution(target) {
-        const ar = this.computeTotalPixelRatio();
-
-        target.set(
-            this.viewport.size.x * ar,
-            this.viewport.size.y * ar
-        );
+        target.copy(this.output_resolution);
     }
 
     /**

package/src/engine/graphics/render/buffer/simple-fx/ao/AmbientOcclusionPostProcessEffect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AmbientOcclusionPostProcessEffect.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/render/buffer/simple-fx/ao/AmbientOcclusionPostProcessEffect.js"],"names":[],"mappings":"AAoBA;IAIQ,WAA0C;IAI1C,2BAQE;IAyBF;;;;OAIG;IACH,sBAA0B;IAE1B;;;;OAIG;IACH,2BAA6B;IAG7B;;;;OAIG;IACH,yBAA4B;IAE5B;;;;OAIG;IACH,wBAA2B;IAE3B,8CAUE;IAEF;;;;OAIG;IACH,uBAAwB;IAExB;;;;;OAKG;IACH,2BASE;IAKF;;;;OAIG;IACH,0BAAwD;IAK5D;;;OAGG;IACH,2BAEC;IAED;;;OAGG;IACH,wBAEC;IAED;;;;OAIG;IACH,oBAeC;IAED,iBAEC;IAED,2BAoCC;IAED,uBASC;IAED;;;OAGG;IACH,iBAwBC;IAED;;;OAGG;IACH,4BAFW,OAAO,QAiCjB;IAED;;;;OAIG;IACH,gCASC;IAED;;;;OAIG;IACH,mCAUC;IAGD,oCAcC;IAED,wBA2CC;IAED,yBAiBC;CAEJ;6BAjZ4B,uCAAuC;+BAD7D,OAAO;6CAAP,OAAO"}
+{"version":3,"file":"AmbientOcclusionPostProcessEffect.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/render/buffer/simple-fx/ao/AmbientOcclusionPostProcessEffect.js"],"names":[],"mappings":"AAoBA;IAIQ,WAA0C;IAI1C,2BAQE;IAyBF;;;;OAIG;IACH,sBAA0B;IAE1B;;;;OAIG;IACH,2BAA6B;IAG7B;;;;OAIG;IACH,yBAA4B;IAE5B;;;;OAIG;IACH,wBAA2B;IAE3B,8CAUE;IAEF;;;;OAIG;IACH,uBAAwB;IAExB;;;;;OAKG;IACH,2BASE;IAKF;;;;OAIG;IACH,0BAAwD;IAK5D;;;OAGG;IACH,2BAEC;IAED;;;OAGG;IACH,wBAEC;IAED;;;;OAIG;IACH,oBAeC;IAED,iBAEC;IAED,2BAoCC;IAED,uBASC;IAED;;;OAGG;IACH,iBAwBC;IAED;;;OAGG;IACH,4BAFW,OAAO,QAiCjB;IAED;;;;OAIG;IACH,gCASC;IAED;;;;OAIG;IACH,mCAUC;IAGD,oCAiBC;IAED,wBA2CC;IAED,yBAiBC;CAEJ;6BApZ4B,uCAAuC;+BAD7D,OAAO;6CAAP,OAAO"}

package/src/engine/graphics/render/buffer/simple-fx/ao/AmbientOcclusionPostProcessEffect.js

@@ -187,8 +187,8 @@ export class AmbientOcclusionPostProcessEffect extends EnginePlugin {
 
         const camera = this.__render_camera;
 
-        // AO renders at half-res but samples the full-res depth buffer, so `size` is the full (depth)
-        // resolution -- all texel math then lands on depth texel centres rather than texel boundaries
+        // AO renders at half-res but samples the full-res depth buffer, so `size` is the full (depth)
+        // resolution -- all texel math then lands on depth texel centres rather than texel boundaries
         uniforms.size.value.set(this.__composit_layer.renderTarget.width, this.__composit_layer.renderTarget.height);
 
         // setup camera
@@ -333,7 +333,10 @@ export class AmbientOcclusionPostProcessEffect extends EnginePlugin {
         const engine = this.engine;
         const graphics = engine.graphics;
 
-        const size = graphics.viewport.size;
+        // scale relative to the actual render resolution (device pixels), the same basis as the `size`
+        // uniform and the full-res depth buffer the AO samples -- so the half-res grid stays a clean
+        // fraction of the full-res grid at any devicePixelRatio / supersample factor
+        const size = graphics.output_resolution;
 
         // clamp to 1: a 0-sized attachment trips GL_INVALID_FRAMEBUFFER_OPERATION on clear/draw
         const target_resolution_x = Math.max(1, Math.ceil(size.x * this.__resolution_scale));
@@ -378,7 +381,7 @@ export class AmbientOcclusionPostProcessEffect extends EnginePlugin {
         }
 
         this.__composit_layer.on.preRender.add(this.__render, this);
-        graphics.viewport.size.onChanged.add(this.__update_render_target_size, this);
+        graphics.output_resolution.onChanged.add(this.__update_render_target_size, this);
 
         this.__update_render_target_size();
 
@@ -399,7 +402,7 @@ export class AmbientOcclusionPostProcessEffect extends EnginePlugin {
         graphics.layerComposer.remove(this.__composit_layer);
 
         this.__composit_layer.on.preRender.remove(this.__render, this);
-        graphics.viewport.size.onChanged.add(this.__update_render_target_size, this);
+        graphics.output_resolution.onChanged.remove(this.__update_render_target_size, this);
 
         // release memory
         this.__upscale_material.dispose();

package/src/engine/graphics/render/buffer/simple-fx/ao/SAOShader.js

@@ -42,7 +42,9 @@ const SAOShader = {
         // which a tapped surface counts as an occluder
         'kernelRadius': { value: 0.5 }
     },
-    vertexShader: /* glsl */`
+
+    //language=GLSL
+    vertexShader:`
 
 		varying vec2 vUv;
 
@@ -51,7 +53,8 @@ const SAOShader = {
 			gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
 		}`,
 
-    fragmentShader: /* glsl */`
+    //language=GLSL
+    fragmentShader:        `
 
 		#include <common>
 
@@ -298,19 +301,24 @@ const SAOShader = {
 
 				float sceneViewZ = getViewZ( sampleDepth );
 
-				// the tapped surface must lie in front of (closer than) the probe to occlude it; if the
-				// probe is in front of the surface it sits in open space and nothing is occluded
-				// (view Z grows more negative away from the camera)
-				if ( samplePositionVS.z >= sceneViewZ ) {
-					continue;
-				}
-
 				// ...and the tapped surface must actually be within the sampling radius, otherwise we
 				// have hit distant geometry through the depth buffer that does not occlude this point
 				vec3 occluderVS = getViewPosition( sampleUv, sampleDepth, sceneViewZ );
-				if ( distance( centerViewPosition, occluderVS ) > kernelRadius ) {
+				vec3 to_hit = occluderVS - centerViewPosition;
+				
+				float distance_to_hit = length( to_hit );
+				
+				if ( distance_to_hit > kernelRadius ) {
 					continue;
 				}
+				
+				vec3 direction_to_hit = normalize(occluderVS - sampleOrigin);
+				
+				if( dot( direction_to_hit, centerViewNormal) < 0.01 ){
+				    // unable to occlude
+				    continue;
+				}
+				
 
 				// occluded: add this sample's weight to the numerator
 				occlusion += weight;

package/src/engine/graphics/render/buffer/simple-fx/ao/SAOUpscaleShader.js

@@ -16,7 +16,7 @@ import { Vector2 } from 'three';
 
 const SAOUpscaleShader = {
     defines: {
-        'NUM_TAPS': 16,
+        'NUM_TAPS': 7,
         'DEPTH_PACKING': 0,
         'PERSPECTIVE_CAMERA': 1
     },