@needle-tools/engine 2.36.0-pre → 2.37.0-pre

package/src/engine-components/Component.ts

@@ -6,7 +6,7 @@ import { Context, FrameEvent } from "../engine/engine_setup";
 import * as main from "../engine/engine_mainloop_utils";
 import { Object3D } from "three";
 import { syncDestroy, syncInstantiate } from "../engine/engine_networking_instantiate";
-import { ConstructorConcrete, SourceIdentifier, IComponent, IGameObject, Constructor, GuidsMap, UIDProvider, Collision } from "../engine/engine_types";
+import { ConstructorConcrete, SourceIdentifier, IComponent, IGameObject, Constructor, GuidsMap, UIDProvider, Collision, ICollider } from "../engine/engine_types";
 import { addNewComponentInstance, destroyComponentInstance, findObjectOfType, findObjectsOfType, getComponent, getComponentInChildren, getComponentInParent, getComponents, getComponentsInChildren, getComponentsInParent, getOrAddComponent, moveComponentInstance, removeComponent } from "../engine/engine_components";
 import { findByGuid, destroy, InstantiateOptions, instantiate, HideFlags, foreachComponent, markAsInstancedRendered, isActiveInHierarchy, isActiveSelf, isUsingInstancing, setActive } from "../engine/engine_gameobject";
 
