@woosh/meep-engine 2.169.3 → 2.169.4

package/package.json

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

package/src/engine/graphics/geometry/instancing/InstancedMeshGroup.d.ts

@@ -192,7 +192,14 @@ export class InstancedMeshGroup {
 }
 export type CacheKey = {
     color: Material;
+    /**
+     * material for the depth shadow pass, used by directional and spot lights
+     */
     depth: Material;
+    /**
+     * material for the distance shadow pass, used by point lights
+     */
+    distance: Material;
 };
 import { BufferGeometry } from 'three';
 import { Mesh } from 'three';

package/src/engine/graphics/geometry/instancing/InstancedMeshGroup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InstancedMeshGroup.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/geometry/instancing/InstancedMeshGroup.js"],"names":[],"mappings":"AAyCA;IAqiBI;;;;;OAKG;IACH,sBAJW,oBAAoB,uBAElB,kBAAkB,CAS9B;IA5iBG;;;;OAIG;IACH,wBAA2B;IAE3B;;;;OAIG;IACH,gCAAmC;IAEnC;;;OAGG;IACH,cAAc;IAEd;;;OAGG;IACH,UAFU,MAAM,CAEC;IAEjB;;;OAGG;IACH,YAFU,MAAM,CAEK;IACrB;;;OAGG;IACH,cAFU,MAAM,CAEM;IAEtB;;;OAGG;IACH,cAFU,MAAM,CAEO;IAEvB;;;OAGG;IACH,gBAFU,MAAM,CAEQ;IAExB;;;;OAIG;IACH,6BAAgC;IAEhC;;;;OAIG;IACH,kCAAqC;IAGrC;;;;;OAKG;IACH,yBAA4B;IAE5B;;;;OAIG;IACH,8BAAiC;IAEjC;;;;OAIG;IACH,wBAAuC;IAEvC;;;;OAIG;IACH,mBAAsB;IAEtB,eAAiB;IACjB,kBAAoB;IAEpB;;;;OAIG;IACH,oBAAqC;IAErC,kFAAqC;IAErC,mBAAqB;IAGzB,qBA8BC;IAED;;;OAGG;IACH,2BAUC;IAED;;;OAGG;IACH,+BAcC;IAED;;;OAGG;IACH,4BAEC;IAED,gBAIC;IAED;;;OAGG;IACH,sBAFW,oBAAoB,QAU9B;IA4CD;;;OAGG;IACH,4BAFW,MAAM,QAAQ,GAAC,MAAM,cAAc,QAS7C;IAED;;;OAGG;IACH,kBAFW,MAAM,QAWhB;IAED;;;OAGG;IACH,qBAFW,MAAM,QA6BhB;IAED;;;;OAIG;IACH,sBAHW,MAAM,aACN,MAAM,EAAE,GAAC,UAAU,MAAM,CAAC,GAAC,YAAY,QAIjD;IAED;;;;OAIG;IACH,kBAHW,MAAM,SACN,MAAM,EAAE,GAAC,UAAU,MAAM,CAAC,GAAC,YAAY,QAIjD;IAED;;;;;;;OAOG;IACH,6BANW,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,QAWhB;IAED,+BAMC;IAED;;;;OAIG;IACH,qCAEC;IAED;;;OAGG;IACH,0BAKC;IAED;;;OAGG;IACH,YAFY,MAAM,MAAI,CAIrB;IAED;;;;OAIG;IACH,yBAUC;IAED;;;;OAIG;IACH,4DAH2C,IAAI,uBAiB9C;IAED;;;OAGG;IACH,6BAoDC;IAED,cAiEC;;CAgBJ;;;;;+BAllBM,OAAO;qBAAP,OAAO"}
+{"version":3,"file":"InstancedMeshGroup.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/geometry/instancing/InstancedMeshGroup.js"],"names":[],"mappings":"AA2CA;IA2jBI;;;;;OAKG;IACH,sBAJW,oBAAoB,uBAElB,kBAAkB,CAS9B;IAlkBG;;;;OAIG;IACH,wBAA2B;IAE3B;;;;OAIG;IACH,gCAAmC;IAEnC;;;OAGG;IACH,cAAc;IAEd;;;OAGG;IACH,UAFU,MAAM,CAEC;IAEjB;;;OAGG;IACH,YAFU,MAAM,CAEK;IACrB;;;OAGG;IACH,cAFU,MAAM,CAEM;IAEtB;;;OAGG;IACH,cAFU,MAAM,CAEO;IAEvB;;;OAGG;IACH,gBAFU,MAAM,CAEQ;IAExB;;;;OAIG;IACH,6BAAgC;IAEhC;;;;OAIG;IACH,kCAAqC;IAGrC;;;;;OAKG;IACH,yBAA4B;IAE5B;;;;OAIG;IACH,8BAAiC;IAEjC;;;;OAIG;IACH,wBAAuC;IAEvC;;;;OAIG;IACH,mBAAsB;IAEtB,eAAiB;IACjB,kBAAoB;IAEpB;;;;OAIG;IACH,oBAAqC;IAErC,kFAAqC;IAErC,mBAAqB;IAGzB,qBA+BC;IAED;;;OAGG;IACH,2BAUC;IAED;;;OAGG;IACH,+BAcC;IAED;;;OAGG;IACH,4BAEC;IAED,gBAIC;IAED;;;OAGG;IACH,sBAFW,oBAAoB,QAU9B;IAgED;;;OAGG;IACH,4BAFW,MAAM,QAAQ,GAAC,MAAM,cAAc,QAU7C;IAED;;;OAGG;IACH,kBAFW,MAAM,QAWhB;IAED;;;OAGG;IACH,qBAFW,MAAM,QA6BhB;IAED;;;;OAIG;IACH,sBAHW,MAAM,aACN,MAAM,EAAE,GAAC,UAAU,MAAM,CAAC,GAAC,YAAY,QAIjD;IAED;;;;OAIG;IACH,kBAHW,MAAM,SACN,MAAM,EAAE,GAAC,UAAU,MAAM,CAAC,GAAC,YAAY,QAIjD;IAED;;;;;;;OAOG;IACH,6BANW,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,QAWhB;IAED,+BAMC;IAED;;;;OAIG;IACH,qCAEC;IAED;;;OAGG;IACH,0BAKC;IAED;;;OAGG;IACH,YAFY,MAAM,MAAI,CAIrB;IAED;;;;OAIG;IACH,yBAUC;IAED;;;;OAIG;IACH,4DAH2C,IAAI,uBAiB9C;IAED;;;OAGG;IACH,6BAoDC;IAED,cAiEC;;CAgBJ;;;;;;;;;;;;+BAzmBM,OAAO;qBAAP,OAAO"}

