@woosh/meep-engine 2.33.57 → 2.33.61

package/engine/graphics/shadows/ShadowMapRenderer.js

@@ -95,12 +95,18 @@ export class ShadowMapRenderer {
 
         this.onBeforeRender.send3(renderer, shadow_camera, scene);
 
-        renderer.render(scene, shadow_camera);
-
-        if (renderer.shadowMap.type === VSMShadowMap) {
-            this.__do_vsm_pass(shadow);
+        if (target.width <= 0 || target.height <= 0) {
+            // no point in rendering
+        } else {
+            // do the draw
+            renderer.render(scene, shadow_camera);
+
+            if (renderer.shadowMap.type === VSMShadowMap) {
+                this.__do_vsm_pass(shadow);
+            }
         }
 
+
         // restore state
         renderer.setRenderTarget(__rt, __acf, __aml);
         renderer.setScissorTest(__scissor);

package/engine/graphics/shadows/testShadowMapRendering.js

@@ -5,7 +5,6 @@ import { MeshSystem } from "../ecs/mesh/MeshSystem.js";
 import GUIElementSystem from "../../ecs/gui/GUIElementSystem.js";
 import HeadsUpDisplaySystem from "../../ecs/gui/hud/HeadsUpDisplaySystem.js";
 import TagSystem from "../../ecs/systems/TagSystem.js";
-import { AttachmentSocketsSystem } from "../../ecs/sockets/AttachmentSocketsSystem.js";
 import { AttachmentSystem } from "../../ecs/attachment/AttachmentSystem.js";
 import { SoundEmitterSystem } from "../../sound/ecs/emitter/SoundEmitterSystem.js";
 import SoundControllerSystem from "../../sound/ecs/SoundControllerSystem.js";
@@ -72,7 +71,6 @@ function makeConfig(engine) {
 
     config.addManySystems(
         new TagSystem(),
-        new AttachmentSocketsSystem(),
         new AttachmentSystem(),
         new SoundEmitterSystem(assetManager, sound.destination, sound.context),
         new SoundControllerSystem(),

package/engine/graphics/texture/sampler/Sampler2D.js

@@ -570,6 +570,10 @@ Sampler2D.prototype.sampleChannelBicubic = function (x, y, channel) {
     const x1 = clamp(x, 0, x_max) | 0;
     const y1 = clamp(y, 0, y_max) | 0;
 
+    // fractional texel position (from the nearest low texel)
+    const xd = x - x1;
+    const yd = y - y1;
+
     const x0 = max2(0, x1 - 1);
     const y0 = max2(0, y1 - 1);
 
@@ -595,61 +599,36 @@ Sampler2D.prototype.sampleChannelBicubic = function (x, y, channel) {
     const col2_offset = x2 * itemSize;
     const col3_offset = x3 * itemSize;
 
-    // compute sample addresses
-    const i0 = row0_address + col0_offset;
-    const i1 = row0_address + col1_offset;
-    const i2 = row0_address + col2_offset;
-    const i3 = row0_address + col3_offset;
-
-    const j0 = row1_address + col0_offset;
-    const j1 = row1_address + col1_offset;
-    const j2 = row1_address + col2_offset;
-    const j3 = row1_address + col3_offset;
+    // read samples
+    const vi0 = data[row0_address + col0_offset];
+    const vi1 = data[row0_address + col1_offset];
+    const vi2 = data[row0_address + col2_offset];
+    const vi3 = data[row0_address + col3_offset];
 
-    const k0 = row2_address + col0_offset;
-    const k1 = row2_address + col1_offset;
-    const k2 = row2_address + col2_offset;
-    const k3 = row2_address + col3_offset;
+    const vj0 = data[row1_address + col0_offset];
+    const vj1 = data[row1_address + col1_offset];
+    const vj2 = data[row1_address + col2_offset];
+    const vj3 = data[row1_address + col3_offset];
 
-    const l0 = row3_address + col0_offset;
-    const l1 = row3_address + col1_offset;
-    const l2 = row3_address + col2_offset;
-    const l3 = row3_address + col3_offset;
+    const vk0 = data[row2_address + col0_offset];
+    const vk1 = data[row2_address + col1_offset];
+    const vk2 = data[row2_address + col2_offset];
+    const vk3 = data[row2_address + col3_offset];
 
-    // read samples
-    const vi0 = data[i0];
-    const vi1 = data[i1];
-    const vi2 = data[i2];
-    const vi3 = data[i3];
-
-    const vj0 = data[j0];
-    const vj1 = data[j1];
-    const vj2 = data[j2];
-    const vj3 = data[j3];
-
-    const vk0 = data[k0];
-    const vk1 = data[k1];
-    const vk2 = data[k2];
-    const vk3 = data[k3];
-
-    const vl0 = data[l0];
-    const vl1 = data[l1];
-    const vl2 = data[l2];
-    const vl3 = data[l3];
+    const vl0 = data[row3_address + col0_offset];
+    const vl1 = data[row3_address + col1_offset];
+    const vl2 = data[row3_address + col2_offset];
+    const vl3 = data[row3_address + col3_offset];
 
-    const xd = x - x1;
-    const yd = y - y1;
 
-    // perform filtering in X
+    // perform filtering in X (rows)
     const s0 = bicubic_terp(xd, vi0, vi1, vi2, vi3);
     const s1 = bicubic_terp(xd, vj0, vj1, vj2, vj3);
     const s2 = bicubic_terp(xd, vk0, vk1, vk2, vk3);
     const s3 = bicubic_terp(xd, vl0, vl1, vl2, vl3);
 
-    // filter in Y
-    const result = bicubic_terp(yd, s0, s1, s2, s3);
-
-    return result;
+    // filter in Y (columns)
+    return bicubic_terp(yd, s0, s1, s2, s3);
 };
 
 /**

package/engine/{ecs/grid → graphics/texture/sampler}/sampler2DToFloat32Texture.js

@@ -1,5 +1,5 @@
 import { ClampToEdgeWrapping, DataTexture, FloatType, LinearFilter, NearestFilter, RedFormat } from "three";
-import { assert } from "../../../core/assert.js";
+import { assert } from "../../../../core/assert.js";
 
 /**
  *

package/engine/intelligence/behavior/ecs/WaitForEventBehavior.js

@@ -1,6 +1,7 @@
 import { EntityBehavior } from "./EntityBehavior.js";
 import { BehaviorStatus } from "../BehaviorStatus.js";
 import { BinaryClassSerializationAdapter } from "../../../ecs/storage/binary/BinaryClassSerializationAdapter.js";
+import { assert } from "../../../../core/assert.js";
 
 export class WaitForEventBehavior extends EntityBehavior {
     constructor() {
@@ -26,6 +27,8 @@ export class WaitForEventBehavior extends EntityBehavior {
     }
 
     fromJSON({ event, target = -1 }) {
+        assert.isString(event, 'event');
+
         this.event = event;
         this.target = target;
     }

package/engine/save/storage/IndexedDBStorage.js

@@ -1,12 +1,18 @@
 import Storage from "../Storage.js";
 import { IndexedDBTransactionMode } from "./IndexedDBTransactionMode.js";
+import { assert } from "../../../core/assert.js";
 
 const MAIN_STORE_NAME = 'main';
 
+/**
+ * TODO add QuotaExceededError handling
+ */
 export class IndexedDBStorage extends Storage {
     constructor(name) {
         super();
 
+        assert.isString(name, 'name');
+
         /**
          *
          * @param {IDBDatabase} database
@@ -43,7 +49,7 @@ export class IndexedDBStorage extends Storage {
 
                 const objectStore = transaction.objectStore(MAIN_STORE_NAME);
 
-                const idbRequest = objectStore.delete( key);
+                const idbRequest = objectStore.delete(key);
 
                 if (typeof resolve === "function") {
 
@@ -60,6 +66,7 @@ export class IndexedDBStorage extends Storage {
                     });
 
                 }
+
             });
 
         if (typeof reject === "function") {

package/package.json

@@ -5,7 +5,7 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.33.57",
+  "version": "2.33.61",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",

package/samples/terrain/main.js

@@ -0,0 +1,117 @@
+import { EngineConfiguration } from "../../engine/EngineConfiguration.js";
+import { EngineHarness } from "../../engine/EngineHarness.js";
+import { GameAssetType } from "../../engine/asset/GameAssetType.js";
+import { TextureAssetLoader } from "../../engine/asset/loaders/texture/TextureAssetLoader.js";
+import { obtainTerrain } from "../../../model/game/scenes/SceneUtils.js";
+import { ImprovedNoise } from "three/examples/jsm/math/ImprovedNoise.js";
+import { lerp } from "../../core/math/lerp.js";
+import Vector2 from "../../core/geom/Vector2.js";
+import Vector3 from "../../core/geom/Vector3.js";
+
+const eh = new EngineHarness();
+
+/**
+ *
+ * @param {Engine} engine
+ * @return {EngineConfiguration}
+ */
+function makeConfig(engine) {
+    const r = new EngineConfiguration();
+
+    // configure engine here, add systems, loaders etc.
+    r.addLoader(GameAssetType.Texture, new TextureAssetLoader());
+
+    return r;
+}
+
+/**
+ *
+ * @param {Terrain} terrain
+ * @param {number} resolution
+ * @param {number} heightMin
+ * @param {number} heightMax
+ */
+async function buildRandomTerrainHeights({
+                                             terrain,
+                                             resolution = 64,
+                                             heightMin = -5,
+                                             heightMax = 20
+                                         }) {
+
+    const terrain_height = terrain.samplerHeight;
+
+    terrain_height.resize(resolution, resolution);
+
+    const noise = new ImprovedNoise();
+
+    let x, y;
+
+    for (y = 0; y < resolution; y++) {
+        for (x = 0; x < resolution; x++) {
+
+            const u = x / (resolution - 1);
+            const v = y / (resolution - 1);
+
+            const noise_value = noise.noise(u * 13.456, v * 13.456, 0) * noise.noise(u * 3.71, v * 3.71, 0.8);
+
+            const height_value = lerp(heightMin, heightMax, noise_value);
+
+            terrain_height.set(x, y, [height_value]);
+        }
+    }
+
+    await terrain.updateWorkerHeights();
+    terrain.updateHeightTexture();
+    terrain.buildLightMap();
+
+    terrain.tiles.rebuild();
+}
+
+/**
+ *
+ * @param {Engine} engine
+ */
+async function main(engine) {
+
+
+    await EngineHarness.buildBasics({
+        engine,
+        enableWater: false,
+        terrainResolution: 4,
+        terrainSize: new Vector2(64, 64),
+        focus: new Vector3(64, 0, 54),
+        yaw: 0,
+        pitch: 0.909,
+        distance: 169
+    });
+
+    /**
+     *
+     * @type {EntityComponentDataset}
+     */
+    const ecd = engine.entityManager.dataset;
+
+    /**
+     *
+     * @type {Terrain|null}
+     */
+    const terrain = obtainTerrain(ecd);
+
+    buildRandomTerrainHeights({ terrain: terrain });
+}
+
+/**
+ *
+ * @param {EngineHarness} harness
+ */
+async function init(harness) {
+    const engine = eh.engine;
+
+    await makeConfig(engine).apply(engine);
+
+    await eh.initialize();
+
+    main(engine);
+}
+
+init(eh);

package/engine/ecs/sockets/AttachmentSocketsSystem.js

@@ -1,10 +0,0 @@
-import { System } from "../System.js";
-import { AttachmentSockets } from "./AttachmentSockets.js";
-
-export class AttachmentSocketsSystem extends System {
-    constructor() {
-        super();
-
-        this.dependencies = [AttachmentSockets];
-    }
-}