@woosh/meep-engine 2.47.23 → 2.47.27

package/editor/tools/SelectionTool.js

@@ -19,6 +19,7 @@ import Terrain from "../../src/engine/ecs/terrain/ecs/Terrain.js";
 import { SurfacePoint3 } from "../../src/core/geom/3d/SurfacePoint3.js";
 import { makeScreenScissorFrustum } from "../../src/engine/graphics/camera/makeScreenScissorFrustum.js";
 import { ShadedGeometrySystem } from "../../src/engine/graphics/ecs/mesh-v2/ShadedGeometrySystem.js";
+import { make_ray_from_viewport_position } from "../../src/engine/graphics/make_ray_from_viewport_position.js";
 
 class SelectionView extends View {
     constructor() {
@@ -224,20 +225,19 @@ export function pickingEntitySelection(point, engine, camera) {
     const em = engine.entityManager;
     const dataset = em.dataset;
 
-    const graphicsEngine = engine.graphics;
-
-    const source = new Vector3(0, 0, 0);
-    const rayDirection = new Vector3(0, 0, 0);
-
-    const normalizedPoint = new Vector2(0, 0);
-
-    graphicsEngine.normalizeViewportPoint(point, normalizedPoint);
+    // push source by a small amount along the way to prevent selection of elements directly on the NEAR plane
+    const ray_offset = 0.0001;
 
-    graphicsEngine.viewportProjectionRay(normalizedPoint.x, normalizedPoint.y, source, rayDirection);
+    const ray = make_ray_from_viewport_position(engine,point);
 
-    // push source by a small amount along the way to prevent selection of elements directly on the NEAR plane
-    source.add(rayDirection.clone().multiplyScalar(0.0001));
+    const ray_origin = ray.origin;
+    const ray_direction = ray.direction;
 
+    ray_origin._add(
+        ray_direction.x * ray_offset,
+        ray_direction.y * ray_offset,
+        ray_direction.z * ray_offset,
+    )
 
     let bestCandidate = null;
     let bestDistance = Infinity;
@@ -249,7 +249,7 @@ export function pickingEntitySelection(point, engine, camera) {
      * @param {Vector3} contact
      */
     function tryAddEntity(entity, contact) {
-        const distance = source.distanceSqrTo(contact);
+        const distance = ray.origin.distanceSqrTo(contact);
 
         if (distance < bestDistance) {
             bestDistance = distance;
@@ -272,8 +272,8 @@ export function pickingEntitySelection(point, engine, camera) {
 
     if (sgm !== undefined && sgm !== null) {
         const hits = sgm.raycast(
-            source.x, source.y, source.y,
-            rayDirection.x, rayDirection.y, rayDirection.z
+            ray_origin.x, ray_origin.y, ray_origin.y,
+            ray_direction.x, ray_direction.y, ray_direction.z
         );
 
         for (let i = 0; i < hits.length; i++) {
@@ -291,7 +291,7 @@ export function pickingEntitySelection(point, engine, camera) {
          */
         const bvh = layer.bvh;
 
-        bvh.traverseRayLeafIntersections(source.x, source.y, source.z, rayDirection.x, rayDirection.y, rayDirection.z, function (leaf) {
+        bvh.traverseRayLeafIntersections(ray_origin.x, ray_origin.y, ray_origin.z, ray_direction.x, ray_direction.y, ray_direction.z, function (leaf) {
             const entity = findEntityOfNode(leaf);
 
             if (typeof entity !== "number") {
@@ -308,7 +308,7 @@ export function pickingEntitySelection(point, engine, camera) {
                 && typeof object.raycast === "function"
             ) {
                 //found a "raycast" function on the value object held by the leaf, assuming this is THREE.js raycast function
-                const raycaster = new Raycaster(source, rayDirection, 0, Infinity);
+                const raycaster = new Raycaster(ray_origin, ray_direction, 0, Infinity);
 
                 // WORKAROUND FOR https://github.com/mrdoob/three.js/issues/17078
                 raycaster.camera = camera;
@@ -333,7 +333,7 @@ export function pickingEntitySelection(point, engine, camera) {
                 if (terrain !== undefined) {
                     const sp = new SurfacePoint3();
 
-                    terrain.raycastFirstSync(sp, source.x, source.y, source.z, rayDirection.x, rayDirection.y, rayDirection.z);
+                    terrain.raycastFirstSync(sp, ray_origin.x, ray_origin.y, ray_origin.z, ray_direction.x, ray_direction.y, ray_direction.z);
 
                     tryAddEntity(entity, sp.position);
                     return;

package/editor/view/EditorView.js

@@ -33,6 +33,7 @@ import { ProcessState } from "../../src/core/process/ProcessState.js";
 import { MeshEvents } from "../../src/engine/graphics/ecs/mesh/MeshEvents.js";
 import { obtainTerrain } from "../../src/engine/ecs/terrain/util/obtainTerrain.js";
 import { SurfacePoint3 } from "../../src/core/geom/3d/SurfacePoint3.js";
+import { make_ray_from_viewport_position } from "../../src/engine/graphics/make_ray_from_viewport_position.js";
 
 class ViewManager extends View {
     constructor() {
@@ -178,13 +179,11 @@ function prepareMeshLibrary(editor) {
         const normalizedPosition = new Vector2();
 
         //compute world position for drop
+        const ray = make_ray_from_viewport_position(engine, position);
 
-        graphics.normalizeViewportPoint(position, normalizedPosition);
+        const source = ray.origin;
+        const direction = ray.direction;
 
-        const source = new Vector3();
-        const direction = new Vector3();
-
-        graphics.viewportProjectionRay(normalizedPosition.x, normalizedPosition.y, source, direction);
 
         const entityManager = engine.entityManager;
         const ecd = entityManager.dataset;

package/editor/view/ecs/EntityList.js

@@ -233,7 +233,6 @@ class EntityListView extends View {
 
         dataset.onEntityCreated.add(handlers.addOne);
         dataset.onEntityRemoved.add(handlers.removeOne);
-        entityManager.on.reset.add(handlers.reset);
 
     }
 
@@ -250,7 +249,6 @@ class EntityListView extends View {
 
         dataset.onEntityCreated.remove(handlers.addOne);
         dataset.onEntityRemoved.remove(handlers.removeOne);
-        entityManager.on.reset.remove(handlers.reset);
     }
 }
 

package/package.json

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

package/src/core/geom/3d/topology/samples/sampleFloodFill.js

@@ -3,7 +3,6 @@ import { MeshBasicMaterial, MeshStandardMaterial, OctahedronBufferGeometry } fro
 import EntityBuilder from "../../../../../engine/ecs/EntityBuilder.js";
 import { ShadedGeometry } from "../../../../../engine/graphics/ecs/mesh-v2/ShadedGeometry.js";
 import { Transform } from "../../../../../engine/ecs/transform/Transform.js";
-import Vector3 from "../../../Vector3.js";
 import { ShadedGeometrySystem } from "../../../../../engine/graphics/ecs/mesh-v2/ShadedGeometrySystem.js";
 import { SurfacePoint3 } from "../../SurfacePoint3.js";
 import { topo_mesh_to_three_buffer_geometry } from "../topo_mesh_to_three_buffer_geometry.js";
@@ -27,6 +26,7 @@ import { expandConnectivityByLocality } from "../expandConnectivityByLocality.js
 import { buildCubeURLs } from "../../../../../engine/graphics/texture/cubemap/buildCubeURLs.js";
 import { EntityNode } from "../../../../../engine/ecs/parent/EntityNode.js";
 import { TransformAttachmentSystem } from "../../../../../engine/ecs/transform-attachment/TransformAttachmentSystem.js";
+import { make_ray_from_viewport_position } from "../../../../../engine/graphics/make_ray_from_viewport_position.js";
 
 const harness = new EngineHarness();
 
@@ -71,7 +71,7 @@ function set_highlight({
 
     entity.addChild(EntityNode.fromComponents(
         new Transform(),
-        ShadedGeometry.from(selected_geo,new MeshBasicMaterial({
+        ShadedGeometry.from(selected_geo, new MeshBasicMaterial({
             wireframe: true,
             transparent: true,
             opacity: 0.7,
@@ -129,12 +129,12 @@ async function main(engine) {
 
             n.entity.removeComponent(ShadedGeometry);
 
-            let hue =0;
+            let hue = 0;
 
             do {
                 hue = random();
 
-            }while(Math.abs(hue -  0.53855555555) < 0.11); // shift away from hue of selection mask
+            } while (Math.abs(hue - 0.53855555555) < 0.11); // shift away from hue of selection mask
 
             sg.material = new MeshStandardMaterial({
                 color: Color.fromHSV(hue, 0.9, 0.9).toHex()
@@ -188,11 +188,11 @@ async function main(engine) {
 
             const contact = new SurfacePoint3();
 
-            const ray_origin = new Vector3();
-            const ray_direction = new Vector3();
+            const ray = make_ray_from_viewport_position(engine, position);
+
+            const ray_origin = ray.origin;
+            const ray_direction = ray.direction;
 
-            engine.graphics.normalizeViewportPoint(position, position);
-            engine.graphics.viewportProjectionRay(position.x, position.y, ray_origin, ray_direction);
 
             highlight.destroy();
 

package/src/core/json/abstractJSONSerializer.js

@@ -19,7 +19,7 @@ export function abstractJSONSerializer(source, serializers, classNames, construc
     const Klass = source.constructor;
     let typeName = classNames.get(Klass);
 
-    if (typeName === undefined) {
+    if (typeName === undefined && Klass.hasOwnProperty("typeName")) {
         // try fallback to "typeName" field on constructor
         typeName = Klass.typeName;
     }

package/src/engine/ecs/EntityComponentDataset.js

@@ -1065,10 +1065,35 @@ export class EntityComponentDataset {
     }
 
     /**
-     *
+     * same as getComponent when component exists, if component is not associated with the entity, callback will be invoked once when it is added.
+     * @param {Number} entityId
+     * @param {Class} componentClass
+     * @param {function} callback
+     * @param {*} [thisArg]
+     */
+    getComponentAsync (entityId, componentClass, callback, thisArg) {
+        const component = this.getComponent(entityId, componentClass);
+
+        const handler = (options) => {
+            if (options.klass === componentClass) {
+                this.removeEntityEventListener(entityId, EventType.ComponentAdded, handler);
+                callback.call(thisArg, options.instance);
+            }
+        }
+
+        if (component === undefined) {
+            this.addEntityEventListener(entityId, EventType.ComponentAdded, handler);
+        } else {
+            callback.call(thisArg, component);
+        }
+    };
+
+    /**
+     * Performs traversal on a subset of entities which have specified components.
+     * @example traverseEntities([Transform,Renderable,Tag],function(transform, renderable, tag, entity){ ... }, this);
      * @param {Array} classes
      * @param {function:boolean?} visitor Visitor can return optional "false" to terminate traversal earlier
-     * @param {object} [thisArg]
+     * @param {object} [thisArg] specifies context object on which callbacks are to be called, optional
      */
     traverseEntities(classes, visitor, thisArg) {
 
@@ -1144,7 +1169,7 @@ export class EntityComponentDataset {
     }
 
     /**
-     * does traversal on a subset of entities which have only the specified components and no others
+     * Performs traversal on a subset of entities which have only the specified components and no others
      * @example traverseEntitiesExact([Transform,Renderable,Tag],function(transform, renderable, tag, entity){ ... }, this);
      * @param {Array.<class>} classes
      * @param {Function} visitor