package/src/engine/graphics/geometry/instancing/InstancedMeshGroup.js

@@ -7,6 +7,7 @@ import {
     LineSegments,
     Mesh,
     MeshDepthMaterial,
+    MeshDistanceMaterial,
     RGBADepthPacking
 } from 'three';
 import { Cache } from "../../../../core/cache/Cache.js";
@@ -26,7 +27,8 @@ import { rewriteMaterial } from "./rewriteMaterial.js";
 /**
  * @typedef {Object} CacheKey
  * @property {Material} color
- * @property {Material} depth
+ * @property {Material} depth material for the depth shadow pass, used by directional and spot lights
+ * @property {Material} distance material for the distance shadow pass, used by point lights
  */
 
 /**
@@ -180,6 +182,7 @@ export class InstancedMeshGroup {
             new_object.receiveShadow = this.mesh.receiveShadow;
 
             new_object.customDepthMaterial = this.mesh.customDepthMaterial;
+            new_object.customDistanceMaterial = this.mesh.customDistanceMaterial;
         }
 
         this.mesh = new_object;
@@ -269,24 +272,44 @@ export class InstancedMeshGroup {
 
         material.onBeforeCompile = composeCompile(sourceMaterial.onBeforeCompile, rewriteMaterial);
 
-        //we need a custom depth material to ensure shadows will be drawn correctly
+        // We need custom shadow materials to ensure shadows will be drawn correctly.
+        //
+        // Instancing here is not three's own: the per-instance transform lives in an
+        // `instanceMatrix` attribute on our InstancedBufferGeometry and is applied by the
+        // `rewriteMaterial` shader patch, NOT by three's `USE_INSTANCING` (which keys off
+        // `Object3D.isInstancedMesh`, and this mesh is a plain Mesh). So every material
+        // this geometry is ever drawn with has to carry the patch, or that draw renders
+        // every instance at the local origin.
+        //
+        // There are two shadow passes and they take different materials: depth for
+        // directional and spot lights, distance for point lights (which compare world-space
+        // distance to the light rather than projected depth). Both are honoured by
+        // ThreeLightBinding, which prefers `customDepthMaterial`/`customDistanceMaterial`
+        // over its own unpatched fallbacks.
         const depthMaterial = new MeshDepthMaterial({
             depthPacking: RGBADepthPacking,
         });
 
-        //if the source material uses alpha testing - enable it on the depth material
+        const distanceMaterial = new MeshDistanceMaterial();
+
+        //if the source material uses alpha testing - enable it on the shadow materials
         if (material.alphaTest !== 0) {
             depthMaterial.alphaTest = material.alphaTest;
             depthMaterial.map = material.map;
+
+            distanceMaterial.alphaTest = material.alphaTest;
+            distanceMaterial.map = material.map;
         }
 
         depthMaterial.onBeforeCompile = rewriteMaterial;
+        distanceMaterial.onBeforeCompile = rewriteMaterial;
 
         const cachedMaterial = StaticMaterialCache.Global.acquire(material);
 
         return {
             color: cachedMaterial,
-            depth: StaticMaterialCache.Global.acquire(depthMaterial)
+            depth: StaticMaterialCache.Global.acquire(depthMaterial),
+            distance: StaticMaterialCache.Global.acquire(distanceMaterial)
         };
 
     }
@@ -302,6 +325,7 @@ export class InstancedMeshGroup {
 
         this.mesh.material = m.color;
         this.mesh.customDepthMaterial = m.depth;
+        this.mesh.customDistanceMaterial = m.distance;
     }
 
     /**