@woosh/meep-engine 2.59.1 → 2.59.3

package/build/meep.module.js

@@ -69073,32 +69073,72 @@ const DEFAULT_FLAGS$4 = SGMeshFlags.CastShadow
 ;
 
 class SGMesh {
-    constructor() {
-        /**
-         *
-         * @type {string|null}
-         */
-        this.__url = null;
+    /**
+     * Allows settings a new material to all parts of the mesh
+     * @type {Material|null}
+     */
+    #material_override = null;
 
-        /**
-         *
-         * @type {EntityNode|null}
-         * @private
-         */
-        this.__node = null;
+    /**
+     *
+     * @type {number}
+     */
+    flags = DEFAULT_FLAGS$4;
 
-        /**
-         *
-         * @type {AABB3}
-         * @private
-         */
-        this.__initial_bounds = new AABB3();
+    /**
+     *
+     * @type {string|null}
+     */
+    __url = null;
 
-        /**
-         *
-         * @type {number}
-         */
-        this.flags = DEFAULT_FLAGS$4;
+    /**
+     *
+     * @type {EntityNode|null}
+     * @private
+     */
+    __node = null;
+
+    /**
+     *
+     * @type {AABB3}
+     * @private
+     */
+    __initial_bounds = new AABB3();
+
+    /**
+     *
+     * @param {Material} v
+     */
+    set materialOverride(v) {
+        if (v === this.#material_override) {
+            return;
+        }
+
+        if (v === null) {
+            throw new Error(`Once material override is set it can not be cleared, create a new SGMesh instance if you would like to clear override`);
+        }
+
+        this.#material_override = v;
+
+        this.applyMaterialOverride();
+    }
+
+    get materialOverride() {
+        return this.#material_override;
+    }
+
+    applyMaterialOverride() {
+        if (this.__node === null) {
+            return;
+        }
+
+        this.__node.traverse(node => {
+            const sg = node.entity.getComponent(ShadedGeometry);
+
+            if (sg !== null) {
+                sg.material = this.#material_override;
+            }
+        });
     }
 
     /**
@@ -71980,35 +72020,6 @@ class TerrainSystem extends System {
     }
 }
 
-/**
- *
- * @param {string} url
- * @return {String|null}
- */
-function assetTypeByPath(url) {
-    //get extension
-    const dotPosition = url.lastIndexOf(".");
-    if (dotPosition === -1) {
-        console.warn(`No model extension could be deduced for URL: '${url}'`);
-        //no extension
-        return null;
-    } else {
-        //retrieve extension
-        const ext = url.substring(dotPosition + 1);
-        switch (ext) {
-            case "json":
-                return "three.js";
-            case "glb":
-                return "model/gltf";
-            case "gltf":
-                return "model/gltf+json";
-            default:
-                console.warn(`Unknown 3d mesh format extension: '${ext}'`);
-                return null;
-        }
-    }
-}
-
 /**
  *  Component representing logical attachment to another entity, when parent disappears - so does the child
  */
@@ -75645,80 +75656,6 @@ class EntityNode {
  */
 EntityNode.prototype.isEntityNode = true;
 
-/**
- *
- * @param {Transform} transform
- * @param {THREE.Object3D} three_object
- */
-function copy_three_transform(transform, three_object) {
-
-    // copy object transform
-    transform.position.copy(three_object.position);
-    transform.scale.copy(three_object.scale);
-    transform.rotation.copy(three_object.quaternion);
-
-    //
-    transform.matrix.set(three_object.matrix.elements);
-}
-
-/**
- *
- * @param {THREE.Object3D} root
- * @returns {EntityNode}
- */
-function three_object_to_entity_composition(root) {
-    const node = new EntityNode();
-
-    const node_transform = node.transform;
-
-    // copy object transform
-    copy_three_transform(node_transform, root);
-
-    const entity = node.entity;
-
-    const transform = new Transform();
-    // initialize world transform
-    transform.fromMatrix4(root.matrixWorld.elements);
-
-    entity.add(transform);
-
-    if (root.isMesh) {
-        if (root.isSkinnedMesh) {
-            console.error(`Skinned meshes are not supported`);
-        }
-
-        const sg = ShadedGeometry.from(root.geometry, root.material);
-
-        entity.add(sg);
-    }
-
-    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;
-}
-
-const SGMeshEvents = {
-
-    /**
-     * When asset is attached/loaded onto the Mesh component.
-     * This is the time when the 3d data becomes renderable
-     */
-    AssetLoaded: '@ecd-component-SGMesh/asset-attached',
-    /**
-     * Required asset failed to load for whatever reason
-     */
-    AssetLoadFailed: '@ecd-component-SGMesh/asset-failed',
-};
-
 /**
  * @readonly
  * @type {number}
@@ -75941,6 +75878,109 @@ class TransformAttachmentSystem extends System {
     }
 }
 
+/**
+ *
+ * @param {string} url
+ * @return {String|null}
+ */
+function assetTypeByPath(url) {
+    //get extension
+    const dotPosition = url.lastIndexOf(".");
+    if (dotPosition === -1) {
+        console.warn(`No model extension could be deduced for URL: '${url}'`);
+        //no extension
+        return null;
+    } else {
+        //retrieve extension
+        const ext = url.substring(dotPosition + 1);
+        switch (ext) {
+            case "json":
+                return "three.js";
+            case "glb":
+                return "model/gltf";
+            case "gltf":
+                return "model/gltf+json";
+            default:
+                console.warn(`Unknown 3d mesh format extension: '${ext}'`);
+                return null;
+        }
+    }
+}
+
+/**
+ *
+ * @param {Transform} transform
+ * @param {THREE.Object3D} three_object
+ */
+function copy_three_transform(transform, three_object) {
+
+    // copy object transform
+    transform.position.copy(three_object.position);
+    transform.scale.copy(three_object.scale);
+    transform.rotation.copy(three_object.quaternion);
+
+    //
+    transform.matrix.set(three_object.matrix.elements);
+}
+
+/**
+ *
+ * @param {THREE.Object3D} root
+ * @returns {EntityNode}
+ */
+function three_object_to_entity_composition(root) {
+    const node = new EntityNode();
+
+    const node_transform = node.transform;
+
+    // copy object transform
+    copy_three_transform(node_transform, root);
+
+    const entity = node.entity;
+
+    const transform = new Transform();
+    // initialize world transform
+    transform.fromMatrix4(root.matrixWorld.elements);
+
+    entity.add(transform);
+
+    if (root.isMesh) {
+        if (root.isSkinnedMesh) {
+            console.error(`Skinned meshes are not supported`);
+        }
+
+        const sg = ShadedGeometry.from(root.geometry, root.material);
+
+        entity.add(sg);
+    }
+
+    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;
+}
+
+const SGMeshEvents = {
+
+    /**
+     * When asset is attached/loaded onto the Mesh component.
+     * This is the time when the 3d data becomes renderable
+     */
+    AssetLoaded: '@ecd-component-SGMesh/asset-attached',
+    /**
+     * Required asset failed to load for whatever reason
+     */
+    AssetLoadFailed: '@ecd-component-SGMesh/asset-failed',
+};
+
 /**
  * @readonly
  * @type {number}
@@ -76105,6 +76145,8 @@ class SGMeshSystem extends System {
 
         });
 
+        const material_override = mesh.materialOverride;
+
         // apply flags to the hierarchy
         entity_node.traverse(node => {
             /**
@@ -76118,6 +76160,10 @@ class SGMeshSystem extends System {
 
             sg.writeFlag(ShadedGeometryFlags.CastShadow, mesh.castShadow);
             sg.writeFlag(ShadedGeometryFlags.ReceiveShadow, mesh.receiveShadow);
+
+            if (material_override !== null) {
+                sg.material = material_override;
+            }
         });
 
 

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.59.1",
+  "version": "2.59.3",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/engine/graphics/ecs/mesh-v2/ShadedGeometry.d.ts

@@ -3,8 +3,8 @@ import {AABB3} from "../../../../core/geom/3d/aabb/AABB3";
 import {DrawMode} from "./DrawMode";
 
 export class ShadedGeometry {
-    readonly geometry: BufferGeometry
-    readonly material: Material
+    geometry: BufferGeometry
+    material: Material
     readonly mode: DrawMode
 
     /**

package/src/engine/graphics/ecs/mesh-v2/aggregate/SGMesh.d.ts

@@ -1,3 +1,4 @@
+import {Material} from "three";
 import {AABB3} from "../../../../../core/geom/3d/aabb/AABB3";
 
 export class SGMesh {
@@ -6,6 +7,8 @@ export class SGMesh {
     castShadow: boolean
     receiveShadow: boolean
 
+    materialOverride: Material
+
     getBoundingBox(out: AABB3): boolean
 
     getUntransformedBoundingBox(out: AABB3): void

package/src/engine/graphics/ecs/mesh-v2/aggregate/SGMesh.js

@@ -1,5 +1,6 @@
-import { entity_node_compute_bounding_box } from "../../../../ecs/parent/entity_node_compute_bounding_box.js";
-import { AABB3 } from "../../../../../core/geom/3d/aabb/AABB3.js";
+import {AABB3} from "../../../../../core/geom/3d/aabb/AABB3.js";
+import {entity_node_compute_bounding_box} from "../../../../ecs/parent/entity_node_compute_bounding_box.js";
+import {ShadedGeometry} from "../ShadedGeometry.js";
 
 export const SGMeshFlags = {
     CastShadow: 1,
@@ -16,32 +17,72 @@ const DEFAULT_FLAGS = SGMeshFlags.CastShadow
 ;
 
 export class SGMesh {
-    constructor() {
-        /**
-         *
-         * @type {string|null}
-         */
-        this.__url = null;
-
-        /**
-         *
-         * @type {EntityNode|null}
-         * @private
-         */
-        this.__node = null;
-
-        /**
-         *
-         * @type {AABB3}
-         * @private
-         */
-        this.__initial_bounds = new AABB3();
-
-        /**
-         *
-         * @type {number}
-         */
-        this.flags = DEFAULT_FLAGS;
+    /**
+     * Allows settings a new material to all parts of the mesh
+     * @type {Material|null}
+     */
+    #material_override = null;
+
+    /**
+     *
+     * @type {number}
+     */
+    flags = DEFAULT_FLAGS;
+
+    /**
+     *
+     * @type {string|null}
+     */
+    __url = null;
+
+    /**
+     *
+     * @type {EntityNode|null}
+     * @private
+     */
+    __node = null;
+
+    /**
+     *
+     * @type {AABB3}
+     * @private
+     */
+    __initial_bounds = new AABB3();
+
+    /**
+     *
+     * @param {Material} v
+     */
+    set materialOverride(v) {
+        if (v === this.#material_override) {
+            return;
+        }
+
+        if (v === null) {
+            throw new Error(`Once material override is set it can not be cleared, create a new SGMesh instance if you would like to clear override`);
+        }
+
+        this.#material_override = v;
+
+        this.applyMaterialOverride();
+    }
+
+    get materialOverride() {
+        return this.#material_override;
+    }
+
+    applyMaterialOverride() {
+        if (this.__node === null) {
+            return;
+        }
+
+        this.__node.traverse(node => {
+            const sg = node.entity.getComponent(ShadedGeometry);
+
+            if (sg !== null) {
+                sg.material = this.#material_override;
+            }
+        });
     }
 
     /**

package/src/engine/graphics/ecs/mesh-v2/aggregate/SGMeshSystem.js

@@ -1,18 +1,18 @@
-import { System } from "../../../../ecs/System.js";
-import { SGMesh } from "./SGMesh.js";
-import { Transform } from "../../../../ecs/transform/Transform.js";
-import { assetTypeByPath } from "../../mesh/assetTypeByPath.js";
-import { three_object_to_entity_composition } from "../three_object_to_entity_composition.js";
-import { ShadedGeometry } from "../ShadedGeometry.js";
-import { ShadedGeometryFlags } from "../ShadedGeometryFlags.js";
-import { SGMeshEvents } from "./SGMeshEvents.js";
-import { ParentEntity } from "../../../../ecs/parent/ParentEntity.js";
-import { EntityNode } from "../../../../ecs/parent/EntityNode.js";
-import { min2 } from "../../../../../core/math/min2.js";
-import { TransformAttachmentSystem } from "../../../../ecs/transform-attachment/TransformAttachmentSystem.js";
-import { ResourceAccessSpecification } from "../../../../../core/model/ResourceAccessSpecification.js";
-import { ResourceAccessKind } from "../../../../../core/model/ResourceAccessKind.js";
-import { TransformAttachment } from "../../../../ecs/transform-attachment/TransformAttachment.js";
+import {min2} from "../../../../../core/math/min2.js";
+import {ResourceAccessKind} from "../../../../../core/model/ResourceAccessKind.js";
+import {ResourceAccessSpecification} from "../../../../../core/model/ResourceAccessSpecification.js";
+import {EntityNode} from "../../../../ecs/parent/EntityNode.js";
+import {ParentEntity} from "../../../../ecs/parent/ParentEntity.js";
+import {System} from "../../../../ecs/System.js";
+import {TransformAttachment} from "../../../../ecs/transform-attachment/TransformAttachment.js";
+import {TransformAttachmentSystem} from "../../../../ecs/transform-attachment/TransformAttachmentSystem.js";
+import {Transform} from "../../../../ecs/transform/Transform.js";
+import {assetTypeByPath} from "../../mesh/assetTypeByPath.js";
+import {ShadedGeometry} from "../ShadedGeometry.js";
+import {ShadedGeometryFlags} from "../ShadedGeometryFlags.js";
+import {three_object_to_entity_composition} from "../three_object_to_entity_composition.js";
+import {SGMesh} from "./SGMesh.js";
+import {SGMeshEvents} from "./SGMeshEvents.js";
 
 
 /**
@@ -179,6 +179,8 @@ export class SGMeshSystem extends System {
 
         });
 
+        const material_override = mesh.materialOverride;
+
         // apply flags to the hierarchy
         entity_node.traverse(node => {
             /**
@@ -192,6 +194,10 @@ export class SGMeshSystem extends System {
 
             sg.writeFlag(ShadedGeometryFlags.CastShadow, mesh.castShadow);
             sg.writeFlag(ShadedGeometryFlags.ReceiveShadow, mesh.receiveShadow);
+
+            if (material_override !== null) {
+                sg.material = material_override;
+            }
         });