@woosh/meep-engine 2.34.29 → 2.34.33

package/core/collection/table/DataTypeByteSizes.js

@@ -19,3 +19,19 @@ export const DataTypeByteSizes = {
     [DataType.Float32]: 4,
     [DataType.Float64]: 8
 };
+
+
+/**
+ *
+ * @param {DataType} type
+ * @return {number}
+ */
+export function dataTypeByteSize(type) {
+    const size = DataTypeByteSizes[type];
+
+    if (size === undefined) {
+        throw new Error(`Unsupported type '${type}'`);
+    }
+
+    return size;
+}

package/engine/Engine.js

@@ -131,6 +131,11 @@ class Engine {
             const v_fps = (1 / stats.mean).toFixed(2);
 
 
+            // clear stats
+            m_render.clear();
+            m_sim.clear();
+            m_frame.clear();
+
             return `FPS: ${v_fps}, RENDER: ${v_render}ms, SIMULATION: ${v_sim}ms`;
         });
 

package/engine/development/performance/AbstractMetric.js

@@ -21,4 +21,8 @@ export class AbstractMetric {
     computeStats(result) {
         throw new Error('Not implemented');
     }
+
+    clear(){
+        throw new Error('Not implemented');
+    }
 }

package/engine/development/performance/RingBufferMetric.js

@@ -31,4 +31,8 @@ export class RingBufferMetric extends AbstractMetric {
         result.max = computeArrayMax(array, 0, data_count);
         result.min = computeArrayMin(array, 0, data_count);
     }
+
+    clear() {
+        this.__data.clear();
+    }
 }

package/engine/ecs/transform/Transform.js

