@woosh/meep-engine 2.36.18 → 2.36.21

package/engine/ecs/components/Renderable.js

@@ -28,6 +28,9 @@ const scratch_corners = [
     new ThreeVector3()
 ];
 
+/**
+ @deprecated use {@link ShadedGeometry} instead
+ */
 class Renderable {
     constructor(object) {
         this.object = object;

package/engine/ecs/systems/RenderSystem.js

@@ -1,14 +1,14 @@
 /**
  * Created by Alex on 01/04/2014.
  */
-import {System} from '../System.js';
+import { System } from '../System.js';
 import Renderable from '../components/Renderable.js';
-import {Transform} from '../transform/Transform.js';
-import {SignalBinding} from "../../../core/events/signal/SignalBinding.js";
-import {Box3} from "three";
-import {RenderableFlags} from "../components/RenderableFlags.js";
-import {rootObject3DFastMatrixUpdate} from "../../graphics/ecs/mesh/rootObject3DFastMatrixUpdate.js";
-import {updateNodeByTransformAndBBB} from "../../graphics/ecs/mesh/updateNodeByTransformAndBBB.js";
+import { Transform } from '../transform/Transform.js';
+import { SignalBinding } from "../../../core/events/signal/SignalBinding.js";
+import { Box3 } from "three";
+import { RenderableFlags } from "../components/RenderableFlags.js";
+import { rootObject3DFastMatrixUpdate } from "../../graphics/ecs/mesh/rootObject3DFastMatrixUpdate.js";
+import { updateNodeByTransformAndBBB } from "../../graphics/ecs/mesh/updateNodeByTransformAndBBB.js";
 
 
 /**
@@ -43,6 +43,9 @@ export function three_computeObjectBoundingBox(object, result) {
 
 }
 
+/**
+ * @deprecated use {@link ShadedGeometry} instead
+ */
 class RenderSystem extends System {
     /**
      *

package/engine/graphics/ecs/highlight/renderer/OutlineRenderer.js

@@ -35,18 +35,49 @@ void main(){
 }
 `;
 
+const material_id_vertex_shader_skinned = `
+#include <common>
+#include <uv_pars_vertex>
+#include <displacementmap_pars_vertex>
+#include <morphtarget_pars_vertex>
+#include <skinning_pars_vertex>
+#include <logdepthbuf_pars_vertex>
+#include <clipping_planes_pars_vertex>
+
+void main()
+{
+    #include <uv_vertex>
+    #include <skinbase_vertex>
+    #ifdef USE_DISPLACEMENTMAP
+        #include <beginnormal_vertex>
+        #include <morphnormal_vertex>
+        #include <skinnormal_vertex>
+    #endif
+    #include <begin_vertex>
+    #include <morphtarget_vertex>
+    #include <skinning_vertex>
+    #include <displacementmap_vertex>
+    #include <project_vertex>
+    #include <logdepthbuf_vertex>
+    #include <clipping_planes_vertex>
+}
+`;
+
+
+const material_id_vertex_shader_static = `
+void main()
+{
+    vec4 mvPosition = modelViewMatrix * vec4( position, 1.0 );
+    gl_Position = projectionMatrix * mvPosition;
+}
+`;
+
 function makeIdMaterialStatic() {
     return new ShaderMaterial({
         uniforms: {
             id: { value: 0 }
         },
-        vertexShader: `
-    void main()
-    {
-        vec4 mvPosition = modelViewMatrix * vec4( position, 1.0 );
-        gl_Position = projectionMatrix * mvPosition;
-    }
-`,
+        vertexShader: material_id_vertex_shader_static,
         fragmentShader: material_id_fragment_shader
     });
 }
@@ -59,33 +90,7 @@ function makeIdMaterialSkinned() {
         uniforms: {
             id: { value: 0 }
         },
-        vertexShader: `
-    #include <common>
-    #include <uv_pars_vertex>
-    #include <displacementmap_pars_vertex>
-    #include <morphtarget_pars_vertex>
-    #include <skinning_pars_vertex>
-    #include <logdepthbuf_pars_vertex>
-    #include <clipping_planes_pars_vertex>
-
-    void main()
-    {
-        #include <uv_vertex>
-        #include <skinbase_vertex>
-        #ifdef USE_DISPLACEMENTMAP
-            #include <beginnormal_vertex>
-            #include <morphnormal_vertex>
-            #include <skinnormal_vertex>
-        #endif
-        #include <begin_vertex>
-        #include <morphtarget_vertex>
-        #include <skinning_vertex>
-        #include <displacementmap_vertex>
-        #include <project_vertex>
-        #include <logdepthbuf_vertex>
-        #include <clipping_planes_vertex>
-    }
-`,
+        vertexShader: material_id_vertex_shader_skinned,
         fragmentShader: material_id_fragment_shader
     });
 }

package/engine/graphics/ecs/highlight/system/ShadedGeometryHighlightSystem.js

@@ -3,7 +3,7 @@ import { HighlightRenderElementSource } from "../plugin/HighlightRenderElementSo
 import Highlight from "../Highlight.js";
 import { OutlineRenderPlugin } from "../plugin/OutlineRenderPlugin.js";
 import { ShadedGeometry } from "../../mesh-v2/ShadedGeometry.js";
-import { build_three_object } from "../../mesh-v2/build_three_object.js";
+import { SGThreeObjectCache } from "../../mesh-v2/render/SGThreeObjectCache.js";
 
 class Supplier extends HighlightRenderElementSource {
     /**
@@ -35,10 +35,10 @@ class Supplier extends HighlightRenderElementSource {
 
         /**
          *
-         * @type {WeakMap<ShadedGeometry, THREE.Object3D>}
+         * @type {SGThreeObjectCache}
          * @private
          */
-        this.__object_cache = new WeakMap();
+        this.__object_cache = SGThreeObjectCache.INSTANCE;
     }
 
     collect(pool, group) {
@@ -85,11 +85,7 @@ class Supplier extends HighlightRenderElementSource {
             return;
         }
 
-        let object = this.__object_cache.get(sg);
-
-        if(object === undefined){
-            object = build_three_object(sg);
-        }
+        const object = this.__object_cache.get(sg);
 
         object.matrixWorld.elements = sg.transform;
 

package/engine/graphics/ecs/mesh-v2/render/SGThreeObjectCache.js

@@ -0,0 +1,38 @@
+import { build_three_object } from "../build_three_object.js";
+
+export class SGThreeObjectCache {
+    constructor() {
+        /**
+         *
+         * @type {WeakMap<ShadedGeometry, THREE.Object3D>}
+         * @private
+         */
+        this.__object_cache = new WeakMap();
+    }
+
+    /**
+     *
+     * @param {ShadedGeometry} sg
+     * @returns {THREE.Object3D}
+     */
+    get(sg) {
+
+        const existing_object = this.__object_cache.get(sg);
+
+        if (existing_object !== undefined) {
+            return existing_object;
+        }
+
+        const new_object = build_three_object(sg);
+
+        this.__object_cache.set(sg, new_object);
+
+        return new_object;
+    }
+}
+
+/**
+ * @readonly
+ * @type {SGThreeObjectCache}
+ */
+SGThreeObjectCache.INSTANCE = new SGThreeObjectCache();

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

@@ -1,6 +1,6 @@
 import { AbstractRenderAdapter } from "./AbstractRenderAdapter.js";
 import { array_copy } from "../../../../../../core/collection/array/copyArray.js";
-import { build_three_object } from "../../build_three_object.js";
+import { SGThreeObjectCache } from "../SGThreeObjectCache.js";
 
 export class GenericRendererAdapter extends AbstractRenderAdapter {
     constructor() {
@@ -8,10 +8,10 @@ export class GenericRendererAdapter extends AbstractRenderAdapter {
 
         /**
          *
-         * @type {Cache<ShadedGeometry, THREE.Object3D>}
+         * @type {SGThreeObjectCache}
          * @private
          */
-        this.__cache = new WeakMap();
+        this.__cache = SGThreeObjectCache.INSTANCE;
     }
 
 
@@ -29,21 +29,11 @@ export class GenericRendererAdapter extends AbstractRenderAdapter {
     }
 
     add(sg) {
-        const cache = this.__cache;
-
         /**
          *
          * @type {THREE.Object3D}
          */
-        let object = cache.get(sg);
-
-        if (object === undefined) {
-
-            object = build_three_object(sg);
-
-            cache.set(sg, object);
-
-        }
+        const object = this.__cache.get(sg);
 
         array_copy(sg.__transform, 0, object.matrixWorld.elements, 0, 16);
 

package/engine/graphics/micron/plugin/GLTFAssetTransformer.js

@@ -8,7 +8,9 @@ import { convert_three_object_to_micron } from "../convert_three_object_to_micro
 import { compute_geometry_polycount } from "../../geometry/compute_geometry_polycount.js";
 import { traverseThreeObject } from "../../ecs/highlight/renderer/traverseThreeObject.js";
 import { max2 } from "../../../../core/math/max2.js";
-import { deserialize_geometry_collection } from "../format/serialization/collection/geometry_collection_serialization.js";
+import {
+    deserialize_geometry_collection
+} from "../format/serialization/collection/geometry_collection_serialization.js";
 import { GLTF_MICRON_ID_FIELD } from "./GLTF_MICRON_ID_FIELD.js";
 
 export const ASSET_TYPE_ARRAY_BUFFER = "arraybuffer";
@@ -196,18 +198,21 @@ export class GLTFAssetTransformer extends AssetTransformer {
          */
         const root = source.create();
 
-        const gltf_max_polycount = max_polycount(root);
 
-        if (gltf_max_polycount < this.__threshold_polycount) {
-            // no change, geometries are too small
-            return source;
-        }
+        await this.__load_mesh_micron_data(source.gltf,asset_description);
 
         // attempt to load existing micron geometries
         await async_traverse_three_object(root, this.__visitObjectToLoadMicron, this, {
             asset: asset_description
         });
 
+        const gltf_max_polycount = max_polycount(root);
+
+        if (gltf_max_polycount < this.__threshold_polycount) {
+            // no change, geometries are too small
+            return source;
+        }
+
         const micron_root = await convert_three_object_to_micron(root.clone(), this.__cache);
         micron_root.boundingSphere = root.boundingSphere;
 

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