@woosh/meep-engine 2.119.72 → 2.119.74

package/package.json

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

package/src/engine/EngineHarness.d.ts

@@ -50,6 +50,7 @@ export class EngineHarness {
      * @param {boolean} [params.enableWater]
      * @param {boolean} [params.enableTerrain]
      * @param {boolean} [params.enableLights=true]
+     * @param {boolean} [params.enableShadows=true] if lights are enabled, enable shadows for sun
      * @param {number} [params.cameraFieldOfView]
      * @param {number} [params.cameraFarDistance]
      * @param {boolean} [params.cameraController=true]
@@ -57,7 +58,7 @@ export class EngineHarness {
      * @param {number} [params.shadowmapResolution]
      * @param {boolean} [params.showFps]
      */
-    static buildBasics({ engine, focus, heightMap, heightRange, pitch, yaw, distance, terrainSize, terrainResolution, enableWater, enableTerrain, enableLights, cameraFieldOfView, cameraFarDistance, cameraController, cameraAutoClip, shadowmapResolution, showFps }: {
+    static buildBasics({ engine, focus, heightMap, heightRange, pitch, yaw, distance, terrainSize, terrainResolution, enableWater, enableTerrain, enableLights, enableShadows, cameraFieldOfView, cameraFarDistance, cameraController, cameraAutoClip, shadowmapResolution, showFps }: {
         engine: Engine;
         focus?: {
             x: number;
@@ -77,6 +78,7 @@ export class EngineHarness {
         enableWater?: boolean;
         enableTerrain?: boolean;
         enableLights?: boolean;
+        enableShadows?: boolean;
         cameraFieldOfView?: number;
         cameraFarDistance?: number;
         cameraController?: boolean;
@@ -127,13 +129,12 @@ export class EngineHarness {
      * @param {Vector2} [size]
      * @param {String} [diffuse0]
      * @param heightMap
-     * @param heightRange
-     * @param resolution
-     * @param waterLevel
-     * @param enableWater
+     * @param {number} [resolution]
+     * @param {number} [waterLevel]
+     * @param {boolean} [enableWater]
      * @returns {Terrain}
      */
-    static buildTerrain({ engine, size, diffuse0, heightRange, resolution, waterLevel, enableWater, }: Engine): Terrain;
+    static buildTerrain({ engine, size, diffuse0, resolution, waterLevel, enableWater, }: Engine): Terrain;
     /**
      *
      * @type {Engine}

package/src/engine/EngineHarness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EngineHarness.d.ts","sourceRoot":"","sources":["../../../src/engine/EngineHarness.js"],"names":[],"mappings":"AA6DA;IAmBI;;;;OAIG;IACH,8CAHmB,mBAAmB,UAAQ,MAAM,WACxC,QAAQ,MAAM,CAAC,CAM1B;IAED;;;OAGG;IACH,6BAFW,MAAM,QAYhB;IAmED;;;;;;;;;;;;;OAaG;IACH;QAZyB,MAAM,EAApB,MAAM;QACyB,GAAG;QAClB,MAAM,GAAtB,OAAO;QACQ,QAAQ,GAAvB,MAAM;QACS,KAAK,GAApB,MAAM;QACS,GAAG,GAAlB,MAAM;QACU,QAAQ,GAAxB,OAAO;QACQ,WAAW,GAA1B,MAAM;QACS,WAAW,GAA1B,MAAM;QACS,WAAW,GAA1B,MAAM;QACJ,MAAM,CA+DlB;IAED;;;;;;;;;;;;;;;;;;;;OAoBG;IACH;QAnB0B,MAAM,EAArB,MAAM;QACgC,KAAK,GAA3C;YAAC,CAAC,EAAC,MAAM,CAAC;YAAA,CAAC,EAAC,MAAM,CAAC;YAAA,CAAC,EAAC,MAAM,CAAA;SAAC;QACrB,SAAS;QACT,WAAW;QACF,KAAK,GAArB,MAAM;QACU,GAAG,GAAnB,MAAM;QACU,QAAQ,GAAxB,MAAM;QACwB,WAAW,GAAzC;YAAC,CAAC,EAAC,MAAM,CAAC;YAAC,CAAC,EAAC,MAAM,CAAA;SAAC;QACJ,iBAAiB,GAAjC,MAAM;QACW,WAAW,GAA5B,OAAO;QACU,aAAa,GAA9B,OAAO;QACU,YAAY,GAA7B,OAAO;QACS,iBAAiB,GAAjC,MAAM;QACU,iBAAiB,GAAjC,MAAM;QACW,gBAAgB,GAAjC,OAAO;QACU,cAAc,GAA/B,OAAO;QACS,mBAAmB,GAAnC,MAAM;QACW,OAAO,GAAxB,OAAO;sBAqEjB;IAGD;;;;;;;;;;;OAWG;IACH;QAVyB,MAAM,EAApB,MAAM;QACyB,GAAG;QACnB,mBAAmB,GAAlC,MAAM;QACU,UAAU,GAA1B,OAAO;QACO,GAAG,GAAjB,KAAK;QACU,YAAY,GAA3B,MAAM;QACU,YAAY,GAA5B,OAAO;QACO,OAAO,GAArB,KAAK;QACU,gBAAgB,GAA/B,MAAM;sBAqDhB;IAED;;;;;;;OAOG;IACH;QAN0B,YAAY,GAA3B,MAAM;QACQ,MAAM,EAApB,MAAM;QACS,WAAW,GAA1B,MAAM;QACyB,GAAG;QAChC,QAAQ,MAAM,CAAC,CA2C3B;IAGD;;;;;;;;;;;OAWG;IACH,mGAVW,MAAM,GAQJ,OAAO,CAuDnB;IA3cG;;;OAGG;IACH,QAFU,MAAM,CAEiC;IAMjD;;;OAGG;IACH,YAFU,eAAQ,IAAI,CAET;IA8BjB;;;;;OAKG;IACH;iCAJmB,mBAAmB,UAAQ,MAAM;8BACzC,OAAO;QACL,QAAQ,MAAM,CAAC,CA2D3B;CAiWJ;;IAID;;;OAGG;IACH,uCAMC;;mBA1gBkB,aAAa;oCACI,0BAA0B;oBAX1C,yBAAyB;mBAK1B,iBAAiB;sBATd,wBAAwB;oBAW1B,8BAA8B"}
+{"version":3,"file":"EngineHarness.d.ts","sourceRoot":"","sources":["../../../src/engine/EngineHarness.js"],"names":[],"mappings":"AA8DA;IAmBI;;;;OAIG;IACH,8CAHmB,mBAAmB,UAAQ,MAAM,WACxC,QAAQ,MAAM,CAAC,CAM1B;IAED;;;OAGG;IACH,6BAFW,MAAM,QAYhB;IAmED;;;;;;;;;;;;;OAaG;IACH;QAZyB,MAAM,EAApB,MAAM;QACyB,GAAG;QAClB,MAAM,GAAtB,OAAO;QACQ,QAAQ,GAAvB,MAAM;QACS,KAAK,GAApB,MAAM;QACS,GAAG,GAAlB,MAAM;QACU,QAAQ,GAAxB,OAAO;QACQ,WAAW,GAA1B,MAAM;QACS,WAAW,GAA1B,MAAM;QACS,WAAW,GAA1B,MAAM;QACJ,MAAM,CA+DlB;IAED;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH;QApB0B,MAAM,EAArB,MAAM;QACgC,KAAK,GAA3C;YAAC,CAAC,EAAC,MAAM,CAAC;YAAA,CAAC,EAAC,MAAM,CAAC;YAAA,CAAC,EAAC,MAAM,CAAA;SAAC;QACrB,SAAS;QACT,WAAW;QACF,KAAK,GAArB,MAAM;QACU,GAAG,GAAnB,MAAM;QACU,QAAQ,GAAxB,MAAM;QACwB,WAAW,GAAzC;YAAC,CAAC,EAAC,MAAM,CAAC;YAAC,CAAC,EAAC,MAAM,CAAA;SAAC;QACJ,iBAAiB,GAAjC,MAAM;QACW,WAAW,GAA5B,OAAO;QACU,aAAa,GAA9B,OAAO;QACU,YAAY,GAA7B,OAAO;QACU,aAAa,GAA9B,OAAO;QACS,iBAAiB,GAAjC,MAAM;QACU,iBAAiB,GAAjC,MAAM;QACW,gBAAgB,GAAjC,OAAO;QACU,cAAc,GAA/B,OAAO;QACS,mBAAmB,GAAnC,MAAM;QACW,OAAO,GAAxB,OAAO;sBA0EjB;IAGD;;;;;;;;;;;OAWG;IACH;QAVyB,MAAM,EAApB,MAAM;QACyB,GAAG;QACnB,mBAAmB,GAAlC,MAAM;QACU,UAAU,GAA1B,OAAO;QACO,GAAG,GAAjB,KAAK;QACU,YAAY,GAA3B,MAAM;QACU,YAAY,GAA5B,OAAO;QACO,OAAO,GAArB,KAAK;QACU,gBAAgB,GAA/B,MAAM;sBAqDhB;IAED;;;;;;;OAOG;IACH;QAN0B,YAAY,GAA3B,MAAM;QACQ,MAAM,EAApB,MAAM;QACS,WAAW,GAA1B,MAAM;QACyB,GAAG;QAChC,QAAQ,MAAM,CAAC,CA2C3B;IAGD;;;;;;;;;;OAUG;IACH,sFATW,MAAM,GAOJ,OAAO,CAsDnB;IA/cG;;;OAGG;IACH,QAFU,MAAM,CAEiC;IAMjD;;;OAGG;IACH,YAFU,eAAQ,IAAI,CAET;IA8BjB;;;;;OAKG;IACH;iCAJmB,mBAAmB,UAAQ,MAAM;8BACzC,OAAO;QACL,QAAQ,MAAM,CAAC,CA2D3B;CAqWJ;;IAID;;;OAGG;IACH,uCAMC;;mBA/gBkB,aAAa;oCACI,0BAA0B;oBAX1C,yBAAyB;mBAK1B,iBAAiB;sBATd,wBAAwB;oBAW1B,8BAA8B"}

package/src/engine/EngineHarness.js

@@ -24,6 +24,7 @@ import { Light } from "./graphics/ecs/light/Light.js";
 import LightSystem from "./graphics/ecs/light/LightSystem.js";
 import Water from "./graphics/ecs/water/Water.js";
 import WaterSystem from "./graphics/ecs/water/WaterSystem.js";
+import checkersTextureURI from "./graphics/texture/CheckersTextureURI.js";
 import { MouseEvents } from "./input/devices/events/MouseEvents.js";
 import KeyboardCameraController from "./input/ecs/controllers/KeyboardCameraController.js";
 import InputControllerSystem from "./input/ecs/systems/InputControllerSystem.js";
@@ -261,6 +262,7 @@ export class EngineHarness {
      * @param {boolean} [params.enableWater]
      * @param {boolean} [params.enableTerrain]
      * @param {boolean} [params.enableLights=true]
+     * @param {boolean} [params.enableShadows=true] if lights are enabled, enable shadows for sun
      * @param {number} [params.cameraFieldOfView]
      * @param {number} [params.cameraFarDistance]
      * @param {boolean} [params.cameraController=true]
@@ -281,6 +283,7 @@ export class EngineHarness {
                                  enableWater = true,
                                  enableTerrain = true,
                                  enableLights = true,
+                                 enableShadows = true,
                                  cameraFieldOfView,
                                  cameraFarDistance,
                                  cameraController = true,
@@ -294,7 +297,11 @@ export class EngineHarness {
         }
 
         if (enableLights) {
-            await EngineHarness.buildLights({ engine: engine, shadowmapResolution });
+            await EngineHarness.buildLights({
+                engine: engine,
+                shadowmapResolution,
+                castShadow: enableShadows,
+            });
         }
 
         const camera = EngineHarness.buildCamera({
@@ -461,18 +468,16 @@ export class EngineHarness {
      * @param {Vector2} [size]
      * @param {String} [diffuse0]
      * @param heightMap
-     * @param heightRange
-     * @param resolution
-     * @param waterLevel
-     * @param enableWater
+     * @param {number} [resolution]
+     * @param {number} [waterLevel]
+     * @param {boolean} [enableWater]
      * @returns {Terrain}
      */
     static async buildTerrain(
         {
             engine,
             size = new Vector2(10, 10),
-            diffuse0 = "data/textures/utility/checkers_dark_grey_256x256.png",
-            heightRange = 0,
+            diffuse0 = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAA1JREFUGFdj+P///38ACfsD/QVDRcoAAAAASUVORK5CYII=",
             resolution = 10,
             waterLevel = 0,
             enableWater = true,

package/src/engine/ecs/terrain/ecs/layers/TerrainLayers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TerrainLayers.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/ecs/terrain/ecs/layers/TerrainLayers.js"],"names":[],"mappings":"AA6EA;IAGQ;;;OAGG;IACH,QAFU,KAAK,YAAY,CAAC,CAEJ;IAExB;;;OAGG;IACH,YAFU,OAAO,CAEoD;IAErE;;;OAGG;IACH,SAFU,kBAAkB,CAEqC;IAgBjE,2BAAsF;IAa1F;;;MAKC;IAED;;;aAGC;IAED;;;;OAIG;IACH,gCAHW,MAAM,iBACN,MAAM,QAuChB;IAED;;;;OAIG;IACH,0DAyBC;IAED,sCAIC;IAED;;;;OAIG;IACH,WAHW,MAAM,GACL,YAAY,CAIvB;IAED;;;;OAIG;IACH,8DAFa,MAAM,CAqBlB;IAED;;;;OAIG;IACH,kCAHW,MAAM,GACJ,MAAM,CAMlB;IAED;;;OAGG;IACH,SAFY,MAAM,CAIjB;IAED;;;;OAIG;IACH,gBAHW,YAAY,GACV,MAAM,CAWlB;IAED;;;;OAIG;IACH,mBAHW,YAAY,GACX,OAAO,CAIlB;IAED;;;;;;OAMG;IACH,0CA8BC;IAED;;;OAGG;IACH,iCAFW,MAAM,QAgChB;IAED,gBAGC;IAED,cAEC;IAGD,qBAqCC;CACJ;iBArZgB,6CAA6C;6BAQjC,mBAAmB;oBAP5B,qCAAqC;mCALlD,OAAO;4BAAP,OAAO"}
+{"version":3,"file":"TerrainLayers.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/ecs/terrain/ecs/layers/TerrainLayers.js"],"names":[],"mappings":"AA6EA;IAGQ;;;OAGG;IACH,QAFU,KAAK,YAAY,CAAC,CAEJ;IAExB;;;OAGG;IACH,YAFU,OAAO,CAEoD;IAMrE;;;OAGG;IACH,SAFU,kBAAkB,CAE8B;IAiB1D,2BAAsF;IAc1F;;;MAKC;IAED;;;aAGC;IAED;;;;OAIG;IACH,gCAHW,MAAM,iBACN,MAAM,QAuChB;IAED;;;;OAIG;IACH,0DAyBC;IAED,sCAIC;IAED;;;;OAIG;IACH,WAHW,MAAM,GACL,YAAY,CAIvB;IAED;;;;OAIG;IACH,8DAFa,MAAM,CAqBlB;IAED;;;;OAIG;IACH,kCAHW,MAAM,GACJ,MAAM,CAMlB;IAED;;;OAGG;IACH,SAFY,MAAM,CAIjB;IAED;;;;OAIG;IACH,gBAHW,YAAY,GACV,MAAM,CAWlB;IAED;;;;OAIG;IACH,mBAHW,YAAY,GACX,OAAO,CAIlB;IAED;;;;;;OAMG;IACH,0CA8BC;IAED;;;OAGG;IACH,iCAFW,MAAM,QAgChB;IAED,gBAGC;IAED,cAEC;IAGD,qBAsCC;CACJ;iBA5ZgB,6CAA6C;6BAQjC,mBAAmB;oBAP5B,qCAAqC;mCALlD,OAAO;4BAAP,OAAO"}

package/src/engine/ecs/terrain/ecs/layers/TerrainLayers.js

@@ -36,7 +36,7 @@ class ScaledTextureKey {
      * @returns {ScaledTextureKey}
      */
     static from(uri, size) {
-        assert.isString(uri,  'uri');
+        assert.isString(uri, 'uri');
 
         const r = new ScaledTextureKey();
 
@@ -90,11 +90,15 @@ export class TerrainLayers {
          */
         this.resolution = new Vector2(DEFAULT_RESOLUTION, DEFAULT_RESOLUTION);
 
+
+        const layer_data = new Uint8Array(3);
+        layer_data.fill(255); //pre-fill with white
+
         /**
          *
          * @type {DataTexture2DArray}
          */
-        this.texture = new DataTexture2DArray(new Uint8Array(3), 1, 1, 1);
+        this.texture = new DataTexture2DArray(layer_data, 1, 1, 1);
         this.texture.format = GL_RGBFormat;
         this.texture.type = UnsignedByteType;
 
@@ -109,6 +113,7 @@ export class TerrainLayers {
         this.texture.generateMipmaps = true;
         this.texture.encoding = LinearEncoding;
         this.texture.internalFormat = 'RGB8';
+        this.texture.needsUpdate = true;
 
         this.scalesTexture = new DataTexture(new Float32Array(64), 32, 1, RGFormat, FloatType);
 
@@ -121,6 +126,7 @@ export class TerrainLayers {
         this.scalesTexture.internalFormat = 'RG32F';
 
         this.scalesTexture.generateMipmaps = false;
+        this.scalesTexture.needsUpdate = true;
     }
 
     toJSON() {
@@ -406,6 +412,7 @@ export class TerrainLayers {
 
         //build an array to hold texture array
         const arrayData = new Uint8Array(size_x * size_y * 3 * layerCount);
+        arrayData.fill(255); // fill with white
 
         if (image.width === size_x && image.height === size_y) {
             // dimensions preserved, copy old data