@woosh/meep-engine 2.36.0 → 2.36.1

package/engine/ecs/parent/entity_node_compute_bounding_box.js

@@ -0,0 +1,41 @@
+import { ShadedGeometry } from "../../graphics/ecs/mesh-v2/ShadedGeometry.js";
+import { AABB3 } from "../../../core/bvh2/aabb3/AABB3.js";
+
+const scratch_aabb3 = new AABB3();
+
+/**
+ *
+ * @param {AABB3} out
+ * @param {EntityNode} root
+ */
+export function entity_node_expand_bounding_box_to_fit(out, root) {
+    const sg = root.entity.getComponent(ShadedGeometry);
+
+    if (sg !== null) {
+        sg.getBoundingBox(scratch_aabb3);
+
+        out.expandToFit(scratch_aabb3);
+    }
+
+    const children = root.children;
+    const child_count = children.length;
+
+    for (let i = 0; i < child_count; i++) {
+        const child = children[i];
+
+        entity_node_expand_bounding_box_to_fit(out, child);
+    }
+}
+
+/**
+ *
+ * @param {AABB3} out
+ * @param {EntityNode} root
+ */
+export function entity_node_compute_bounding_box(out, root) {
+    // init bounds
+    out.setNegativelyInfiniteBounds();
+
+    // expand bounds to fit the tree
+    entity_node_expand_bounding_box_to_fit(out, root);
+}

package/engine/graphics/ecs/mesh-v2/render/adapters/InstancedRendererAdapter.js

@@ -3,6 +3,7 @@ import { HashMap } from "../../../../../../core/collection/HashMap.js";
 import { InstancedMeshGroup } from "../../../../geometry/instancing/InstancedMeshGroup.js";
 import { ShadedGeometryFlags } from "../../ShadedGeometryFlags.js";
 import { DrawMode } from "../../DrawMode.js";
+import { StreamDrawUsage } from "three";
 
 const INSTANCED_EQUALITY_FLAGS = ShadedGeometryFlags.CastShadow
     | ShadedGeometryFlags.ReceiveShadow
@@ -89,6 +90,7 @@ export class InstancedRendererAdapter extends AbstractRenderAdapter {
             }
 
             im = new InstancedMeshGroup();
+            im.instance_usage = StreamDrawUsage;
             im.shrinkFactor = 0; // prevent shrinking as we're essentially rebuilding this geometry frame
 
             im.setMaterial(sg.material);

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

@@ -1,10 +1,10 @@
 import {
     BufferGeometry,
+    DynamicDrawUsage,
     InstancedBufferAttribute,
     InstancedBufferGeometry,
     MeshDepthMaterial,
-    RGBADepthPacking,
-    StreamDrawUsage
+    RGBADepthPacking
 } from 'three';
 import ThreeFactory from "../../three/ThreeFactory.js";
 import { StaticMaterialCache } from "../../../asset/loaders/material/StaticMaterialCache.js";
