@needle-tools/engine 3.6.0-beta → 3.6.1-beta

package/src/engine/engine_input.ts

@@ -215,7 +215,7 @@ export class Input extends EventTarget implements IInput {
     }
 
     private _pointerIsActive(index: number) {
-        if(index < 0) return false;
+        if (index < 0) return false;
         return this._pointerPressed[index] || this._pointerDown[index] || this._pointerUp[index];
     }
 
@@ -330,45 +330,52 @@ export class Input extends EventTarget implements IInput {
     constructor(context: Context) {
         super();
         this.context = context;
-        this.context.post_render_callbacks.push(this.onEndOfFrame.bind(this));
+        this.context.post_render_callbacks.push(this.onEndOfFrame);
 
-        // const eventElement = this.context.renderer.domElement;
+        window.addEventListener('touchstart', this.onTouchStart, false);
+        window.addEventListener('touchmove', this.onTouchMove, { passive: true });
+        window.addEventListener('touchend', this.onTouchUp, false);
 
-        // this.context.renderer.domElement.addEventListener('mousedown', this.onMouseDown.bind(this), false);
-        // this.context.renderer.domElement.addEventListener('mousemove', this.onMouseMove.bind(this), false);
-        // this.context.renderer.domElement.addEventListener('mouseup', this.onMouseUp.bind(this), false);
+        window.addEventListener('mousedown', this.onMouseDown, false);
+        window.addEventListener('mousemove', this.onMouseMove, false);
+        window.addEventListener('mouseup', this.onMouseUp, false);
+        window.addEventListener('wheel', this.onMouseWheel, { passive: true });
 
-        window.addEventListener('touchstart', this.onTouchStart.bind(this), false);
-        window.addEventListener('touchmove', this.onTouchMove.bind(this), { passive: true });
-        window.addEventListener('touchend', this.onTouchUp.bind(this), false);
+        window.addEventListener("keydown", this.onKeyDown, false);
+        window.addEventListener("keypress", this.onKeyPressed, false);
+        window.addEventListener("keyup", this.onKeyUp, false);
 
-        window.addEventListener('mousedown', this.onMouseDown.bind(this), false);
-        window.addEventListener('mousemove', this.onMouseMove.bind(this), false);
-        window.addEventListener('mouseup', this.onMouseUp.bind(this), false);
-        window.addEventListener('wheel', this.onMouseWheel.bind(this), { passive: true });
+        // e.g. when using sharex to capture we loose focus thus dont get e.g. key up events
+        window.addEventListener('blur', this.onLostFocus);
+    }
 
-        window.addEventListener("keydown", this.onKeyDown.bind(this), false);
-        window.addEventListener("keypress", this.onKeyPressed.bind(this), false);
-        window.addEventListener("keyup", this.onKeyUp.bind(this), false);
+    dispose() {
+        const index = this.context.post_render_callbacks.indexOf(this.onEndOfFrame);
+        if (index >= 0) this.context.post_render_callbacks.splice(index, 1);
 
-        // e.g. when using sharex to capture we loose focus thus dont get e.g. key up events
-        window.addEventListener('blur', this.onLostFocus.bind(this));
+        window.removeEventListener('touchstart', this.onTouchStart, false);
+        window.removeEventListener('touchmove', this.onTouchMove, false);
+        window.removeEventListener('touchend', this.onTouchUp, false);
+
+        window.removeEventListener('mousedown', this.onMouseDown, false);
+        window.removeEventListener('mousemove', this.onMouseMove, false);
+        window.removeEventListener('mouseup', this.onMouseUp, false);
+        window.removeEventListener('wheel', this.onMouseWheel, false);
+
+        window.removeEventListener("keydown", this.onKeyDown, false);
+        window.removeEventListener("keypress", this.onKeyPressed, false);
+        window.removeEventListener("keyup", this.onKeyUp, false);
 
-        // setTimeout(() => {
-        //     this.createPointerDown({ pointerId: 0, button: 0, clientX: 0, clientY: 0, pointerType: "mouse" });
-        //     setTimeout(() => {
-        //         this.createPointerUp({ pointerId: 0, button: 0, clientX: 0, clientY: 0, pointerType: "mouse" });
-        //     }, 1000);
-        // }, 2000);
+        window.removeEventListener('blur', this.onLostFocus);
     }
 
-    private onLostFocus() {
+    private onLostFocus = () => {
         for (const kp in this.keysPressed) {
             this.keysPressed[kp].pressed = false;
         }
     }
 
-    private onEndOfFrame() {
+    private onEndOfFrame = () => {
         for (let i = 0; i < this._pointerUp.length; i++)
             this._pointerUp[i] = false;
         for (let i = 0; i < this._pointerDown.length; i++)
@@ -385,7 +392,7 @@ export class Input extends EventTarget implements IInput {
             this._mouseWheelDeltaY[i] = 0;
     }
 
-    private canReceiveInput(evt : Event) {
+    private canReceiveInput(evt: Event) {
         // If the user has HTML objects ontop of the canvas
         // if(evt.target === this.context.renderer.domElement) return true;
         // const css = window.getComputedStyle(evt.target as HTMLElement);
@@ -395,7 +402,7 @@ export class Input extends EventTarget implements IInput {
 
     private keysPressed: { [key: KeyCode | string]: { pressed: boolean, frame: number, startFrame: number, key: string, code: KeyCode | string } } = {};
 
-    private onKeyDown(evt: KeyboardEvent) {
+    private onKeyDown = (evt: KeyboardEvent) => {
         if (!this.context.application.hasFocus)
             return;
         const ex = this.keysPressed[evt.code];
@@ -403,7 +410,7 @@ export class Input extends EventTarget implements IInput {
         this.keysPressed[evt.code] = { pressed: true, frame: this.context.time.frameCount + 1, startFrame: this.context.time.frameCount + 1, key: evt.key, code: evt.code };
         this.onDispatchEvent(InputEvents.KeyDown, new KeyEventArgs(evt));
     }
-    private onKeyPressed(evt: KeyboardEvent) {
+    private onKeyPressed = (evt: KeyboardEvent) => {
         if (!this.context.application.hasFocus)
             return;
         const p = this.keysPressed[evt.code];
@@ -413,7 +420,7 @@ export class Input extends EventTarget implements IInput {
         this.onDispatchEvent(InputEvents.KeyPressed, new KeyEventArgs(evt));
 
     }
-    private onKeyUp(evt: KeyboardEvent) {
+    private onKeyUp = (evt: KeyboardEvent) => {
         if (!this.context.application.hasFocus)
             return;
         const p = this.keysPressed[evt.code];
@@ -423,8 +430,8 @@ export class Input extends EventTarget implements IInput {
         this.onDispatchEvent(InputEvents.KeyUp, new KeyEventArgs(evt));
     }
 
-    private onMouseWheel(evt: WheelEvent) {
-        if(this.canReceiveInput(evt) === false) return;
+    private onMouseWheel = (evt: WheelEvent) => {
+        if (this.canReceiveInput(evt) === false) return;
         if (this._mouseWheelDeltaY.length <= 0) this._mouseWheelDeltaY.push(0);
         if (this._mouseWheelChanged.length <= 0) this._mouseWheelChanged.push(false);
         this._mouseWheelChanged[0] = true;
@@ -432,9 +439,9 @@ export class Input extends EventTarget implements IInput {
         this._mouseWheelDeltaY[0] = current + evt.deltaY;
     }
 
-    private onTouchStart(evt: TouchEvent) {
+    private onTouchStart = (evt: TouchEvent) => {
         if (evt.changedTouches.length <= 0) return;
-        if(this.canReceiveInput(evt) === false) return;
+        if (this.canReceiveInput(evt) === false) return;
         for (let i = 0; i < evt.changedTouches.length; i++) {
             const touch = evt.changedTouches[i];
             const id = this.getPointerIndex(touch.identifier)
@@ -445,7 +452,7 @@ export class Input extends EventTarget implements IInput {
         }
     }
 
-    private onTouchMove(evt: TouchEvent) {
+    private onTouchMove = (evt: TouchEvent) => {
         if (evt.changedTouches.length <= 0) return;
         for (let i = 0; i < evt.changedTouches.length; i++) {
             const touch = evt.changedTouches[i];
@@ -455,7 +462,7 @@ export class Input extends EventTarget implements IInput {
         }
     }
 
-    private onTouchUp(evt: TouchEvent) {
+    private onTouchUp = (evt: TouchEvent) => {
         if (evt.changedTouches.length <= 0) return;
         for (let i = 0; i < evt.changedTouches.length; i++) {
             const touch = evt.changedTouches[i];
@@ -469,21 +476,21 @@ export class Input extends EventTarget implements IInput {
         }
     }
 
-    private onMouseDown(evt: MouseEvent) {
+    private onMouseDown = (evt: MouseEvent) => {
         if (evt.defaultPrevented) return;
-        if(this.canReceiveInput(evt) === false) return;
+        if (this.canReceiveInput(evt) === false) return;
         let i = evt.button;
         this.onDown({ button: i, clientX: evt.clientX, clientY: evt.clientY, pointerType: PointerType.Mouse, source: evt });
     }
 
-    private onMouseMove(evt: MouseEvent) {
+    private onMouseMove = (evt: MouseEvent) => {
         if (evt.defaultPrevented) return;
         let i = evt.button;
         const args: PointerEventArgs = { button: i, clientX: evt.clientX, clientY: evt.clientY, pointerType: PointerType.Mouse, source: evt, movementX: evt.movementX, movementY: evt.movementY };
         this.onMove(args);
     }
 
-    private onMouseUp(evt: MouseEvent) {
+    private onMouseUp = (evt: MouseEvent) => {
         if (evt.defaultPrevented) return;
         let i = evt.button;
         if (!this.isNewEvent(evt.timeStamp, i, this._pointerUpTimestamp)) return;
@@ -504,7 +511,7 @@ export class Input extends EventTarget implements IInput {
         const px = e.clientX;
         const py = e.clientY;
         const isInRect = px >= rect.x && px <= rect.right && py >= rect.y && py <= rect.bottom;
-        if(debug && !isInRect) console.log("Not in rect", rect, px, py);
+        if (debug && !isInRect) console.log("Not in rect", rect, px, py);
         return isInRect;
 
     }
@@ -518,7 +525,7 @@ export class Input extends EventTarget implements IInput {
             const upTime = this._pointerUpTimestamp[evt.button];
             if (upTime > 0 && upTime === evt.source?.timeStamp) {
                 // we received an UP event for a touch, ignore this DOWN event
-                if(debug) console.log("Ignoring mouse.down for touch.up");
+                if (debug) console.log("Ignoring mouse.down for touch.up");
                 return;
             }
         }
@@ -678,7 +685,7 @@ export class Input extends EventTarget implements IInput {
     }
 }
 
-export declare type KeyCode = 
+export declare type KeyCode =
     | "Tab"
     | "Enter"
     | "ShiftLeft"

package/src/engine/engine_license.ts

@@ -38,7 +38,7 @@ ContextRegistry.registerCallback(ContextEvent.ContextRegistered, evt => {
 
 async function showLicenseInfo(ctx: IContext) {
     try {
-        if (hasProLicense() !== true) return onNonCommercialVersionDetected(ctx);
+        if (hasCommercialLicense() !== true) return onNonCommercialVersionDetected(ctx);
     }
     catch (err) {
         if (debug) console.log("License check failed", err)

package/src/engine/engine_physics_rapier.ts

@@ -455,8 +455,10 @@ export class RapierPhysics implements IPhysicsEngine {
 
     clearCaches() {
         this._meshCache.clear();
-        this.eventQueue?.free();
-        this.world?.free();
+        if (this.eventQueue?.raw)
+            this.eventQueue?.free();
+        if (this.world?.bodies)
+            this.world?.free();
     }
 
     async addBoxCollider(collider: ICollider, center: Vector3, size: Vector3) {
@@ -549,6 +551,7 @@ export class RapierPhysics implements IPhysicsEngine {
         if (Math.abs(scale.x - 1) > 0.0001 || Math.abs(scale.y - 1) > 0.0001 || Math.abs(scale.z - 1) > 0.0001) {
             const key = geo.uuid + "_" + scale.x + "_" + scale.y + "_" + scale.z + "_" + convex;
             if (this._meshCache.has(key)) {
+                if(debugPhysics) console.warn("Use cached mesh collider")
                 positions = this._meshCache.get(key)!;
             }
             else {

package/src/engine-components/Skybox.ts

@@ -74,13 +74,17 @@ function tryGetPreviouslyLoadedTexture(src: string) {
     }
     return null;
 }
+async function disposeCachedTexture(tex: Promise<Texture>) {
+    const texture = await tex;
+    setDisposable(texture, true);
+    disposeObjectResources(texture);
+}
 function registerLoadedTexture(src: string, texture: Promise<Texture>) {
     const cache = ensureGlobalCache();
     // Make sure the cache doesnt get too big
     while (cache.length > 5) {
         const entry = cache.shift();
-        entry?.texture.then(t => setDisposable(t, true));
-        disposeObjectResources(entry?.texture);
+        if (entry) { disposeCachedTexture(entry.texture); }
     }
     texture.then(t => setDisposable(t, false));
     cache.push({ src, texture });