@woosh/meep-engine 2.33.25 → 2.33.29

package/engine/graphics/particles/particular/engine/utils/volume/prototypeParticleVolume.js

@@ -63,7 +63,7 @@ import {
 import { seededRandom } from "../../../../../../../core/math/random/seededRandom.js";
 import { TransformedShape3D } from "../../../../../../../core/geom/3d/shape/TransformedShape3D.js";
 import { mat4 } from "gl-matrix";
-import { CompositeShape3D } from "../../../../../../../core/geom/3d/shape/CompositeShape.js";
+import { UnionShape3D } from "../../../../../../../core/geom/3d/shape/UnionShape3D.js";
 import { ShadedGeometry } from "../../../../../ecs/mesh-v2/ShadedGeometry.js";
 import { DrawMode } from "../../../../../ecs/mesh-v2/DrawMode.js";
 import { makeHelperBoxGeometry } from "../../../../../../../editor/process/symbolic/makeHelperBoxGeometry.js";
@@ -77,6 +77,7 @@ import ButtonView from "../../../../../../../view/elements/button/ButtonView.js"
 import { UnitSphereShape3D } from "../../../../../../../core/geom/3d/shape/UnitSphereShape3D.js";
 import TopDownCameraController from "../../../../../ecs/camera/topdown/TopDownCameraController.js";
 import { randomFloatBetween } from "../../../../../../../core/math/random/randomFloatBetween.js";
+import { MicronRenderPlugin } from "../../../../../micron/plugin/MicronRenderPlugin.js";
 
 const engineHarness = new EngineHarness();
 
@@ -130,7 +131,7 @@ function makeConfig(engine) {
 
 
     // Plugins
-    // config.addPlugin(MicronRenderPlugin);
+    config.addPlugin(MicronRenderPlugin);
 
 
     // Knowledge
@@ -306,6 +307,7 @@ async function sample_scene_0(engine) {
 
     // load_model('moicon/06_04_hapro/00-environment/model.gltf', -0.1);
     load_model_s('moicon/06_04_hapro/05-ground-floor/model.gltf');
+    load_model_s('C:/git/moh/app/moicon/06_04_hapro/08-clickable-assets-new/model.gltf');
     // load_model('moicon/06_04_hapro/02-bearers/model.gltf');
     // load_model('moicon/06_04_hapro/04-1st-floor/model.gltf');
 
@@ -313,7 +315,7 @@ async function sample_scene_0(engine) {
     await make_demo_volume({
         ecd: ecd,
         lut: heatmap_lut_0,
-        shape: CompositeShape3D.from([
+        shape: UnionShape3D.from([
             TransformedShape3D.from_m4(new UnitCubeShape3D(), mat_from_aabb3(new AABB3(67.73, 0, 89, 115.84, 3, 118.34))),
             TransformedShape3D.from_m4(new UnitCubeShape3D(), mat_from_aabb3(new AABB3(98, 0, 76.5, 109.5, 3, 89)))
         ]),
@@ -325,7 +327,7 @@ async function sample_scene_0(engine) {
     await make_demo_volume({
         ecd: ecd,
         lut: heatmap_lut_0,
-        shape: CompositeShape3D.from([
+        shape: UnionShape3D.from([
             TransformedShape3D.from_m4(new UnitCubeShape3D(), [14.980091485108495, 0, 0, 0, 0, 2.812495250139616, 0, 0, 0, 0, 7.469446746375293, 0, 54.83080514238756, 1.568241402881399, 92.51937192481576, 1]),
             TransformedShape3D.from_m4(new UnitCubeShape3D(), [6.644515553810907, 0, 0, 0, 0, 2.812495250139616, 0, 0, 0, 0, 5.507507223409315, 0, 46.95032009188344, 1.568241402881399, 95.54148649329517, 1]),
             TransformedShape3D.from_m4(new UnitCubeShape3D(), [23.762890107594952, 0, 0, 0, 0, 2.812495250139616, 0, 0, 0, 0, 34.57956316503163, 0, 55.436098243647756, 1.568241402881399, 113.46988143189215, 1])
@@ -349,7 +351,7 @@ async function sample_scene_0(engine) {
     await make_demo_volume({
         ecd: ecd,
         lut: heatmap_lut_pink_to_blue,
-        shape: CompositeShape3D.from([
+        shape: UnionShape3D.from([
             TransformedShape3D.from_m4(new UnitCubeShape3D(), [15.218520811592711, 0, 0, 0, 0, 3.058639690434693, 0, 0, 0, 0, 5.828701399328644, 0, 89.53848861962253, 2.0721850959505907, 73.05504876489894, 1]),
             TransformedShape3D.from_m4(new UnitCubeShape3D(), [18.10977091153633, 0, 0, 0, 0, 3.058639690434693, 0, 0, 0, 0, 2.5862076050328002, 0, 88.03260126722904, 2.0721850959505907, 69.0797462656922, 1])
         ]),
@@ -363,7 +365,7 @@ async function sample_scene_0(engine) {
     await make_demo_volume({
         ecd: ecd,
         lut: heatmap_lut_3,
-        shape: CompositeShape3D.from([
+        shape: UnionShape3D.from([
             TransformedShape3D.from_m4(new UnitCubeShape3D(), [20.977896627021547, 0, 0, 0, 0, 2.956899734575006, 0, 0, 0, 0, 36.201589869571954, 0, 99.2120028317975, 1.5919924971428276, 49.21655402009093, 1]),
             TransformedShape3D.from_m4(new UnitCubeShape3D(), [24.455615450514458, 0, 0, 0, 0, 2.956899734575006, 0, 0, 0, 0, 28.081536987027807, 0, 80.11618755300161, 1.5919924971428276, 45.13808745329574, 1]),
             TransformedShape3D.from_m4(new UnitCubeShape3D(), [5.562874425497998, 0, 0, 0, 0, 2.956899734575006, 0, 0, 0, 0, 2.654155224548708, 0, 70.80986716000054, 1.5919924971428276, 59.679876796143446, 1])
@@ -378,7 +380,7 @@ async function sample_scene_0(engine) {
     await make_demo_volume({
         ecd: ecd,
         lut: heatmap_lut_orange_to_red,
-        shape: CompositeShape3D.from([
+        shape: UnionShape3D.from([
             TransformedShape3D.from_m4(new UnitCubeShape3D(), [-3.8971594611231577, -1.9562533614625899, -0.5725042419276598, 0, -8.346390838999248, 16.986127440019352, -1.226109479938015, 0, 0.12112312197093604, 0, -0.8245111322851176, 0, 55.83305788880312, 9.579537179233043, 83.59013920067233, 1]),
             TransformedShape3D.from_m4(new UnitSphereShape3D(), [10.237283879346698, 0, 0, 0, 0, 10.237283879346698, 0, 0, 0, 0, 10.237283879346698, 0, 51.783732965076716, 18.028888481196716, 82.91084586075068, 1])
         ]),
@@ -555,7 +557,7 @@ async function sample_scene_nam(engine) {
     await make_demo_volume({
         ecd: ecd,
         lut: heatmap_lut_pink_to_blue,
-        shape: CompositeShape3D.from([
+        shape: UnionShape3D.from([
             TransformedShape3D.from_m4(new UnitCubeShape3D(), [5.985827128973811, 0, 0, 0, 0, 2.435269776236539, 0, 0, 0, 0, 4.669621139110231, 0, 11.08356834576874, 1.2643565739307023, 2.4360416869081885, 1]),
             TransformedShape3D.from_m4(new UnitCubeShape3D(), [8.413758403821523, 0, 0, 0, 0, 2.3166487265965343, 0, 0, 0, 0, 7.775469675813772, 0, 4.313201108449287, 1.4169994923726943, 4.011630095541064, 1]),
             TransformedShape3D.from_m4(new UnitCubeShape3D(), [8.413758403821523, 0, 0, 0, 0, 2.3166487265965343, 0, 0, 0, 0, 2.925065210015915, 0, 12.417224289491141, 1.4169994923726943, 6.432483110925785, 1])
@@ -607,7 +609,8 @@ async function main(engine) {
 
     engine.graphics.renderer.setClearColor('rgba(99,99,99,1)');
 
-    await sample_scene_nam(engine);
+    // await sample_scene_nam(engine);
+    await sample_scene_0(engine);
 }
 
 /**

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

@@ -1,4 +1,3 @@
-import { max2 } from "../../../../../../core/math/max2.js";
 import { EnginePlugin } from "../../../../../plugin/EnginePlugin.js";
 import {
     LinearFilter,
@@ -161,9 +160,9 @@ export class AmbientOcclusionPostProcessEffect extends EnginePlugin {
         uniforms.bias.value = 0.5;
         uniforms.intensity.value = 0.18;
 
-        const depth_range = far - near;
-
-        uniforms.scale.value = 5 * max2(1, depth_range / 30);
+        // scale is divided by camera far in the shader, we unbias it here
+        // TODO remove this term from the shader
+        uniforms.scale.value = far * 0.25;
 
         uniforms.kernelRadius.value = 30;
         uniforms.minResolution.value = 0;

package/engine/graphics/render/forward_plus/materials/FPlusDebugMaterial.js

@@ -36,7 +36,7 @@ const f_shader = `
     
     uniform sampler2D t_heatmap_lookup;
     
-    uniform vec2 resolution;
+    uniform vec2 fp_resolution;
     
     uniform mat4 projectionMatrix;
     
@@ -79,7 +79,7 @@ const f_shader = `
     
     void main(){
     
-            vec3 clip_v = vec3(gl_FragCoord.xy / resolution, convert_depth_to_linear( gl_FragCoord.z));
+            vec3 clip_v = vec3(gl_FragCoord.xy / fp_resolution, convert_depth_to_linear( gl_FragCoord.z));
        
             ivec3 v3_cluster_resolution = textureSize(fp_t_light_tiles, 0);
             ivec3 v3_cluster_position = ivec3( ( 1.0 - clip_v.x) * float(v3_cluster_resolution.x), clip_v.y*float(v3_cluster_resolution.y), (clip_v.z)*float(v3_cluster_resolution.z) );
@@ -119,7 +119,7 @@ export class FPlusDebugMaterial extends ShaderMaterial {
                     type: 'f',
                     value: 0
                 },
-                resolution: {
+                fp_resolution: {
                     type: 'v2',
                     value: new Vector2()
                 },

package/engine/graphics/render/forward_plus/materials/ForwardPlusThreeMaterial.js

@@ -29,7 +29,7 @@ export class ForwardPlusThreeMaterial extends ShaderMaterial {
                     type: 'f',
                     value: 0
                 },
-                resolution: {
+                fp_resolution: {
                     type: 'v2',
                     value: new Vector2()
                 }

package/engine/graphics/render/forward_plus/prototypeLightManager.js

@@ -317,7 +317,7 @@ function prepare_scene_0() {
 
     const bounds_size = 15;
 
-    const light_radius = 2;
+    const light_radius = 5;
 
     for (let i = 0; i < 5000; i++) {
         const radius = randomFloatBetween(random, light_radius, light_radius);
@@ -624,7 +624,7 @@ fp_materials.forEach(m => {
 
     renderer.getSize(v2);
 
-    m.uniforms.resolution.value.set(
+    m.uniforms.fp_resolution.value.set(
         v2.x * window.devicePixelRatio, v2.y * window.devicePixelRatio
     );
 
@@ -693,7 +693,7 @@ function animate() {
         m.uniforms.fp_f_camera_far.value = camera.far;
 
 
-        m.uniforms.resolution.value.set(scratch_v2.x, scratch_v2.y);
+        m.uniforms.fp_resolution.value.set(scratch_v2.x, scratch_v2.y);
     });
 
     lightClusterWidget.update();
@@ -760,7 +760,7 @@ function draw_camera_view_planes() {
     });
 }
 
-prepare_scene_4();
+prepare_scene_0();
 animate();
 
 // draw_camera_view_planes();

package/engine/graphics/render/forward_plus/query/point_light_inside_volume.js

@@ -42,21 +42,22 @@ export function point_light_inside_volume(
         if (distance < 0) {
             // center of the sphere is below the plane
 
-            if (distance < -radius) {
-                // sphere is entirely below the plane
+            if (distance >= -radius) {
 
-                // query_bvh_frustum_from_objects.rejection_sphere_count++;
+                // sphere intersects the plane
 
-                return false;
-            }
+                outside_plane_count++;
 
-            // sphere intersects the plane
+                const plane_bit_mask = 1 << j;
 
-            outside_plane_count++;
+                outside_plane_bitfield |= plane_bit_mask;
+            } else {
+                // sphere is entirely below the plane
 
-            const plane_bit_mask = 1 << j;
+                // query_bvh_frustum_from_objects.rejection_sphere_count++;
 
-            outside_plane_bitfield |= plane_bit_mask;
+                return false;
+            }
         }
 
     }

package/engine/graphics/shadows/ShadowMapRenderer.js

@@ -173,13 +173,19 @@ export class ShadowMapRenderer {
 
         if (shadow.map === null) {
 
-            const pars = { format: RGBAFormat };
+            const pars = {
+                format: RGBAFormat,
+                scissorTest: false,
+                stencilBuffer: false
+            };
 
             if (!shadow.isPointLightShadow && renderer.shadowMap.type === VSMShadowMap) {
                 pars.minFilter = LinearFilter;
                 pars.magFilter = LinearFilter;
 
-                shadow.mapPass = new WebGLRenderTarget(_shadowMapSize.x, _shadowMapSize.y, pars);
+                shadow.mapPass = new WebGLRenderTarget(_shadowMapSize.x, _shadowMapSize.y, Object.assign({
+                    depthBuffer: false
+                }, pars));
 
             } else {
                 pars.minFilter = NearestFilter;

package/engine/graphics/texture/atlas/ManagedTextureAtlas.js

@@ -6,6 +6,7 @@ import { GameAssetType } from "../../../asset/GameAssetType.js";
 import { HashMap } from "../../../../core/collection/HashMap.js";
 import { strictEquals } from "../../../../core/function/Functions.js";
 import { computeStringHash } from "../../../../core/primitives/strings/computeStringHash.js";
+import { copy_Sampler2D_channel_data } from "../sampler/copy_Sampler2D_channel_data.js";
 
 const CACHE_SIZE = 4194304;
 
@@ -139,10 +140,20 @@ export class ManagedAtlas {
 
                     const image = asset.create();
 
+                    const source = new Sampler2D(image.data, image.itemSize, image.width, image.height);
                     //assert.equal(atlas.patches.filter(p => p.sampler.data === image.data).length, 0, "Atlas already contains this asset data");
 
                     //build sampler
-                    const sampler = new Sampler2D(image.data, 4, image.width, image.height);
+                    let sampler;
+
+                    if (source.itemSize !== 4) {
+                        // source image is not in RGBA layout, resample
+                        sampler = Sampler2D.uint8(4, image.width, image.height);
+                        copy_Sampler2D_channel_data(source, sampler)
+                    } else {
+                        sampler = source;
+                    }
+
                     const patch = atlas.add(sampler);
 
                     //record active patch

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

@@ -164,11 +164,13 @@ export function Sampler2D(data = [], itemSize = 1, width = 0, height = 0) {
      * @type {Number}
      */
     this.height = height;
+
     /**
-     *
+     * Number of channels
      * @type {Number}
      */
     this.itemSize = itemSize;
+
     /**
      *
      * @type {Array<number>|Uint8Array|Uint16Array|Int8Array|Float32Array|Float64Array}

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

@@ -17,7 +17,7 @@ const DEFAULT_TEXTURE_HEIGHT = 512;
  * @return {Sampler2D}
  */
 export function convertTexture2Sampler2D(texture, width, height, flipY = true) {
-
+    // TODO take channel count into account
 
     if (width === undefined || height === undefined) {
 

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

@@ -0,0 +1,66 @@
+/**
+ * Allows copying data from one sampler to another with unequal number of channels (a.itemSize !== b.itemSize)
+ * @example convert RGBA to RGB or R to RGB
+ * @param {Sampler2D} source
+ * @param {Sampler2D} destination
+ */
+export function copy_Sampler2D_channel_data(source, destination) {
+    if (source.width !== destination.width || source.height !== destination.height) {
+        throw new Error('Source and destination dimensions do not match');
+    }
+
+    const source_item_size = source.itemSize;
+    const destination_item_size = destination.itemSize;
+
+    const pixel_count = source.width * source.height;
+
+    const destination_data = destination.data;
+    const source_data = source.data;
+
+    let i, j;
+
+    if (source_item_size === destination_item_size) {
+        // just copy data chunk
+        destination_data.set(source_data);
+
+    } else if (source_item_size > destination_item_size) {
+
+        for (i = 0; i < pixel_count; i++) {
+            const source_sample_offset = i * source_item_size;
+            const destination_sample_offset = i * destination_item_size;
+
+            for (j = 0; j < destination_item_size; j++) {
+                destination_data[destination_sample_offset + j] = source_data[source_sample_offset + j];
+            }
+        }
+
+    } else if (source_item_size === 3 && destination_item_size === 4) {
+        // RGB -> RGBA
+        for (i = 0; i < pixel_count; i++) {
+            const i3 = i * 3;
+            const i4 = i * 4;
+
+            destination_data[i4] = source_data[i3];
+            destination_data[i4 + 1] = source_data[i3 + 1];
+            destination_data[i4 + 2] = source_data[i3 + 2];
+
+            destination_data[i4] = 255; // fill alpha
+        }
+    } else if (source_item_size === 2 && destination_item_size === 4) {
+        //RA -> RGBA
+        for (i = 0; i < pixel_count; i++) {
+            const i2 = i * 2;
+            const i4 = i * 4;
+
+            const r = source_data[i2];
+
+            destination_data[i4] = r;
+            destination_data[i4 + 1] = r;
+            destination_data[i4 + 2] = r;
+
+            destination_data[i4 + 3] = source_data[i2 + 1]; // fill alpha
+        }
+    } else {
+        throw new Error('Unsupported channel layout combination');
+    }
+}

package/engine/input/devices/KeyCodes.d.ts

@@ -0,0 +1 @@
+export const KeyCodes: Object;

package/package.json

@@ -4,7 +4,7 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.33.25",
+  "version": "2.33.29",
   "dependencies": {
     "fast-levenshtein": "2.0.6",
     "opentype.js": "1.3.3",

package/view/minimap/gl/MinimapWorldGL.js

@@ -171,13 +171,20 @@ export class MinimapWorldGL {
     }
 
     update() {
-        this.layers.forEach(o => {
-            o.update(this.camera);
-            if (o.needsRender) {
+        const layers = this.layers;
+        const layer_count = layers.length;
+
+        for (let i = 0; i < layer_count; i++) {
+            const layer = layers[i];
+
+            layer.update(this.camera);
+
+            if (layer.needsRender) {
                 this.renderNeedsUpdate = true;
-                o.needsRender = false;
+                layer.needsRender = false;
             }
-        });
+
+        }
 
         if (this.renderNeedsUpdate) {
             this.render();