@needle-tools/engine 2.31.0-pre → 2.32.0-pre

package/src/engine/engine_input.ts

@@ -15,7 +15,7 @@ export class KeyEventArgs {
     key: string;
     keyType: string;
     source?: Event;
-    constructor(evt : KeyboardEvent){
+    constructor(evt: KeyboardEvent) {
         this.key = evt.key;
         this.keyType = evt.type;
         this.source = evt;
@@ -186,14 +186,25 @@ export class Input extends EventTarget {
         }
         return null;
     }
-    isKeyDown(keyCode: number) {
+    isKeyDown(keyCode: KeyCode | string | number) {
+        if (typeof keyCode === "number") {
+            console.warn("Use of keycode as number is not recommended, please use KeyCode or string instead");
+            keyCode = String.fromCharCode(keyCode);
+        }
         // console.log( this.keysPressed[keyCode]?.frame, time.frameCount);
         return this.context.application.isVisible && this.context.application.hasFocus && this.keysPressed[keyCode]?.startFrame === this.context.time.frameCount && this.keysPressed[keyCode].pressed;
     }
-    isKeyUp(keyCode: number) {
+    isKeyUp(keyCode: KeyCode | string | number) {
+        if (typeof keyCode === "number") {
+            console.warn("Use of keycode as number is not recommended, please use KeyCode or string instead");
+            keyCode = String.fromCharCode(keyCode);
+        }
         return this.context.application.isVisible && this.context.application.hasFocus && this.keysPressed[keyCode]?.frame === this.context.time.frameCount && !this.keysPressed[keyCode].pressed;
     }
-    isKeyPressed(keyCode: number) {
+    isKeyPressed(keyCode: KeyCode | string | number) {
+        if (typeof keyCode === "number") {
+            keyCode = String.fromCharCode(keyCode);
+        }
         return this.context.application.isVisible && this.context.application.hasFocus && this.keysPressed[keyCode]?.pressed;// && time.frameCount - this.keysPressed[keyCode].frame < 100;
     }
 
@@ -521,103 +532,168 @@ export class Input extends EventTarget {
 
 
 export enum KeyCode {
-    BACKSPACE = 8,
-    TAB = 9,
-    ENTER = 13,
-    SHIFT = 16,
-    CTRL = 17,
-    ALT = 18,
-    PAUSE = 19,
-    CAPS_LOCK = 20,
-    ESCAPE = 27,
-    SPACE = 32,
-    PAGE_UP = 33,
-    PAGE_DOWN = 34,
-    END = 35,
-    HOME = 36,
-    LEFT_ARROW = 37,
-    UP_ARROW = 38,
-    RIGHT_ARROW = 39,
-    DOWN_ARROW = 40,
-    INSERT = 45,
-    DELETE = 46,
-    KEY_0 = 48,
-    KEY_1 = 49,
-    KEY_2 = 50,
-    KEY_3 = 51,
-    KEY_4 = 52,
-    KEY_5 = 53,
-    KEY_6 = 54,
-    KEY_7 = 55,
-    KEY_8 = 56,
-    KEY_9 = 57,
-    KEY_A = 65,
-    KEY_B = 66,
-    KEY_C = 67,
-    KEY_D = 68,
-    KEY_E = 69,
-    KEY_F = 70,
-    KEY_G = 71,
-    KEY_H = 72,
-    KEY_I = 73,
-    KEY_J = 74,
-    KEY_K = 75,
-    KEY_L = 76,
-    KEY_M = 77,
-    KEY_N = 78,
-    KEY_O = 79,
-    KEY_P = 80,
-    KEY_Q = 81,
-    KEY_R = 82,
-    KEY_S = 83,
-    KEY_T = 84,
-    KEY_U = 85,
-    KEY_V = 86,
-    KEY_W = 87,
-    KEY_X = 88,
-    KEY_Y = 89,
-    KEY_Z = 90,
-    LEFT_META = 91,
-    RIGHT_META = 92,
-    SELECT = 93,
-    NUMPAD_0 = 96,
-    NUMPAD_1 = 97,
-    NUMPAD_2 = 98,
-    NUMPAD_3 = 99,
-    NUMPAD_4 = 100,
-    NUMPAD_5 = 101,
-    NUMPAD_6 = 102,
-    NUMPAD_7 = 103,
-    NUMPAD_8 = 104,
-    NUMPAD_9 = 105,
-    MULTIPLY = 106,
-    ADD = 107,
-    SUBTRACT = 109,
-    DECIMAL = 110,
-    DIVIDE = 111,
-    F1 = 112,
-    F2 = 113,
-    F3 = 114,
-    F4 = 115,
-    F5 = 116,
-    F6 = 117,
-    F7 = 118,
-    F8 = 119,
-    F9 = 120,
-    F10 = 121,
-    F11 = 122,
-    F12 = 123,
-    NUM_LOCK = 144,
-    SCROLL_LOCK = 145,
-    SEMICOLON = 186,
-    EQUALS = 187,
-    COMMA = 188,
-    DASH = 189,
-    PERIOD = 190,
-    FORWARD_SLASH = 191,
-    GRAVE_ACCENT = 192,
-    OPEN_BRACKET = 219,
-    BACK_SLASH = 220,
-    CLOSE_BRACKET = 221,
-    SINGLE_QUOTE = 222
+    BACKSPACE = "Backspace",
+    TAB = "Tab",
+    ENTER = "Enter",
+    SHIFT = "Shift",
+    CTRL = "Control",
+    ALT = "Alt",
+    PAUSE = "Pause",
+    CAPS_LOCK = "CapsLock",
+    ESCAPE = "Escape",
+    SPACE = " ",
+    PAGE_UP = "PageUp",
+    PAGE_DOWN = "PageDown",
+    END = "End",
+    HOME = "Home",
+    LEFT_ARROW = "ArrowLeft",
+    UP_ARROW = "ArrowUp",
+    RIGHT_ARROW = "ArrowRight",
+    DOWN_ARROW = "ArrowDown",
+    INSERT = "Insert",
+    DELETE = "Delete",
+    KEY_0 = "0",
+    KEY_1 = "1",
+    KEY_2 = "2",
+    KEY_3 = "3",
+    KEY_4 = "4",
+    KEY_5 = "5",
+    KEY_6 = "6",
+    KEY_7 = "7",
+    KEY_8 = "8",
+    KEY_9 = "9",
+    KEY_A = "a",
+    KEY_B = "b",
+    KEY_C = "c",
+    KEY_D = "d",
+    KEY_E = "e",
+    KEY_F = "f",
+    KEY_G = "g",
+    KEY_H = "h",
+    KEY_I = "i",
+    KEY_K = "k",
+    KEY_J = "j",
+    KEY_L = "l",
+    KEY_M = "m",
+    KEY_N = "n",
+    KEY_O = "o",
+    KEY_P = "p",
+    KEY_Q = "q",
+    KEY_R = "r",
+    KEY_S = "s",
+    KEY_T = "t",
+    KEY_U = "u",
+    KEY_V = "v",
+    KEY_W = "w",
+    KEY_X = "x",
+    KEY_Z = "z",
+    KEY_Y = "y",
+    SELECT = "Select",
+    NUMPAD_0 = "Numpad0",
+    NUMPAD_1 = "Numpad1",
+    NUMPAD_2 = "Numpad2",
+    NUMPAD_3 = "Numpad3",
+    NUMPAD_4 = "Numpad4",
+    NUMPAD_5 = "Numpad5",
+    NUMPAD_6 = "Numpad6",
+    NUMPAD_7 = "Numpad7",
+    NUMPAD_8 = "Numpad8",
+    NUMPAD_9 = "Numpad9",
+    MULTIPLY = "Multiply",
+    ADD = "Add",
+    SUBTRACT = "Subtract",
+    DECIMAL = "Decimal",
+    DIVIDE = "Divide",
+    F1 = "F1",
+    F2 = "F2",
+    F3 = "F3",
+    F4 = "F4",
+    F5 = "F5",
+    F6 = "F6",
+    F7 = "F7",
+    F8 = "F8",
+    F9 = "F9",
+    F10 = "F10",
+    F11 = "F11",
+    F12 = "F12"
 };
+
+
+    // KEY_1 = 49,
+    // KEY_2 = 50,
+    // KEY_3 = 51,
+    // KEY_4 = 52,
+    // KEY_5 = 53,
+    // KEY_6 = 54,
+    // KEY_7 = 55,
+    // KEY_8 = 56,
+    // KEY_9 = 57,
+    // KEY_A = 65,
+    // KEY_B = 66,
+    // KEY_C = 67,
+    // KEY_D = "d",
+    // KEY_E = 69,
+    // KEY_F = 70,
+    // KEY_G = 71,
+    // KEY_H = 72,
+    // KEY_I = 73,
+    // KEY_J = 74,
+    // KEY_K = 75,
+    // KEY_L = 76,
+    // KEY_M = 77,
+    // KEY_N = 78,
+    // KEY_O = 79,
+    // KEY_P = 80,
+    // KEY_Q = 81,
+    // KEY_R = 82,
+    // KEY_S = 83,
+    // KEY_T = 84,
+    // KEY_U = 85,
+    // KEY_V = 86,
+    // KEY_W = 87,
+    // KEY_X = 88,
+    // KEY_Y = 89,
+    // KEY_Z = 90,
+    // LEFT_META = 91,
+    // RIGHT_META = 92,
+    // SELECT = 93,
+    // NUMPAD_0 = 96,
+    // NUMPAD_1 = 97,
+    // NUMPAD_2 = 98,
+    // NUMPAD_3 = 99,
+    // NUMPAD_4 = 100,
+    // NUMPAD_5 = 101,
+    // NUMPAD_6 = 102,
+    // NUMPAD_7 = 103,
+    // NUMPAD_8 = 104,
+    // NUMPAD_9 = 105,
+    // MULTIPLY = 106,
+    // ADD = 107,
+    // SUBTRACT = 109,
+    // DECIMAL = 110,
+    // DIVIDE = 111,
+    // F1 = 112,
+    // F2 = 113,
+    // F3 = 114,
+    // F4 = 115,
+    // F5 = 116,
+    // F6 = 117,
+    // F7 = 118,
+    // F8 = 119,
+    // F9 = 120,
+    // F10 = 121,
+    // F11 = 122,
+    // F12 = 123,
+    // NUM_LOCK = 144,
+    // SCROLL_LOCK = 145,
+    // SEMICOLON = 186,
+    // EQUALS = 187,
+    // COMMA = 188,
+    // DASH = 189,
+    // PERIOD = 190,
+    // FORWARD_SLASH = 191,
+    // GRAVE_ACCENT = 192,
+    // OPEN_BRACKET = 219,
+    // BACK_SLASH = 220,
+    // CLOSE_BRACKET = 221,
+    // SINGLE_QUOTE = 222

package/src/engine/engine_mainloop_utils.ts

@@ -3,6 +3,7 @@ import * as utils from "./engine_generic_utils";
 import * as constants from "./engine_constants";
 import { Behaviour, Component, GameObject } from '../engine-components/Component';
 import { getParam } from './engine_utils';
+import { Object3D } from 'three';
 
 const debug = getParam("debugnewscripts");
 
@@ -143,13 +144,16 @@ export function processRemoveFromScene(script: Component) {
     removeScriptFromContext(script, script.context);
 }
 
-export function processStart(context: Context) {
+export function processStart(context: Context, object? : Object3D) {
     // Call start on scripts
     for (let i = 0; i < context.new_script_start.length; i++) {
         try {
             const script = context.new_script_start[i];
+            if(object !== undefined && script.gameObject !== object) continue;
             if (script.destroyed) continue;
-            if (script.activeAndEnabled === false) continue;
+            if (script.activeAndEnabled === false) {
+                continue;
+            }
             // keep them in queue until script has started
             // call awake if the script was inactive before
             utils.safeInvoke(script.__internalAwake.bind(script));

package/src/engine/engine_physics.ts

@@ -6,9 +6,9 @@ import { Rigidbody } from '../engine-components/Rigidbody';
 import * as utils from "./engine_utils"
 import * as threeutils from "./engine_three_utils"
 import { InstancingUtil } from '../engine-components/Renderer';
-import { GameObject } from '../engine-components/Component';
+import { Behaviour, Component, GameObject } from '../engine-components/Component';
 import { Body, RigidVehicle, Shape, Vec3 } from 'cannon-es';
-import { Object3D, Vector3 } from 'three';
+import { Matrix4, Object3D, RGBA_BPTC_Format, Vector3, Wrapping } from 'three';
 import { Collider } from '../engine-components/Collider';
 
 const debugPhysics = utils.getParam("debugphysics");
@@ -288,7 +288,10 @@ export class Physics {
                 break;
             }
         }
-        this.world.addBody(body);
+        // dont add the body before it has shapes
+        // otherwise things like forces appplied in the frame before the shapes exist will be zeroed out
+        if (body.shapes.length > 0)
+            this.world.addBody(body);
     }
 
     public removeBody(go: GameObject, body: CANNON.Body, removeCompletely: boolean = true) {
@@ -331,7 +334,8 @@ export class Physics {
         if (settings.sleepThreshold)
             body.sleepSpeedLimit = settings.sleepThreshold;
 
-        this.world.addBody(body);
+        if (body.shapes.length > 0)
+            this.world.addBody(body);
         const po = new PhysicsObject(obj, body);
         po._hasRigidbody = true;
         this.objects.push(po);
@@ -364,6 +368,7 @@ export class Physics {
 
         const body = this.addShape(obj, shape, center, rb);
         if (body !== null) {
+            this.world.addBody(body);
             if (this.isAlreadyRegistered(body)) return shape;
             const po = new PhysicsObject(obj, body);
             this.objects.push(po);
@@ -384,6 +389,7 @@ export class Physics {
 
         const body = this.addShape(obj, shape, center, rb);
         if (body !== null) {
+            this.world.addBody(body);
             if (this.isAlreadyRegistered(body)) return shape;
             const po = new PhysicsObject(obj, body);
             this.objects.push(po);
@@ -430,6 +436,9 @@ export class Physics {
         return false;
     }
 
+    private readonly tempMat1: THREE.Matrix4 = new THREE.Matrix4();
+    private readonly tempMat2: THREE.Matrix4 = new THREE.Matrix4();
+
     private addShape(obj: THREE.Object3D, shape: CANNON.Shape, center: THREE.Vector3, rb: Rigidbody | null): CANNON.Body | null {
 
         let body: CANNON.Body | null = null;
@@ -445,28 +454,59 @@ export class Physics {
             // console.log("has no rb", obj);
             body = this.internalCreateBody(obj, null);
             body.type = CANNON.Body.KINEMATIC;
-            this.world.addBody(body);
         }
 
         if (body) {
+            // console.log(obj.name, obj.position, obj.rotation)
+
+            // the center is serialized from Unity so we need to move it into threejs space
+            // this should probably happen on export for colliders
             center.x *= -1;
 
-            const wr = threeutils.getWorldQuaternion(obj);
+            let wp = obj.position;
+            let wr = obj.quaternion;
+
+            // console.log(obj.name, wp)
+
+            if (rb && rb.gameObject !== obj) {
+                this.tempMat1.copy(obj.matrixWorld);
+                this.tempMat2.copy(rb.gameObject.matrixWorld).invert();
+                this.tempMat1.premultiply(this.tempMat2);
+                this.tempMat1.decompose(wp, wr, this.tempPosition);
+            }
+            else {
+                wp = threeutils.getWorldPosition(obj);
+                const bp = body.position;
+                wp.x -= bp.x;
+                wp.y -= bp.y;
+                wp.z -= bp.z;
+
+                wr = threeutils.getWorldQuaternion(obj);
+                const r = new THREE.Quaternion(body.quaternion.x, body.quaternion.y, body.quaternion.z, body.quaternion.w);
+                wr.multiply(r.invert());
+            }
             // get rotation difference
 
-            const wp = threeutils.getWorldPosition(obj);
             wp.add(center);
 
-            const r = new THREE.Quaternion(body.quaternion.x, body.quaternion.y, body.quaternion.z, body.quaternion.w);
-            wr.multiply(r.invert());
+
+
+
+            // if (rb) {
+            //     this.tempMat.setPosition(wp);
+            //     this.tempMat.makeRotationFromQuaternion(wr);
+            //     this.tempMat.multiplyMatrices(this.tempMat, rb?.gameObject.matrix);
+            //     this.tempMat.decompose(this.tempPosition, this.tempQuaternion, new THREE.Vector3());
+            //     wp.copy(this.tempPosition);
+            // }
 
             // wp.applyQuaternion(wr);
 
-            const bp = body.position;
-            const pos = new CANNON.Vec3(wp.x - bp.x, wp.y - bp.y, wp.z - bp.z);
+            const pos = new CANNON.Vec3(wp.x, wp.y, wp.z);
             const rot = new CANNON.Quaternion(wr.x, wr.y, wr.z, wr.w);
             body.addShape(shape, pos, rot);
             body.updateMassProperties();
+            this.world.addBody(body);
         }
         return body;
     }
@@ -479,7 +519,7 @@ export class Physics {
         this.world.step(deltaTime);
         this._isUpdatingPhysicsWorld = false;
         if (debugPhysics && this.context.time.frameCount % 60 === 0) {
-            console.log("physics world has " + this.world.bodies.length + " bodies", this.world);
+            // console.log("physics world has " + this.world.bodies.length + " bodies", this.world);
         }
     }
 
@@ -602,26 +642,42 @@ export class Physics {
 
     private onBeginContact(_) {
         // this is called after the object collide event so we dont really need it
-        // console.log("START", args);
+        // console.log("START");
     }
 
     private raiseCollisionEvents(obj: THREE.Object3D, event: CannonCollision) {
         const collision = new Collision(obj, event);
         if (debugCollisions)
             console.log("collision between", event.contact.bi, event.contact.bj, obj, event);
-        for (let i = 0; i < obj.userData?.components?.length; i++) {
-            const component = obj.userData.components[i];
-            component.__internalHandleCollision(collision);
+        GameObject.foreachComponent(obj, (c: Component) => {
+            c.__internalHandleCollision(collision, false);
+        });
+
+        // handle triggers
+        if (collision.collider && !collision.collider.attachedRigidbody && collision.collider.isTrigger) {
+            const collision2 = new Collision(collision.gameObject, event, true);
+            GameObject.foreachComponent(collision.gameObject, (c: Component) => {
+                c.__internalHandleCollision(collision2, true);
+            });
         }
     }
 
     private onEndContact(args: { bodyA: CANNON.Body, bodyB: CANNON.Body }) {
-        // console.log("END", args.bodyA, args.bodyB);
+        // if(args.bodyB.sleepState !== CANNON.Body.AWAKE) return;
+        // console.log("END", CANNON.BODY_SLEEP_STATES, args.bodyB.sleepState);
         const obj1 = args.bodyA[bodyObjectKey];
         const obj2 = args.bodyB[bodyObjectKey];
-        for (let i = 0; i < obj2.userData?.components?.length; i++) {
-            const component = obj2.userData.components[i];
-            component.sendExitCollisionEvent(obj1);
+        // console.log(obj2);
+        GameObject.foreachComponent(obj2, (c: Component) => {
+            c.__internalHandleExitCollisionEvent(obj1, false);
+        });
+
+        const collider = GameObject.getComponent(obj1, Collider);
+        if (collider && !collider.attachedRigidbody && collider.isTrigger) {
+            
+            GameObject.foreachComponent(collider.gameObject, (c: Component) => {
+                c.__internalHandleExitCollisionEvent(obj2, true);
+            });
         }
     }
 
@@ -629,14 +685,18 @@ export class Physics {
 
 
 export class Collision {
+
+    private readonly invert: boolean;
     private readonly collision: CannonCollision;
+    private readonly targetBody: CANNON.Body;
 
     readonly me: Object3D;
 
     private _normal?: Vector3;
     get normal(): Vector3 {
         if (!this._normal) {
-            this._normal = new Vector3(this.collision.contact.ni.x, this.collision.contact.ni.y, this.collision.contact.ni.z);
+            const vec = this.collision.contact.ni;
+            this._normal = new Vector3(vec.x, vec.y, vec.z);
         }
         return this._normal;
     }
@@ -644,13 +704,13 @@ export class Collision {
     private _collider?: Collider;
     get collider(): Collider {
         if (this._collider === undefined) {
-            this._collider = GameObject.getComponent(this.gameObject, Collider)!;
+            this._collider = GameObject.getComponentInChildren(this.gameObject, Collider)!;
         }
         return this._collider;
     }
 
     get gameObject(): Object3D {
-        return this.collision.body[bodyObjectKey];
+        return this.targetBody[bodyObjectKey];
     }
 
     // private _point?: Vector3;
@@ -663,8 +723,10 @@ export class Collision {
     //     return this._point;
     // }
 
-    constructor(obj: Object3D, collision: CannonCollision) {
+    constructor(obj: Object3D, collision: CannonCollision, invert: boolean = false) {
+        this.invert = invert;
         this.me = obj;
         this.collision = collision;
+        this.targetBody = this.invert ? collision.target : collision.body;
     }
 }

package/src/engine/engine_setup.ts

@@ -222,11 +222,13 @@ export class Context {
 		this.lightmaps = new LightDataRegistry(this);
 		this.players = new PlayerViewManager(this);
 
-		window.addEventListener('resize', this.updateSize.bind(this));
+		window.addEventListener('resize', () => this._sizeChanged = true );
 		const ro = new ResizeObserver(_ => this._sizeChanged = true);
 		ro.observe(this.domElement);
 	}
 
+	// private _requestSizeUpdate : boolean = false;
+
 	private updateSize() {
 		if (!this.isManagedExternally && !this.renderer.xr.isPresenting) {
 			this._sizeChanged = false;
@@ -237,8 +239,11 @@ export class Context {
 			this.updateAspect(camera);
 			this.renderer.setSize(width, height);
 			this.renderer.setPixelRatio(window.devicePixelRatio);
-			this.renderer.domElement.style.width = this.domWidth + "px";
-			this.renderer.domElement.style.height = this.domHeight + "px";
+			// avoid setting pixel values here since this can cause pingpong updates
+			// e.g. when system scale is set to 125%
+			// https://github.com/needle-tools/needle-engine-support/issues/69
+			this.renderer.domElement.style.width = "100%";
+			this.renderer.domElement.style.height = "100%";
 			if (this.composer) {
 				this.composer.setSize(width, height);
 				this.composer.setPixelRatio(window.devicePixelRatio);

package/src/engine/engine_utils.ts

@@ -221,9 +221,15 @@ export function getPath(source: SourceIdentifier | undefined, uri: string): stri
 
 export type WriteCallback = (data: any) => void;
 
-// TODO: make it possible to add multiple watches to the same object property
-export class Watch {
+export interface IWatch {
+    subscribeWrite(callback: WriteCallback);
+    apply();
+    revoke();
+    dispose();
+}
 
+// TODO: make it possible to add multiple watches to the same object property
+class WatchImpl implements IWatch {
     subscribeWrite(callback: WriteCallback) {
         this.writeCallbacks.push(callback);
     }
@@ -249,7 +255,7 @@ export class Watch {
         if (object[prop] === undefined) return;
         this._applied = true;
 
-        if(object[this._wrapperProp] !== undefined){
+        if (object[this._wrapperProp] !== undefined) {
             console.warn("Watcher is being applied to an object that already has a wrapper property. This is not (yet) supported");
         }
 
@@ -258,7 +264,6 @@ export class Watch {
         object[this._wrapperProp] = current;
         // create wrapper methods
         const getter = () => {
-            // console.log("GET " + prop);
             return object[this._wrapperProp];
         }
         const setter = (value) => {
@@ -292,3 +297,44 @@ export class Watch {
         this._object = null;
     }
 }
+
+export class Watch implements IWatch {
+
+    private readonly _watches: IWatch[] = [];
+
+    constructor(object: object, str: string[] | string) {
+        if (Array.isArray(str)) {
+            for (const s of str) {
+                this._watches.push(new Watch(object, s));
+            }
+        }
+        else {
+            this._watches.push(new WatchImpl(object, str));
+        }
+    }
+
+    subscribeWrite(callback: WriteCallback) {
+        for (const w of this._watches) {
+            w.subscribeWrite(callback);
+        }
+    }
+
+    apply() {
+        for (const w of this._watches) {
+            w.apply();
+        }   
+    }
+
+    revoke() {
+        for (const w of this._watches) {
+            w.revoke();
+        }
+    }
+
+    dispose() {
+        for (const w of this._watches) {
+            w.dispose();
+        }
+        this._watches.length = 0;
+    }
+}