Needle Engine 3.32.20-alpha

Files changed (6) hide show

src/engine-components/Camera.ts +6 -2
src/engine/engine_components.ts +16 -8
src/engine/engine_input.ts +12 -11
src/engine/engine_scenelighting.ts +1 -0
src/engine/xr/NeedleXRSession.ts +3 -2
src/engine-components/webxr/WebXRButtons.ts +2 -2

src/engine-components/Camera.ts CHANGED Viewed

@@ -118,6 +118,7 @@
         this.cullingMask = (1 << val | 0) >>> 0;
     }
+    /** Modify the background blurriness */
     @serializable()
     public set backgroundBlurriness(val: number | undefined) {
         if (val === this._backgroundBlurriness) return;
@@ -130,7 +131,7 @@
     public get backgroundBlurriness(): number | undefined {
         return this._backgroundBlurriness;
     }
-    private _backgroundBlurriness?: number;
+    private _backgroundBlurriness?: number = 0;
     @serializable()
     public set backgroundIntensity(val: number | undefined) {
@@ -144,7 +145,7 @@
     public get backgroundIntensity(): number | undefined {
         return this._backgroundIntensity;
     }
-    private _backgroundIntensity?: number;
+    private _backgroundIntensity?: number = 1;
     @serializable()
     public set environmentIntensity(val: number | undefined) {
@@ -347,10 +348,13 @@
                 }
                 this.enableSkybox();
+                // set background blurriness and intensity
                 if (this._backgroundBlurriness !== undefined)
                     this.context.scene.backgroundBlurriness = this._backgroundBlurriness;
+                else if (debug) console.warn(`Camera \"${this.name}\" has no background blurriness`)
                 if (this._backgroundIntensity !== undefined)
                     this.context.scene.backgroundIntensity = this._backgroundIntensity;
+                else if (debug) console.warn(`Camera \"${this.name}\" has no background intensity`)
                 break;
             case ClearFlags.SolidColor:

src/engine/engine_components.ts CHANGED Viewed

@@ -175,8 +175,9 @@
     return onGetComponent(obj, componentType);
 }
-export function getComponents<T>(obj: Object3D, componentType: Constructor<T>, arr?: T[] | null): T[] {
+export function getComponents<T>(obj: Object3D, componentType: Constructor<T>, arr?: T[] | null, clearArray: boolean = true): T[] {
     if (!arr) arr = [];
+    if (clearArray) arr.length = 0;
     onGetComponent(obj, componentType, arr);
     return arr;
 }
@@ -192,11 +193,13 @@
     return null;
 }
-export function getComponentsInChildren<T>(obj: Object3D, componentType: Constructor<T>, arr?: T[]) {
+export function getComponentsInChildren<T>(obj: Object3D, componentType: Constructor<T>, arr?: T[], clearArray: boolean = true) {
     if (!arr) arr = [];
-    getComponents(obj, componentType, arr);
+    if (clearArray) arr.length = 0;
+    getComponents(obj, componentType, arr, false);
     for (let i = 0; i < obj?.children?.length; i++) {
-        getComponentsInChildren(obj.children[i], componentType, arr);
+        getComponentsInChildren(obj.children[i], componentType, arr, false);
     }
     return arr;
 }
@@ -219,12 +222,14 @@
     return null;
 }
-export function getComponentsInParent<T>(obj: Object3D, componentType: Constructor<T>, arr?: T[] | null): T[] {
+export function getComponentsInParent<T>(obj: Object3D, componentType: Constructor<T>, arr?: T[] | null, clearArray: boolean = true): T[] {
     if (!arr) arr = [];
+    if (clearArray) arr.length = 0;
     if (!obj) return arr;
-    getComponents(obj, componentType, arr);
+    getComponents(obj, componentType, arr, false);
     if (obj.parent)
-        return getComponentsInParent(obj.parent, componentType, arr);
+        return getComponentsInParent(obj.parent, componentType, arr, false);
     return arr;
 }
@@ -255,6 +260,9 @@
 export function findObjectsOfType<T>(type: Constructor<T>, array: T[], contextOrScene): T[] {
     if (!type) return array;
+    if (!array) array = [];
+    array.length = 0;
     if (!contextOrScene) {
         contextOrScene = Context.Current;
         if (!contextOrScene) {
@@ -267,7 +275,7 @@
     for (const i in scene.children) {
         const child = scene.children[i];
         if (child.constructor == type) return child;
-        getComponentsInChildren(child, type, array);
+        getComponentsInChildren(child, type, array, false);
     }
     return array;
 }

src/engine/engine_input.ts CHANGED Viewed

@@ -928,15 +928,16 @@
     }
     private updatePointerPosition(evt: NEPointerEvent) {
-        // console.log("MOVE");
-        while (evt.button >= this._pointerPositions.length) this._pointerPositions.push(new Vector2());
-        while (evt.button >= this._pointerPositionsLastFrame.length) this._pointerPositionsLastFrame.push(new Vector2());
-        while (evt.button >= this._pointerPositionsDelta.length) this._pointerPositionsDelta.push(new Vector2());
+        const index = evt.pointerId;
+        while (index >= this._pointerPositions.length) this._pointerPositions.push(new Vector2());
+        while (index >= this._pointerPositionsLastFrame.length) this._pointerPositionsLastFrame.push(new Vector2());
+        while (index >= this._pointerPositionsDelta.length) this._pointerPositionsDelta.push(new Vector2());
-        const lf = this._pointerPositionsLastFrame[evt.button];
-        lf.copy(this._pointerPositions[evt.button]);
+        const lf = this._pointerPositionsLastFrame[index];
+        lf.copy(this._pointerPositions[index]);
         // accumulate delta (it's reset in end of frame), if we just write it here it's not correct when the browser console is open
-        const delta = this._pointerPositionsDelta[evt.button];
+        const delta = this._pointerPositionsDelta[index];
         let dx = evt.clientX - lf.x;
         let dy = evt.clientY - lf.y;
         // if pointer is locked, clientX and Y are not changed, but Movement is.
@@ -950,14 +951,14 @@
         delta.x += dx;
         delta.y += dy;
-        this._pointerPositions[evt.button].x = evt.clientX;
-        this._pointerPositions[evt.button].y = evt.clientY;
+        this._pointerPositions[index].x = evt.clientX;
+        this._pointerPositions[index].y = evt.clientY;
         // we want to have the position 01 on the canvas for raycasting
         const px = evt.clientX;
         const py = evt.clientY;
-        while (evt.button >= this._pointerPositionsRC.length) this._pointerPositionsRC.push(new Vector2());
-        const rc = this._pointerPositionsRC[evt.button];
+        while (index >= this._pointerPositionsRC.length) this._pointerPositionsRC.push(new Vector2());
+        const rc = this._pointerPositionsRC[index];
         rc.set(px, py);
         this.convertScreenspaceToRaycastSpace(rc);
         // console.log(this.context.alias, rc);

src/engine/engine_scenelighting.ts CHANGED Viewed

@@ -80,6 +80,7 @@
             sourceId = sourceId.uri;
         const settings = this._sceneLightSettings?.get(sourceId);
         if (!settings) {
+            if(debug) console.warn("No light settings found for", sourceId);
             return false;
         }
         if (debug) console.log("Enable scene light settings", sourceId, settings);

src/engine/xr/NeedleXRSession.ts CHANGED Viewed

@@ -181,8 +181,9 @@
         return ('xr' in navigator) ? navigator.xr : undefined;
     }
     static isXRSupported() { return Promise.all([this.isVRSupported(), this.isARSupported()]).then(res => res.some(e => e)).catch(() => false); }
-    static isVRSupported() { return this.xrSystem?.isSessionSupported('immersive-vr').catch(err => { if (debug) console.error(err); return false }) ?? Promise.resolve(false); }
-    static isARSupported() { return this.xrSystem?.isSessionSupported('immersive-ar').catch(err => { if (debug) console.error(err); return false }) ?? Promise.resolve(false); }
+    static isVRSupported() { return this.isSessionSupported("immersive-vr"); }
+    static isARSupported() { return this.isSessionSupported("immersive-ar"); }
+    static isSessionSupported(mode: XRSessionMode) { return this.xrSystem?.isSessionSupported(mode).catch(err => { if (debug) console.error(err); return false }) ?? Promise.resolve(false); }
     private static _currentSessionRequest?: Promise<XRSession>;
     private static _activeSession: NeedleXRSession | null;

src/engine-components/webxr/WebXRButtons.ts CHANGED Viewed

@@ -297,11 +297,11 @@
     }
     private updateSessionSupported(button: HTMLButtonElement, mode: XRSessionMode) {
-        if (!navigator.xr) {
+        if (!("xr" in navigator)) {
             button.style.display = "none";
             return;
         }
-        navigator.xr.isSessionSupported(mode).then(supported => {
+        NeedleXRSession.isSessionSupported(mode).then(supported => {
             button.style.display = !supported ? "none" : "";
             if (isDevEnvironment() && !supported) console.warn(mode + " is not supported on this device - make sure your server runs using HTTPS and you have a device connected that supports " + mode);
         });