@@ -162,7 +162,7 @@ export class Transform {
 
     /**
      *
-     * @param {Matrix4} matrix
+     * @param {THREE.Matrix4} matrix
      */
     fromThreeMatrix4(matrix) {
         this.fromMatrix4(matrix.elements);

package/engine/graphics/ecs/mesh-v2/ShadedGeometry.js

@@ -125,16 +125,29 @@ export class ShadedGeometry {
     }
 
     __build_object() {
+        /**
+         * @type {THREE.Object3D}
+         */
+        let object;
+
         const mode = this.mode;
+        const shader = this.material;
+        const geo = this.geometry;
+
         if (mode === DrawMode.Triangles) {
-            this.__cached_object = new Mesh(this.geometry, this.material);
+            object = new Mesh(geo, shader);
         } else if (mode === DrawMode.Lines) {
-            this.__cached_object = new Line(this.geometry, this.material);
+            object = new Line(geo, shader);
         } else if (mode === DrawMode.LineSegments) {
-            this.__cached_object = new LineSegments(this.geometry, this.material);
+            object = new LineSegments(geo, shader);
         } else {
             throw new Error(`Unsupported draw mode '${mode}'`);
         }
+
+        object.matrixAutoUpdate = false;
+        object.frustumCulled = false;
+
+        this.__cached_object = object;
     }
 
     get bvh() {

package/engine/graphics/ecs/mesh-v2/ShadedGeometrySystem.js

@@ -81,6 +81,9 @@ export class ShadedGeometrySystem extends System {
 
         const leaf_node = sg.bvh;
 
+        // record entity on the BVH leaf
+        leaf_node.entity = entity;
+
         // remember entity for lookups
         sg.__entity = entity;
 

package/engine/graphics/ecs/mesh-v2/sample/load_gltf.js

@@ -0,0 +1,52 @@
+import { EngineHarness } from "../../../../EngineHarness.js";
+import { ShadedGeometrySystem } from "../ShadedGeometrySystem.js";
+import { GameAssetType } from "../../../../asset/GameAssetType.js";
+import { EngineConfiguration } from "../../../../EngineConfiguration.js";
+import { GLTFAssetLoader } from "../../../../asset/loaders/GLTFAssetLoader.js";
+import { three_object_to_entity_composition } from "../three_object_to_entity_composition.js";
+
+const eh = new EngineHarness();
+
+/**
+ *
+ * @param {EngineHarness} harness
+ * @return {Promise<void>}
+ */
+async function init(harness) {
+    const engine = harness.engine;
+
+    const config = new EngineConfiguration();
+
+    config.addSystem(new ShadedGeometrySystem(engine));
+    config.addLoader(GameAssetType.ModelGLTF_JSON, new GLTFAssetLoader());
+
+    await config.apply(engine);
+
+    eh.initialize().then(main);
+}
+
+/**
+ *
+ * @param {Engine} engine
+ */
+async function main(engine) {
+
+    const em = engine.entityManager;
+
+    EngineHarness.buildBasics({
+        engine,
+        enableWater: false
+    })
+
+    const ecd = em.dataset;
+
+    const asset = await engine.assetManager.promise('moicon/06_04_hapro/08-clickable-assets-new/model.gltf', GameAssetType.ModelGLTF_JSON);
+
+    const three_object = asset.create();
+
+    const composition = three_object_to_entity_composition(three_object);
+
+    composition.build(ecd);
+}
+
+init(eh);

package/engine/graphics/ecs/mesh-v2/{prototypeShadedGeometry.js → sample/prototypeShadedGeometry.js}

@@ -1,8 +1,8 @@
-import { EngineHarness } from "../../../EngineHarness.js";
-import { ShadedGeometrySystem } from "./ShadedGeometrySystem.js";
-import EntityBuilder from "../../../ecs/EntityBuilder.js";
-import { Transform } from "../../../ecs/transform/Transform.js";
-import { ShadedGeometry } from "./ShadedGeometry.js";
+import { EngineHarness } from "../../../../EngineHarness.js";
+import { ShadedGeometrySystem } from "../ShadedGeometrySystem.d.ts";
+import EntityBuilder from "../../../../ecs/EntityBuilder.d.ts";
+import { Transform } from "../../../../ecs/transform/Transform.d.ts";
+import { ShadedGeometry } from "../ShadedGeometry.d.ts";
 import { BoxBufferGeometry, MeshBasicMaterial } from "three";
 
 const eh = new EngineHarness();

package/engine/graphics/ecs/mesh-v2/three_object_to_entity_composition.js

@@ -0,0 +1,37 @@
+import { EntityNode } from "../../../ecs/parent/EntityNode.js";
+import { Transform } from "../../../ecs/transform/Transform.js";
+import { ShadedGeometry } from "./ShadedGeometry.js";
+
+/**
+ *
+ * @param {THREE.Object3D} root
+ * @returns {EntityNode}
+ */
+export function three_object_to_entity_composition(root) {
+    const node = new EntityNode();
+
+    const transform = new Transform();
+    transform.fromMatrix4(root.matrix.elements);
+
+    node.entity.add(transform);
+
+    if (root.isMesh) {
+        if (root.isSkinnedMesh) {
+            throw new Error(`Skinned meshes are not supported`);
+        }
+
+        node.entity.add(ShadedGeometry.from(root.geometry, root.material));
+    }
+
+    const children = root.children;
+    const child_count = children.length;
+    for (let i = 0; i < child_count; i++) {
+        const child = children[i];
+
+        const child_node = three_object_to_entity_composition(child);
+
+        node.addChild(child_node);
+    }
+
+    return node;
+}

package/engine/graphics/micron/build/buildMicronGeometryFromBufferGeometry.js

@@ -51,6 +51,17 @@ function custom_attribute_format_uv(spec, source) {
     spec.type = DataType.Float16;
 }
 
+/**
+ *
+ * @param {AttributeSpec} spec
+ * @param {THREE.BufferAttribute} source
+ */
+function custom_attribute_format_color(spec, source) {
+    // crush color data to 8 bit
+    spec.type = DataType.Uint8;
+    spec.normalized = true;
+}
+
 /**
  *
  * @param {AttributeSpec} spec
@@ -70,7 +81,11 @@ function format_attribute(spec, source, name) {
         case 'normal':
             custom_attribute_format_normal(spec, source);
             break;
+        case 'color':
+            custom_attribute_format_color(spec, source);
+            break;
         default:
+            spec.normalized = source.normalized;
             spec.type = typedArrayToDataType(source.array)
     }
 

package/engine/graphics/micron/build/compute_micron_buffer_array_constructor.js

@@ -14,6 +14,8 @@ export function compute_micron_buffer_array_constructor(type) {
             return Uint16Array;
         case DataType.Uint16:
             return Uint16Array;
+        case DataType.Uint8:
+            return Uint8Array;
         case DataType.Int8:
             return Int8Array;
         default:

package/engine/graphics/micron/build/fill_patch_geometry_data.js

@@ -9,6 +9,9 @@ import { DataType } from "../../../../core/collection/table/DataType.js";
 import { passThrough } from "../../../../core/function/Functions.js";
 import { to_half_float_uint16 } from "../../../../core/binary/to_half_float_uint16.js";
 import { compute_micron_buffer_array_constructor } from "./compute_micron_buffer_array_constructor.js";
+import { typedArrayToDataType } from "../../../../core/collection/array/typedArrayToDataType.js";
+import { dataTypeByteSize } from "../../../../core/collection/table/DataTypeByteSizes.js";
+import { clamp } from "../../../../core/math/clamp.js";
 
 function UintArrayForCount(count) {
 
@@ -90,6 +93,17 @@ function copy_attribute_data(vertex_count, index_map_backward, itemSize, attribu
     }
 }
 
+/**
+ *
+ * @param {number} value
+ * @returns {number}
+ */
+function resample_normalized_uint16_to_uint8(value) {
+    const normalized = clamp(value / 65535, 0, 1);
+
+    return Math.round(normalized * 255);
+}
+
 /**
  *
  * @param {number} value
@@ -105,7 +119,8 @@ function normalize_to_int8(value) {
 const DataConverterType = {
     None: passThrough,
     Number2HalfFloat: to_half_float_uint16,
-    Normalize2Int8: normalize_to_int8
+    Normalize2Int8: normalize_to_int8,
+    ResampleNormalized_Uint16_to_Uint8: resample_normalized_uint16_to_uint8
 };
 
 /**
@@ -115,17 +130,36 @@ const DataConverterType = {
  * @returns {DataConverterType}
  */
 function compute_attribute_data_converter(source, spec) {
-    if (spec.type === DataType.Float16) {
+    const target_type = spec.type;
+    if (target_type === DataType.Float16) {
         return DataConverterType.Number2HalfFloat;
     } else if (spec.normalized && !source.normalized) {
         // source data can be normalized but isn't
-        if (spec.type === DataType.Int8) {
+        if (target_type === DataType.Int8) {
             return DataConverterType.Normalize2Int8;
         } else {
-            throw new Error(`Unsupported normalized type '${spec.type}'`);
+            throw new Error(`Unsupported normalized type '${target_type}'`);
         }
     } else {
-        return DataConverterType.None;
+        const source_array = source.array;
+
+        const source_type = typedArrayToDataType(source_array);
+
+        const target_byte_size = dataTypeByteSize(target_type);
+        const source_byte_size = dataTypeByteSize(source_type)
+
+        if (target_byte_size !== source_byte_size) {
+            // wrong data size
+
+            if (target_type === DataType.Uint8 && source_type === DataType.Uint16) {
+                return DataConverterType.ResampleNormalized_Uint16_to_Uint8;
+            } else {
+                throw new Error(`Unsupported conversion ${source_type} -> ${target_type}`);
+            }
+
+        } else {
+            return DataConverterType.None;
+        }
     }
 }
 

package/engine/graphics/micron/format/MicronGeometry.js

@@ -3,6 +3,7 @@ import { assert } from "../../../../core/assert.js";
 import { computeTriangleRayIntersection } from "../../../../core/geom/3d/triangle/computeTriangleRayIntersection.js";
 import { SurfacePoint3 } from "../../../../core/geom/3d/SurfacePoint3.js";
 import { aabb3_array_intersects_ray } from "../../../../core/bvh2/aabb3/aabb3_array_intersects_ray.js";
+import { sphere_array_intersects_ray } from "../../../../core/geom/3d/sphere/sphere_array_intersects_ray.js";
 
 let id_counter = 0;
 
@@ -105,43 +106,18 @@ export class MicronGeometry {
 
             const patch = stack[stack_cursor];
 
-            // using group bounds because it's conservative, as we want to be able to hit LOD_0
-
-            // sphere test
-
-            // TODO check what's wrong with sphere tests and re-enable them
-            // if (!sphere_array_intersects_ray(patch.group_bounding_sphere,
-            //     origin_x, origin_y, origin_z,
-            //     direction_x, direction_y, direction_z
-            // )) {
-            //     continue;
-            // }
-
-
-            // box test (more expensive, different volume)
-            if (!aabb3_array_intersects_ray(
-                patch.group_bounding_box,
-                origin_x, origin_y, origin_z,
-                direction_x, direction_y, direction_z
-            )) {
-                // no intersection
-                continue;
-            }
-
             if (patch.lod === 0) {
                 // LOD 0 - source geometry
 
                 // cast against bounds
 
                 // sphere test
-
-                // TODO check what's wrong with sphere tests and re-enable them
-                // if (!sphere_array_intersects_ray(patch.bounding_sphere,
-                //     origin_x, origin_y, origin_z,
-                //     direction_x, direction_y, direction_z
-                // )) {
-                //     continue;
-                // }
+                if (!sphere_array_intersects_ray(patch.bounding_sphere,
+                    origin_x, origin_y, origin_z,
+                    direction_x, direction_y, direction_z
+                )) {
+                    continue;
+                }
 
                 // box test
                 if (!aabb3_array_intersects_ray(
@@ -200,6 +176,28 @@ export class MicronGeometry {
                 }
 
             } else {
+
+                // using group bounds because it's conservative, as we want to be able to hit LOD_0
+
+                // sphere test
+                if (!sphere_array_intersects_ray(patch.group_bounding_sphere,
+                    origin_x, origin_y, origin_z,
+                    direction_x, direction_y, direction_z
+                )) {
+                    continue;
+                }
+
+
+                // box test (more expensive, different volume)
+                if (!aabb3_array_intersects_ray(
+                    patch.group_bounding_box,
+                    origin_x, origin_y, origin_z,
+                    direction_x, direction_y, direction_z
+                )) {
+                    // no intersection
+                    continue;
+                }
+
                 // refine more
                 const children = patch.children;
 

package/engine/graphics/micron/prototypeVirtualGeometry.js

@@ -455,7 +455,7 @@ function init() {
     }
 
     // sample_gltf_sponza();
-    gltf_sample('data/models/RTS_Buildings_Humans/18/Building_R_18_out/Building_R_18.gltf');
+    // gltf_sample('data/models/RTS_Buildings_Humans/18/Building_R_18_out/Building_R_18.gltf');
     // sample_lucy();
     // sample_gltf_hapro_2();
     // sample_gltf_hapro_1();
@@ -468,6 +468,12 @@ function init() {
     // gltf_sample('moicon/29_Dec_2021_Nammo/1/model.gltf');
     // gltf_sample('moicon/29_Dec_2021_Nammo/1-onematerial/model.gltf');
     // gltf_sample('moicon/29_Dec_2021_Nammo/2/model.gltf');
+    // gltf_sample('moicon/03_Jan_22_Demo/1-ground_floor/model.gltf');
+    // gltf_sample('moicon/03_Jan_22_Demo/2-1st_floor/model.gltf');
+    // gltf_sample('moicon/03_Jan_22_Demo/3-area_ground_floor/model.gltf');
+    // gltf_sample('moicon/03_Jan_22_Demo/4-area_1st_floor/model.gltf');
+    // gltf_sample('moicon/03_Jan_22_Demo/8-assets/model.gltf');
+    gltf_sample('moicon/03_Jan_22_Demo/worker_test/model.gltf');
 
     document.addEventListener("mousemove", onDocumentMouseMove);
 

package/engine/graphics/micron/render/instanced/AttributeDataTexture.js

@@ -24,6 +24,9 @@ function normalized_internal_format(dt, channel_count) {
         case DataType.Int8:
             suffix = '8_SNORM';
             break;
+        case DataType.Uint16:
+            suffix = '16UI';
+            break;
         default:
             throw new Error(`Unsupported data type '${dt}'`);
     }

package/engine/graphics/micron/render/instanced/shader/shader_rewrite_standard.js

@@ -160,6 +160,29 @@ export function shader_rewrite_standard(shader, uniforms, spec, column_count) {
 
     if (attribute_spec_color !== undefined) {
         // using color
+        const vx_color_value = `texelFetch(${gen_micron_vertex_attribute_texture_name('color')}, micron_vertex_uv, 0)`
+
+        rewrittenVertexShader = rewrittenVertexShader.replace(
+            '#include <color_vertex>',
+            `
+                #if defined( USE_COLOR_ALPHA )
+                    vColor = vec4( 1.0 );
+                #elif defined( USE_COLOR ) || defined( USE_INSTANCING_COLOR )
+                    vColor = vec3( 1.0 );
+                #endif
+                
+                #ifdef USE_COLOR
+                
+                    #ifdef USE_COLOR_ALPHA
+                        vColor *= ${vx_color_value}.rgba;
+                    #else
+                        vColor *= ${vx_color_value}.rgb;
+                    #endif
+                    
+                #endif
+                
+                `
+        );
 
     }
 

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.34.29",
+  "version": "2.34.33",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",