@@ -77,6 +77,13 @@ export class InstancedMeshGroup {
          */
         this.__attributeTransformArray = null;
 
+        /**
+         *
+         * @type {Usage}
+         * @private
+         */
+        this.__instanceUsage = DynamicDrawUsage;
+
         /**
          *
          * @type {Material}
@@ -90,6 +97,30 @@ export class InstancedMeshGroup {
         this.mesh = ThreeFactory.createMesh();
     }
 
+    /**
+     *
+     * @param {Usage} v
+     */
+    set instance_usage(v) {
+        if (this.__instanceUsage === v) {
+            return;
+        }
+
+        this.__instanceUsage = v;
+
+        if (this.__attributeTransform !== null) {
+            this.__attributeTransform.setUsage(v);
+        }
+    }
+
+    /**
+     *
+     * @return {Usage}
+     */
+    get instance_usage() {
+        return this.__instanceUsage;
+    }
+
     dispose() {
         if (this.__threeGeometry !== null) {
             this.__threeGeometry.dispose();
@@ -367,7 +398,7 @@ export class InstancedMeshGroup {
         //rewrite old attributes
         this.__attributeTransformArray = newTransformArray;
         this.__attributeTransform = new InstancedBufferAttribute(newTransformArray, 16);
-        this.__attributeTransform.setUsage(StreamDrawUsage);
+        this.__attributeTransform.setUsage(this.__instanceUsage);
 
         //add attributes to newly created geometry
         geometry.setAttribute("instanceMatrix", this.__attributeTransform);

package/engine/graphics/micron/format/serialization/collection/geometry_collection_serialization.spec.js

@@ -0,0 +1,24 @@
+import { deserialize_geometry_collection, serialize_geometry_collection } from "./geometry_collection_serialization.js";
+import { BinaryBuffer } from "../../../../../../core/binary/BinaryBuffer.js";
+
+test('serialize empty', () => {
+    const bb = new BinaryBuffer();
+
+    expect(() => {
+        serialize_geometry_collection([], bb);
+    }).not.toThrow();
+
+});
+
+test('serialize/deserialize empty', () => {
+    const bb = new BinaryBuffer();
+
+    serialize_geometry_collection([], bb);
+
+    bb.position = 0;
+
+    const destination = [];
+    deserialize_geometry_collection(destination, bb);
+
+    expect(destination.length).toBe(0);
+});

package/engine/graphics/micron/plugin/shaded_geometry/MicronShadedGeometryRenderAdapter.js

@@ -90,6 +90,16 @@ export class MicronShadedGeometryRenderAdapter extends AbstractRenderAdapter {
             pixelRatio = renderer.getPixelRatio();
         }
 
+        //  clear context
+        const material_contexts = this.ctx.contexts_array;
+        const contexts_count = material_contexts.length;
+        for (let i = 0; i < contexts_count; i++) {
+            const mc = material_contexts[i];
+
+            mc.instances.clear();
+        }
+
+        // initialize geometry builder
         const vg_builder = this.ctx.builder;
 
         vg_builder.resolution.set(resolution.x * pixelRatio, resolution.y * pixelRatio);

package/engine/graphics/micron/prototypeVirtualGeometry.js

@@ -38,7 +38,9 @@ import { DRACOLoader } from "three/examples/jsm/loaders/DRACOLoader.js";
 import { TextureAttachmentsByMaterialType } from "../../asset/loaders/material/TextureAttachmensByMaterialType.js";
 import { distributePointsOnMesh } from "../particles/particular/engine/utils/distrubuteParticlesOnMesh.js";
 import { BinaryNode } from "../../../core/bvh2/BinaryNode.js";
-import { queryBinaryNode_SphereIntersections_Data } from "../../../core/bvh2/traversal/queryBinaryNode_SphereIntersections.js";
+import {
+    queryBinaryNode_SphereIntersections_Data
+} from "../../../core/bvh2/traversal/queryBinaryNode_SphereIntersections.js";
 import { ensureGeometryBoundingSphere } from "../geometry/buffered/ensureGeometryBoundingSphere.js";
 import { StaticMaterialCache } from "../../asset/loaders/material/StaticMaterialCache.js";
 import convertSampler2D2Canvas from "../texture/sampler/Sampler2D2Canvas.js";
@@ -461,7 +463,7 @@ function init() {
 
     // sample_gltf_sponza();
     // gltf_sample('data/models/RTS_Buildings_Humans/18/Building_R_18_out/Building_R_18.gltf');
-    // sample_lucy();
+    sample_lucy();
     // sample_dragon();
     // sample_gltf_hapro_2();
     // sample_gltf_hapro_1();
@@ -481,7 +483,7 @@ function init() {
     // gltf_sample('moicon/03_Jan_22_Demo/8-assets/model.gltf');
     // gltf_sample('moicon/03_Jan_22_Demo/worker_test/model.gltf');
     // gltf_sample('moicon/A4/A4/model.gltf');
-    gltf_sample('moicon/06_04_hapro/08-clickable-assets-new/model.gltf');
+    // gltf_sample('moicon/06_04_hapro/08-clickable-assets-new/model.gltf');
     // gltf_sample('moicon/ztest_object_many_pieces/model.gltf');
     // gltf_grid('moicon/ztest_object_many_pieces/model.gltf', 3, 3);
 

package/engine/graphics/micron/render/v1/MicronRenderContext.js

@@ -5,12 +5,6 @@ import Signal from "../../../../../core/events/signal/Signal.js";
 import { MaterialContext } from "./MaterialContext.js";
 import { MaterialVertexSpec, MaterialVertexSpecFlags } from "./MaterialVertexSpec.js";
 
-/**
- *
- * @type {MaterialVertexSpec}
- */
-const scratch_mvc = new MaterialVertexSpec();
-
 export class MicronRenderContext {
     constructor() {
 

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

@@ -9,7 +9,7 @@ import {
     LinearMipMapLinearFilter,
     NearestFilter,
     RGBAFormat,
-    RGBAIntegerFormat,
+    RGBIntegerFormat,
     UnsignedByteType,
     UnsignedShortType
 } from "three";
@@ -25,7 +25,9 @@ import { read_frustum_planes_to_array } from "./cluster/read_frustum_planes_to_a
 import { compute_cluster_planes_from_points } from "./cluster/compute_cluster_planes_from_points.js";
 import { TextureBackedMemoryRegion } from "./data/TextureBackedMemoryRegion.js";
 import { assert } from "../../../../core/assert.js";
-import { DataType2TypedArrayConstructorMapping } from "../../../../core/collection/table/DataType2TypedArrayConstructorMapping.js";
+import {
+    DataType2TypedArrayConstructorMapping
+} from "../../../../core/collection/table/DataType2TypedArrayConstructorMapping.js";
 import { NumericType } from "./data/NumericType.js";
 import { computeDataType } from "./data/computeDataType.js";
 import { computeThreeTextureTypeFromDataType } from "./data/computeThreeTextureTypeFromDataType.js";
@@ -158,8 +160,8 @@ export class LightManager {
         this.__cluster_texture.minFilter = NearestFilter;
 
         this.__cluster_texture.type = UnsignedShortType;
-        this.__cluster_texture.format = RGBAIntegerFormat;
-        this.__cluster_texture.internalFormat = "RGBA16UI";
+        this.__cluster_texture.format = RGBIntegerFormat;
+        this.__cluster_texture.internalFormat = "RGB16UI";
 
         /**
          *
@@ -347,7 +349,7 @@ export class LightManager {
 
         const texture = this.__cluster_texture;
 
-        const channelCount = 4;
+        const channelCount = 3;
 
         texture.dispose();
 
@@ -826,7 +828,7 @@ export class LightManager {
 
                     const tile_index = slice_offset + (i_y_0 * tr_x) + i_x_0;
 
-                    const tile_address = tile_index * 4;
+                    const tile_address = tile_index * 3;
 
 
                     // construct tile data

package/engine/graphics/render/forward_plus/data/channelCountToThreIntegerTextureType.js

@@ -1,4 +1,4 @@
-import { RedIntegerFormat, RGBAIntegerFormat, RGIntegerFormat } from "three";
+import { RedIntegerFormat, RGBAIntegerFormat, RGBIntegerFormat, RGIntegerFormat } from "three";
 
 export function channelCountToThreIntegerTextureType(channel_count) {
     switch (channel_count) {
@@ -6,10 +6,10 @@ export function channelCountToThreIntegerTextureType(channel_count) {
             return RedIntegerFormat;
         case 2:
             return RGIntegerFormat;
+        case 3:
+            return RGBIntegerFormat;
         case 4:
             return RGBAIntegerFormat;
-        case 3:
-        // see https://github.com/mrdoob/three.js/pull/23228
         default:
             throw new Error(`Unsupported channel count '${channel_count}'`);
     }

package/engine/graphics/texture/channelCountToThreeTextureFormat.js

@@ -1,4 +1,4 @@
-import { RedFormat, RGBAFormat, RGFormat } from "three";
+import { RedFormat, RGBAFormat, RGBFormat, RGFormat } from "three";
 
 /**
  *
@@ -12,7 +12,7 @@ export function channelCountToThreeTextureFormat(count) {
         case 2:
             return RGFormat;
         case 3:
-        // see https://github.com/mrdoob/three.js/pull/23228
+            return RGBFormat;
         case 4:
             return RGBAFormat;
         default:

package/engine/ui/DraggableAspect.js

@@ -12,7 +12,7 @@ export class DraggableAspect {
      *
      * @param {EventTarget} el
      * @param {function} [dragStart=noop]
-     * @param {function} [drag=noop]
+     * @param {(position:Vector2,origin:Vector2)=>*} [drag=noop]
      * @param {function} [dragEnd=noop]
      * @param {boolean} [stopPropagation=true] prevent propagation of pointer events up the DOM tree
      */
@@ -34,6 +34,8 @@ export class DraggableAspect {
         const pointerGlobal = this.pointerGlobal = new PointerDevice(window);
 
         const dragOriginalPosition = new Vector2();
+        const delta = new Vector2();
+        const pointer_position_last = new Vector2();
 
         if (stopPropagation) {
             this.pointerLocal.on.down.add((p, e) => {
@@ -43,6 +45,7 @@ export class DraggableAspect {
 
         this.pointerLocal.on.dragStart.add((position) => {
             dragOriginalPosition.copy(position);
+            pointer_position_last.copy(position);
             pointerGlobal.start();
 
             dragStart(position);

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