@@ -317,9 +317,8 @@ class Component implements IComponent, EventTarget {
     onDestroy() {
         this.__destroyed = true;
     }
+    onValidate?(prop?: string): void;
     start?(): void;
-    // available update loop events:
-    // earlyUpdate, update, lateUpdate, onBeforeRender, onAfterRender
     earlyUpdate?(): void;
     update?(): void;
     lateUpdate?(): void;
@@ -328,12 +327,11 @@ class Component implements IComponent, EventTarget {
 
     onCollisionEnter?(col: Collision);
     onCollisionExit?(col: Collision);
-    onCollisionExitRaw?(col: Collision);
     onCollisionStay?(col: Collision);
-
-    onTriggerEnter?(col: Collision);
-    onTriggerStay?(col: Collision);
-    onTriggerExit?(col: Collision);
+    
+    onTriggerEnter?(col: ICollider);
+    onTriggerStay?(col: ICollider);
+    onTriggerExit?(col: ICollider);
 
     startCoroutine(routine: Generator, evt: FrameEvent = FrameEvent.Update): Generator {
         return this.context.registerCoroutineUpdate(this, routine, evt);
@@ -360,13 +358,19 @@ class Component implements IComponent, EventTarget {
 
     get __internalDidAwakeAndStart() { return this.__didAwake && this.__didStart; }
 
+
+    constructor() {
+        // super();
+        this.__internalNewInstanceCreated();
+    }
+
     __internalNewInstanceCreated() {
         this.__didAwake = false;
         this.__didStart = false;
         this.__didEnable = false;
         this.__isEnabled = undefined;
         this.__destroyed = false;
-        this.__internalResetsCachedPhysicsData();
+        // this.__internalResetsCachedPhysicsData();
     }
 
     __internalAwake() {
@@ -397,9 +401,9 @@ class Component implements IComponent, EventTarget {
     __internalDisable() {
         if (!this.__didEnable) return;
         this.__didEnable = false;
-        this._collisionExitRoutine = undefined;
+        // this._collisionExitRoutine = undefined;
         this.onDisable();
-        this._collisions?.clear();
+        // this._collisions?.clear();
         // if we do this after processing the callback
         this.__isEnabled = false;
     }
@@ -437,126 +441,7 @@ class Component implements IComponent, EventTarget {
         }
     }
 
-    constructor() {
-        // super();
-        this.__internalNewInstanceCreated();
-    }
-
-    private _collisionExitRoutine: any;
-    private _collisions: Map<Object3D, { col: Collision, frame: number, exitFrame?: number }> | null = null;
-
-    private _triggerExitRoutine: any;
-    private _triggerCollisions: Map<Object3D, { col: Collision, frame: number, exitFrame?: number }> | null = null;
-
-    get collisionsCount() { return this._collisions?.size ?? 0; }
-
-    private __internalResetsCachedPhysicsData() {
-        this._collisionExitRoutine = null;
-        this._collisions = null;
-        this._triggerExitRoutine = null;
-        this._triggerCollisions = null;
-    }
-
-    __internalHandleCollision(col: Collision, isTriggerCollision: boolean) {
-        if (isTriggerCollision) {
-            if (!this.onTriggerEnter && !this.onTriggerStay && !this.onTriggerExit) return;
-        }
-        else {
-            if (!this.onCollisionEnter && !this.onCollisionStay && !this.onCollisionExit) return;
-        }
-
-        const otherObject = col.gameObject;
-
-        // lazily create the maps
-        if (isTriggerCollision && !this._triggerCollisions) this._triggerCollisions = new Map();
-        else if (!this._collisions) this._collisions = new Map();
-
-        // select the correct map
-        const collection = isTriggerCollision ? this._triggerCollisions! : this._collisions!;
-
-        if (collection.has(otherObject)) {
-            const cur = collection.get(otherObject)!;
-            // console.log("STAY", this.name, this.context.time.frameCount)
-            // cur.exitFrame = undefined;
-            cur.frame = this.context.time.frameCount;
-            cur.col = col;
-            if (isTriggerCollision)
-                this.onTriggerStay?.(col);
-            else
-                this.onCollisionStay?.call(this, col);
-        }
-        else {
-            // console.log("START", this.name);
-            const entry = { col, frame: this.context.time.frameCount };
-            collection.set(otherObject, entry);
-            if (isTriggerCollision)
-                this.onTriggerEnter?.(col);
-            else
-                this.onCollisionEnter?.call(this, col);
-        }
-    }
-
-    __internalHandleExitCollisionEvent(obj: Object3D, isTriggerCollision: boolean) {
-        if (isTriggerCollision) {
-            if (!this._triggerCollisions) return;
-        }
-        else {
-            if (!this._collisions) return;
-        }
-
-        const collection = isTriggerCollision ? this._triggerCollisions! : this._collisions!;
-
-        const collision = collection.get(obj);
-        if (!collision) return;
-        collision.exitFrame = this.context.time.frameCount;
-        // console.log("EXIT col", this.name, this.context.time.frameCount);
-        // if (this.onCollisionExit !== undefined)
-        this.__waitForCollisionExit(isTriggerCollision);
-        if (!isTriggerCollision)
-            this.onCollisionExitRaw?.call(this, collision.col);
-        // this._collisions.delete(obj);
-    }
-
-    private __waitForCollisionExit(isTriggerCollision: boolean) {
-        const routine = isTriggerCollision ? this._triggerExitRoutine : this._collisionExitRoutine;
-        if (routine) return;
-
-        const collection = isTriggerCollision ? this._triggerCollisions! : this._collisions!;
-        const self = this;
-        const frames = 10;
-        function* delayedExitRoutine() {
-            while (collection && collection.size > 0) {
-                for (let other of collection.keys()) {
-                    const entry = collection!.get(other)!;
-                    if (entry.frame !== undefined && self.context.time.frameCount - entry.frame >= frames) {
-                        // console.log("EXIT real", self.name, entry.col.gameObject.name, collection);
-                        collection!.delete(other);
-                        if (isTriggerCollision)
-                            self.onTriggerExit?.(entry.col);
-                        else
-                            self.onCollisionExit?.call(self, entry.col);
-                    }
-                }
-                for (let i = 0; i < frames; i++)
-                    yield;
-            }
-            if (isTriggerCollision)
-                self._triggerExitRoutine = undefined;
-            else
-                self._collisionExitRoutine = null;
-            // console.log("DONE", self.name);
-        }
-
-        const newRoutine = this.startCoroutine(delayedExitRoutine(), FrameEvent.OnAfterRender);
-        if (isTriggerCollision)
-            this._triggerExitRoutine = newRoutine;
-        else
-            this._collisionExitRoutine = newRoutine
-    }
-
-
     // TODO move this to threeutils
-
     // we need a copy for modifying the values to local space
     private static _worldPositionBuffer: THREE.Vector3 = new THREE.Vector3();
     private static _worldQuaternionBuffer: THREE.Quaternion = new THREE.Quaternion();

package/src/engine-components/DragControls.ts

@@ -230,7 +230,7 @@ export class DragControls extends Interactable implements IPointerDownHandler, I
         this._dragHelper.onUpdate(this.context);
         for (const rb of this._draggingRigidbodies) {
             rb.wakeUp();
-            rb.setBodyFromGameObject();
+            rb.resetVelocities();
         }
     }
 
@@ -238,6 +238,9 @@ export class DragControls extends Interactable implements IPointerDownHandler, I
         if (!this || !this._isDragging) return;
         this._isDragging = false;
         if (!this._dragHelper) return;
+        for(const rb of this._draggingRigidbodies){
+            rb.setVelocity(rb.smoothedVelocity);
+        }
         this._draggingRigidbodies.length = 0;
         const selected = this._dragHelper.selected;
         if (debug)
@@ -323,8 +326,8 @@ class DragHelper {
         if (this._selected && context) {
             for (const rb of this._rbs) {
                 rb.wakeUp();
-                if (!rb.smoothedVelocity) continue;
-                rb.setVelocity(rb.smoothedVelocity.x, rb.smoothedVelocity.y, rb.smoothedVelocity.z);
+                // if (!rb.smoothedVelocity) continue;
+                rb.setVelocity(0,0,0);
             }
         }
 
@@ -358,7 +361,7 @@ class DragHelper {
             this._groundOffset.set(0, 0, 0);
             this._requireUpdateGroundPlane = true;
 
-            this._rbs = GameObject.getComponentsInChildren(this._selected, Rigidbody);
+            // this._rbs = GameObject.getComponentsInChildren(this._selected, Rigidbody);
             this.onUpdateScreenSpacePlane();
         }
     }
@@ -518,7 +521,8 @@ class DragHelper {
 
         for (const rb of this._rbs) {
             rb.wakeUp();
-            rb.setBodyFromGameObject({ x: 0, y: 0, z: 0 });
+            rb.resetForcesAndTorques();
+            // rb.setBodyFromGameObject({ x: 0, y: 0, z: 0 });
             rb.setAngularVelocity(0, 0, 0);
         }
     }

package/src/engine-components/NavMesh.ts

@@ -1,118 +1,117 @@
 
-import { Behaviour, GameObject } from "./Component";
-/*
-import { Pathfinding, PathfindingHelper } from 'three-pathfinding';
-import * as THREE from 'three';
-import { mergeBufferGeometries } from 'three/examples/jsm/utils/BufferGeometryUtils'
-*/
-export class NavMesh extends Behaviour {
-/*
-    public meshes: THREE.Object3D[] = [];
-
-    private pathfinding: Pathfinding | null = null;
-    private zones: string[] = [];
-
-    onEnable(): void {
-
-        this.pathfinding = new Pathfinding();
-        const ZONE = 'zone';
-        const geometries : THREE.BufferGeometry[] = [];
-        if (this.meshes && this.meshes.length > 0) {
-            for (let i = 0; i < this.meshes.length; i++) {
-                const obj = this.meshes[i] as THREE.Mesh;
-                if (!obj) continue;
-                const geo = obj.geometry;
-                if (!geo) continue;
-                const copy : THREE.BufferGeometry = {...geo};
-                // const copy = geo;
-                const attributesCopy = {...copy.attributes};
-                copy.attributes = attributesCopy;
-                if(attributesCopy.uv2) delete attributesCopy.uv2;
-                // copy.applyMatrix4(obj.matrixWorld);
-                geometries.push(copy);
-                // obj.updateMatrixWorld();
-                // singleGeometry.merge(geo);
-                // console.log(singleGeometry, geo);
-            }
-        }
-        const mesh = mergeBufferGeometries(geometries);
-        const zone = Pathfinding.createZone(mesh);
-        const name = ZONE;
-        this.zones.push(name);
-        this.pathfinding.setZoneData(name, zone);
-
-        // const target = new THREE.Vector3(2, 0, 2);
-        // const groupID = this.pathfinding.getGroup(ZONE, target);
-        // const path = this.pathfinding.findPath(this.worldPosition, target, ZONE, groupID);
-        // console.log(path, this.pathfinding);
-    }
-
-    public tryFindPath(from: THREE.Vector3, to: THREE.Vector3): THREE.Vector3[] | null {
-        const zone = this.zones[0];
-        const groupId = this.pathfinding.getGroup(zone, to);
-        const path = this.pathfinding.findPath(from, to, zone, groupId);
-        return path;
-    }
-    */
-}
-
-// import { input } from "../engine/engine_input";
-import { Physics, RaycastOptions } from "../engine/engine_physics"
-// import { time } from "../engine/engine_time";
-// import { scene } from "../engine/engine_setup";
-import { Quaternion } from "math/Quaternion";
-import {SyncedTransform} from "./SyncedTransform";
-
-export class NavMeshAgent extends Behaviour {
-    /*
-    public navMesh: NavMesh | null = null;
-
-    private currentPath: THREE.Vector3[] | null = null;
-    private helper : PathfindingHelper | null = null;
-
-    onEnable(): void {
-        this.helper = new PathfindingHelper();
-        scene.add(this.helper);
-    }
-
-    update(): void {
-        if (input.mouseClick) {
-            if (this.navMesh) {
-                const from = this.worldPosition;
-                const opts = new RaycastOptions();
-                opts.setMask(RaycastOptions.AllLayers);
-                const hits = Physics.raycast(opts);
-                if (hits.length > 0) {
-                    const to = hits[0].point;
-                    this.helper.setPlayerPosition(from);
-                    this.helper.setTargetPosition(to);
-                    this.currentPath = this.navMesh.tryFindPath(from, to);
-                    this.helper.setPath(this.currentPath);
-                    // console.log(...this.currentPath);
-
-                    const sync = GameObject.getComponent(this.gameObject, SyncedTransform);
-                    if(sync) sync.requestOwnership();
-                }
-            }
-        }
-
-        if (this.currentPath && this.currentPath.length > 0) {
-
-            const wp = this.worldPosition;
-            const target = this.currentPath[0];
-            this.worldPosition = wp.lerp(target, time.deltaTime*2);
-
-            this.gameObject.lookAt(target);
-            // const vec = target.clone().sub(wp);
-            // const wr = this.worldQuaternion;
-            // wr.slerp(rot, time.deltaTime*5);
-            // this.worldQuaternion = wr;
-
-            if (wp.distanceTo(this.currentPath[0]) < 0.1)
-                this.currentPath.shift();
+// import { Behaviour, GameObject } from "./Component";
+// /*
+// import { Pathfinding, PathfindingHelper } from 'three-pathfinding';
+// import * as THREE from 'three';
+// import { mergeBufferGeometries } from 'three/examples/jsm/utils/BufferGeometryUtils'
+// */
+// export class NavMesh extends Behaviour {
+// /*
+//     public meshes: THREE.Object3D[] = [];
+
+//     private pathfinding: Pathfinding | null = null;
+//     private zones: string[] = [];
+
+//     onEnable(): void {
+
+//         this.pathfinding = new Pathfinding();
+//         const ZONE = 'zone';
+//         const geometries : THREE.BufferGeometry[] = [];
+//         if (this.meshes && this.meshes.length > 0) {
+//             for (let i = 0; i < this.meshes.length; i++) {
+//                 const obj = this.meshes[i] as THREE.Mesh;
+//                 if (!obj) continue;
+//                 const geo = obj.geometry;
+//                 if (!geo) continue;
+//                 const copy : THREE.BufferGeometry = {...geo};
+//                 // const copy = geo;
+//                 const attributesCopy = {...copy.attributes};
+//                 copy.attributes = attributesCopy;
+//                 if(attributesCopy.uv2) delete attributesCopy.uv2;
+//                 // copy.applyMatrix4(obj.matrixWorld);
+//                 geometries.push(copy);
+//                 // obj.updateMatrixWorld();
+//                 // singleGeometry.merge(geo);
+//                 // console.log(singleGeometry, geo);
+//             }
+//         }
+//         const mesh = mergeBufferGeometries(geometries);
+//         const zone = Pathfinding.createZone(mesh);
+//         const name = ZONE;
+//         this.zones.push(name);
+//         this.pathfinding.setZoneData(name, zone);
+
+//         // const target = new THREE.Vector3(2, 0, 2);
+//         // const groupID = this.pathfinding.getGroup(ZONE, target);
+//         // const path = this.pathfinding.findPath(this.worldPosition, target, ZONE, groupID);
+//         // console.log(path, this.pathfinding);
+//     }
+
+//     public tryFindPath(from: THREE.Vector3, to: THREE.Vector3): THREE.Vector3[] | null {
+//         const zone = this.zones[0];
+//         const groupId = this.pathfinding.getGroup(zone, to);
+//         const path = this.pathfinding.findPath(from, to, zone, groupId);
+//         return path;
+//     }
+//     */
+// }
+
+// // import { input } from "../engine/engine_input";
+// import { Physics, RaycastOptions } from "../engine/engine_physics"
+// // import { time } from "../engine/engine_time";
+// // import { scene } from "../engine/engine_setup";
+// import {SyncedTransform} from "./SyncedTransform";
+
+// export class NavMeshAgent extends Behaviour {
+//     /*
+//     public navMesh: NavMesh | null = null;
+
+//     private currentPath: THREE.Vector3[] | null = null;
+//     private helper : PathfindingHelper | null = null;
+
+//     onEnable(): void {
+//         this.helper = new PathfindingHelper();
+//         scene.add(this.helper);
+//     }
+
+//     update(): void {
+//         if (input.mouseClick) {
+//             if (this.navMesh) {
+//                 const from = this.worldPosition;
+//                 const opts = new RaycastOptions();
+//                 opts.setMask(RaycastOptions.AllLayers);
+//                 const hits = Physics.raycast(opts);
+//                 if (hits.length > 0) {
+//                     const to = hits[0].point;
+//                     this.helper.setPlayerPosition(from);
+//                     this.helper.setTargetPosition(to);
+//                     this.currentPath = this.navMesh.tryFindPath(from, to);
+//                     this.helper.setPath(this.currentPath);
+//                     // console.log(...this.currentPath);
+
+//                     const sync = GameObject.getComponent(this.gameObject, SyncedTransform);
+//                     if(sync) sync.requestOwnership();
+//                 }
+//             }
+//         }
+
+//         if (this.currentPath && this.currentPath.length > 0) {
+
+//             const wp = this.worldPosition;
+//             const target = this.currentPath[0];
+//             this.worldPosition = wp.lerp(target, time.deltaTime*2);
+
+//             this.gameObject.lookAt(target);
+//             // const vec = target.clone().sub(wp);
+//             // const wr = this.worldQuaternion;
+//             // wr.slerp(rot, time.deltaTime*5);
+//             // this.worldQuaternion = wr;
+
+//             if (wp.distanceTo(this.currentPath[0]) < 0.1)
+//                 this.currentPath.shift();
 
             
-        }
-    }
-    */
-}
+//         }
+//     }
+//     */
+// }

package/src/engine-components/NestedGltf.ts

@@ -41,6 +41,8 @@ export class NestedGltf extends Behaviour {
                 res.matrix.identity();
                 res.applyMatrix4(matrix);
                 res.matrixAutoUpdate = true;
+                res.layers.disableAll();
+                res.layers.set(this.layer);
             }
             this.destroy();
             if (debug) console.log("Nested loading done:", this.filePath?.uri ?? this.filePath, res);