Needle Engine 3.32.1-alpha

Files changed (13) hide show

src/engine-components/webxr/Avatar.ts +1 -1
src/engine-components/ui/Canvas.ts +28 -11
src/engine-components/Component.ts +3 -3
src/engine/engine_addressables.ts +3 -3
src/engine/engine_context.ts +12 -8
src/engine/engine_gameobject.ts +14 -6
src/engine/engine_input.ts +5 -5
src/engine/engine_networking.ts +7 -4
src/engine/engine_types.ts +10 -0
src/engine/xr/NeedleXRController.ts +56 -13
src/engine/xr/NeedleXRSession.ts +20 -11
src/engine-components/SyncedTransform.ts +16 -0
src/engine-components/webxr/WebXR.ts +10 -6

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

@@ -41,7 +41,7 @@
             marker.avatar = this.gameObject;
             marker.connectionId = playerstate.owner;
         }
-        else console.error("No player state found for avatar", this);
+        else if(this.context.connection.isConnected) console.error("No player state found for avatar", this);
     }
     onLeaveXR(_args: NeedleXREventArgs): void {

src/engine-components/ui/Canvas.ts CHANGED Viewed

@@ -12,6 +12,7 @@
 import { getParam } from "../../engine/engine_utils.js";
 import { LayoutGroup } from "./Layout.js";
 import { Mathf } from "../../engine/engine_math.js";
+import { NeedleXREventArgs } from "../../engine/xr/index.js";
 export enum RenderMode {
     ScreenSpaceOverlay = 0,
@@ -200,19 +201,30 @@
         }
     }
+    onEnterXR(args: NeedleXREventArgs): void {
+        if (this.screenspace) {
+            if (args.xr.isVR || args.xr.isPassThrough) {
+                this.gameObject.visible = false;
+            }
+        }
+    }
+    onLeaveXR(args: NeedleXREventArgs): void {
+        if (this.screenspace) {
+            if (args.xr.isVR || args.xr.isPassThrough) {
+                this.gameObject.visible = true;
+            }
+        }
+    }
     onBeforeRenderRoutine = () => {
-        if (this.context.isInVR) {
-            this.onUpdateRenderMode();
-            this.handleLayoutUpdates();
-            // TODO TMUI @swingingtom - For VR this is so we don't have text clipping
-            this.shadowComponent?.updateMatrixWorld(true);
-            this.shadowComponent?.updateWorldMatrix(true, true);
-            this.invokeBeforeRenderEvents();
-            EventSystem.ensureUpdateMeshUI(ThreeMeshUI, this.context, true);
+        this.previousParent = this.gameObject.parent;
+        if ((this.context.xr?.isVR || this.context.xr?.isPassThrough) && this.screenspace) {
+            // see https://linear.app/needle/issue/NE-4114
+            this.gameObject.visible = false;
+            this.gameObject.removeFromParent();
             return;
         }
-        this.previousParent = this.gameObject.parent;
         // console.log(this.previousParent?.name + "/" + this.gameObject.name);
         if (this.renderOnTop || this.screenspace) {
@@ -231,7 +243,12 @@
     }
     onAfterRenderRoutine = () => {
-        if(this.context.isInVR) return;
+        if ((this.context.xr?.isVR || this.context.xr?.isPassThrough) && this.screenspace) {
+            this.previousParent?.add(this.gameObject);
+            // this is currently causing an error during XR (https://linear.app/needle/issue/NE-4114)
+            // this.gameObject.visible = true;
+            return;
+        }
         if ((this.screenspace || this.renderOnTop) && this.previousParent && this.context.mainCamera) {
             if (this.screenspace) {
                 const camObj = this.context.mainCamera;
@@ -276,7 +293,7 @@
         for (const ch of this._rectTransforms) {
             if (matrixWorldChanged) ch.markDirty();
             let layout = this._layoutGroups.get(ch.gameObject);
-            if(ch.isDirty && !layout){
+            if (ch.isDirty && !layout) {
                 layout = ch.gameObject.getComponentInParent(LayoutGroup) as LayoutGroup;
             }
             if (ch.isDirty || layout?.isDirty) {

src/engine-components/Component.ts CHANGED Viewed

@@ -6,7 +6,7 @@
 import { syncDestroy, syncInstantiate } from "../engine/engine_networking_instantiate.js";
 import type { ConstructorConcrete, SourceIdentifier, IComponent, IGameObject, Constructor, GuidsMap, Collision, ICollider } from "../engine/engine_types.js";
 import { addNewComponent, destroyComponentInstance, findObjectOfType, findObjectsOfType, getComponent, getComponentInChildren, getComponentInParent, getComponents, getComponentsInChildren, getComponentsInParent, getOrAddComponent, moveComponentInstance, removeComponent } from "../engine/engine_components.js";
-import { findByGuid, destroy, InstantiateOptions, instantiate, HideFlags, foreachComponent, markAsInstancedRendered, isActiveInHierarchy, isActiveSelf, isUsingInstancing, setActive, isDestroyed } from "../engine/engine_gameobject.js";
+import { findByGuid, destroy, InstantiateOptions, instantiate, HideFlags, foreachComponent, markAsInstancedRendered, isActiveInHierarchy, isActiveSelf, isUsingInstancing, setActive, isDestroyed, IInstantiateOptions } from "../engine/engine_gameobject.js";
 import { Euler, Object3D, Quaternion, Scene, Vector3 } from "three";
 import { showBalloonWarning, isDevEnvironment } from "../engine/debug/index.js";
@@ -74,7 +74,7 @@
      * @param instance object to instantiate
      * @param opts options for the instantiation
      */
-    public static instantiateSynced(instance: GameObject | Object3D | null, opts: InstantiateOptions): GameObject | null {
+    public static instantiateSynced(instance: GameObject | Object3D | null, opts: IInstantiateOptions): GameObject | null {
         if (!instance) return null;
         return syncInstantiate(instance as any, opts) as GameObject | null;
     }
@@ -83,7 +83,7 @@
      * @param instance object to instantiate
      * @param opts options for the instantiation (e.g. with what parent, position, etc.)
     */
-    public static instantiate(instance: GameObject | Object3D | null, opts: InstantiateOptions | null = null): GameObject | null {
+    public static instantiate(instance: GameObject | Object3D | null, opts: IInstantiateOptions | null = null): GameObject | null {
         return instantiate(instance, opts) as GameObject | null;
     }

src/engine/engine_addressables.ts CHANGED Viewed

@@ -7,7 +7,7 @@
 import { download } from "./engine_web_api.js";
 import { getLoader } from "./engine_gltf.js";
 import type { IComponent, IGameObject, SourceIdentifier } from "./engine_types.js";
-import { destroy, instantiate, InstantiateOptions, isDestroyed } from "./engine_gameobject.js";
+import { destroy, IInstantiateOptions, instantiate, InstantiateOptions, isDestroyed } from "./engine_gameobject.js";
 const debug = getParam("debugaddressables");
@@ -245,12 +245,12 @@
     }
     /** loads and returns a new instance of `asset` */
-    async instantiate(parent?: Object3D | InstantiateOptions) {
+    async instantiate(parent?: Object3D | IInstantiateOptions) {
         return this.onInstantiate(parent, false);
     }
     /** loads and returns a new instance of `asset` - this call is networked so an instance will be created on all connected users */
-    async instantiateSynced(parent?: Object3D | InstantiateOptions, saveOnServer: boolean = true) {
+    async instantiateSynced(parent?: Object3D | IInstantiateOptions, saveOnServer: boolean = true) {
         return this.onInstantiate(parent, true, saveOnServer);
     }

src/engine/engine_context.ts CHANGED Viewed

@@ -26,7 +26,7 @@
 import { LightDataRegistry, type ILightDataRegistry } from './engine_lightdata.js';
 import { PlayerViewManager } from './engine_playerview.js';
-import { type CoroutineData, type GLTF, type ICamera, type IComponent, type IContext, type ILight, type LoadedGLTF } from "./engine_types.js";
+import { INeedleXRSession, type CoroutineData, type GLTF, type ICamera, type IComponent, type IContext, type ILight, type LoadedGLTF } from "./engine_types.js";
 import { destroy, foreachComponent } from './engine_gameobject.js';
 import { ContextEvent, ContextRegistry } from './engine_context_registry.js';
 import { delay, getParam } from './engine_utils.js';
@@ -247,10 +247,14 @@
 		return this._domY;
 	}
 	get isInXR() { return this.renderer?.xr?.isPresenting || false; }
-	// TODO: can we get the session mode from the xr session without relying on the initiator to set it?
-	xrSessionMode: XRSessionMode | undefined = undefined;
+	/** shorthand for `NeedleXRSession.active`
+	 * Automatically set by NeedleXRSession when a XR session is active */
+	xr: INeedleXRSession | null = null;
+	get xrSessionMode() { return this.xr?.mode; }
 	get isInVR() { return this.xrSessionMode === "immersive-vr"; }
 	get isInAR() { return this.xrSessionMode === "immersive-ar"; }
+	/** If a XR session is active and in pass through mode (immersive-ar on e.g. Quest) */
+	get isInPassThrough() { return this.xr ? this.xr.isPassThrough : false; }
 	/** access the raw `XRSession` object (shorthand for `context.renderer.xr.getSession()`). For more control use `NeedleXRSession.active` */
 	get xrSession() { return this.renderer?.xr?.getSession(); }
 	/** @returns the latest XRFrame (if a XRSession is currently active)
@@ -438,7 +442,7 @@
 	private _disposeCallbacks: Function[] = [];
 	/** will request a renderer size update the next render call (will call updateSize the next update) */
 	requestSizeUpdate() { this._sizeChanged = true; }
@@ -495,7 +499,7 @@
 	async create(opts?: ContextCreateArgs) {
 		try {
 			this._isCreating = true;
-			if(opts !== this._originalCreationArgs)
+			if (opts !== this._originalCreationArgs)
 				this._originalCreationArgs = utils.deepClone(opts);
 			window.addEventListener("unhandledrejection", this.onUnhandledRejection)
 			const res = await this.internalOnCreate(opts);
@@ -725,7 +729,7 @@
 	private async internalOnCreate(opts?: ContextCreateArgs) {
 		const createId = ++this._createId;
-		if(debug) console.log("Creating context", this.name, opts);
+		if (debug) console.log("Creating context", this.name, opts);
 		this.clear();
 		// stop the animation loop if its running during creation
@@ -920,7 +924,7 @@
 			}
 			args?.onLoadingStart?.call(this, i, file);
-			if(debug) console.log("Context Load " + file);
+			if (debug) console.log("Context Load " + file);
 			const res = await loader.loadSync(this, file, file, loadingHash, prog => {
 				progressArg.name = file;
 				progressArg.progress = prog;
@@ -996,7 +1000,7 @@
 			catch (err) {
 				this._renderlooperrors += 1;
 				if ((isDevEnvironment() || debug) && (err instanceof Error || err instanceof TypeError))
-					showBalloonMessage("Caught unhandled exception during render-loop.<br/>Stopping renderloop...<br/>See console for details.", LogType.Error);
+					showBalloonMessage(`Caught unhandled exception during render-loop - see console for details.`, LogType.Error);
 				console.error(err);
 				if (this._renderlooperrors > 10) {
 					console.warn("Stopping render loop due to error")

src/engine/engine_gameobject.ts CHANGED Viewed

@@ -28,20 +28,28 @@
     HideAndDontSave = DontSave | NotEditable | HideInHierarchy, // 0x0000003D
 }
+export type IInstantiateOptions = {
+    idProvider?: UIDProvider;
+    //** parent guid or object */
+    parent?: string | Object3D;
+    position?: Vector3;
+    /** for duplicatable parenting */
+    keepWorldPosition?: boolean;
+    rotation?: Quaternion;
+    scale?: Vector3;
+    /** if the instantiated object should be visible */
+    visible?: boolean;
+    context?: Context;
+}
-export class InstantiateOptions {
+export class InstantiateOptions implements IInstantiateOptions {
     idProvider?: UIDProvider | undefined;
-    //** parent guid */
     parent?: string | undefined | Object3D;
-    /** for duplicatable parenting */
     keepWorldPosition?: boolean
     position?: Vector3 | undefined;
     rotation?: Quaternion | undefined;
     scale?: Vector3 | undefined;
     visible?: boolean | undefined;
     context?: Context | undefined;
 }

src/engine/engine_input.ts CHANGED Viewed

@@ -13,7 +13,7 @@
     ray?: Ray;
     /** The control object for this input. In the case of spatial devices the controller,
      * otherwise a generated object in screen space. The object may not be in the scene. */
-    device: Object3D;
+    device: IGameObject;
     buttonName: ButtonName | "none";
 }
@@ -26,7 +26,7 @@
     /** A ray in worldspace for the event */
     readonly ray?: Ray;
     /** The device space (this object is not necessarily rendered in the scene but you can access or copy the matrix) */
-    readonly space: Object3D;
+    readonly space: IGameObject;
     isClick: boolean = false;
     isDoubleClick: boolean = false;
@@ -335,7 +335,7 @@
     private _pointerEvent: Event[] = [];
     private _pointerUsed: boolean[] = [];
     /** This is added/updated for pointers. screenspace pointers set this to the camera near plane  */
-    private _pointerSpace: Object3D[] = [];
+    private _pointerSpace: IGameObject[] = [];
     getKeyDown(): string | null {
         for (const key in this.keysPressed) {
@@ -658,10 +658,10 @@
     private readonly tempNearPlaneVector = new Vector3();
     private readonly tempFarPlaneVector = new Vector3();
     private readonly tempLookMatrix = new Matrix4();
-    private getAndUpdateSpatialObjectForScreenPosition(id: number, screenX: number, screenY: number): Object3D {
+    private getAndUpdateSpatialObjectForScreenPosition(id: number, screenX: number, screenY: number): IGameObject {
         let space = this._pointerSpace[id]
         if (!space) {
-            space = new Object3D();
+            space = new Object3D() as unknown as IGameObject;
             this._pointerSpace[id] = space;
         }
         this._pointerSpace[id] = space;

src/engine/engine_networking.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 const defaultNetworkingBackendUrlProvider = "https://urls.needle.tools/default-networking-backend/index";
 let serverUrl: string | undefined = "wss://needle-tiny-starter.glitch.me/socket";
-import { Websocket, type WebsocketBuilder } from 'websocket-ts';
+import { type Websocket } from 'websocket-ts';
 // import { Networking } from '../engine-components/Networking.js';
 import { Context } from './engine_setup.js';
 import * as utils from "./engine_utils.js";
@@ -14,6 +14,7 @@
 export const debugNet = utils.getParam("debugnet") ? true : false;
 export const debugOwner = debugNet || utils.getParam("debugowner") ? true : false;
+const debugnetBin = utils.getParam("debugnetbin");
 export interface INetworkingWebsocketUrlProvider {
     getWebsocketUrl(): string | null;
@@ -389,7 +390,7 @@
     /** Send a binary message to the server (broadcasted to all connected users) */
     public sendBinary(bin: Uint8Array) {
-        if (debugNet) console.log("<< bin", bin.length);
+        if (debugnetBin) console.log("<< send binary", this.context.time.frame, (bin.length / 1024) + " KB");
         this._ws?.send(bin);
     }
@@ -547,10 +548,11 @@
                     console.error("⊠ Websocket error", i, ev);
                     resolve(false);
                 })
-                .onMessage(this.onMessage.bind(this))
                 .onRetry(() => { console.log("Retry connecting to networking websocket") })
                 .build();
+            ws.addEventListener(pkg.WebsocketEvent.message, (socket, msg) => {
+                this.onMessage(socket, msg);
+            });
         });
     }
@@ -581,6 +583,7 @@
     }
     private async handleIncomingBinaryMessage(blob: Blob) {
+        if (debugnetBin) console.log("<< bin", this.context.time.frame);
         const buf = await blob.arrayBuffer();
         var data = new Uint8Array(buf);
         const bb = new flatbuffers.ByteBuffer(data);

src/engine/engine_types.ts CHANGED Viewed

@@ -97,6 +97,16 @@
     stopAllCoroutinesFrom(script: IComponent);
 }
+export interface INeedleXRSession {
+    get running(): boolean;
+    readonly mode: XRSessionMode;
+    readonly session: XRSession;
+    get isVR();
+    get isAR();
+    get isPassThrough();
+}
 export declare interface INeedleEngineComponent extends HTMLElement {
     getAROverlayContainer(): HTMLElement;
     onEnterAR(session: XRSession, overlayContainer: HTMLElement);

src/engine/xr/NeedleXRController.ts CHANGED Viewed

@@ -1,6 +1,6 @@
-import { AxesHelper, Object3D, Quaternion, Ray, Vector3 } from "three";
+import { AxesHelper, Int8BufferAttribute, Object3D, Quaternion, Ray, Vector3 } from "three";
 import { MotionController, fetchProfile } from "@webxr-input-profiles/motion-controllers";
-import type { ButtonName, Vec3, XRControllerButtonName } from "../engine_types.js";
+import type { ButtonName, IGameObject, Vec3, XRControllerButtonName } from "../engine_types.js";
 import { Context } from "../engine_context.js";
 import { Gizmos } from "../engine_gizmos.js";
 import { InputEvents, NEPointerEventInit, PointerType, NEPointerEvent } from "../engine_input.js";
@@ -178,7 +178,7 @@
      * Children will be automatically detached and put into the scene when the controller disconnects
      */
     get object() { return this._object; }
-    private readonly _object: Object3D;
+    private readonly _object: IGameObject;
     private readonly _debugAxesHelper = new AxesHelper(.03);
@@ -191,7 +191,7 @@
         this.xr = session;
         this.inputSource = device;
         this.index = index;
-        this._object = new Object3D();
+        this._object = new Object3D() as unknown as IGameObject;
         if (debug)
             this._object.add(this._debugAxesHelper);
         this.xr.context.scene.add(this._object);
@@ -321,7 +321,7 @@
      * @param key the controller button name e.g. x-button
      * @returns the gamepad button if it exists on the controller - otherwise undefined
      */
-    getButton(key: ButtonName | "primary-button" | "primary"): GamepadButton | undefined {
+    getButton(key: ButtonName | "primary-button" | "primary"): NeedleGamepadButton | undefined {
         if (!this._layout) return undefined;
         switch (key) {
@@ -331,21 +331,21 @@
                 else return undefined;
                 break;
             case "primary":
-                return this.inputSource.gamepad?.buttons[0];
+                return this.toNeedleGamepadButton(0);
         }
-        if (this._buttonMap.has(key))
-            return this._buttonMap.get(key)!;
+        if (this._buttonMap.has(key)) {
+            return this.toNeedleGamepadButton(this._buttonMap.get(key)!);
+        }
         const componentModel = this._layout?.components[key];
         if (componentModel?.gamepadIndices) {
             switch (componentModel.type) {
                 case "button":
                     if (this.inputSource.gamepad) {
                         const index = componentModel.gamepadIndices!.button!;
-                        const button = this.inputSource.gamepad?.buttons[index];
-                        this._buttonMap.set(key, button);
-                        return button;
+                        this._buttonMap.set(key, index);
+                        return this.toNeedleGamepadButton(index);
                     }
                     break;
                 default:
@@ -357,6 +357,25 @@
         return undefined;
     }
+    private readonly _needleGamepadButtons = new Array<NeedleGamepadButton>();
+    /** combine the InputState information + the GamepadButton information (since GamepadButtons can not be extended) */
+    private toNeedleGamepadButton(index: number): NeedleGamepadButton {
+        const button = this.inputSource.gamepad?.buttons[index];
+        const state = this.states[index];
+        const needleButton = this._needleGamepadButtons[index] || new NeedleGamepadButton();
+        if (button) {
+            needleButton.pressed = button.pressed;
+            needleButton.value = button.value;
+            needleButton.touched = button.touched;
+        }
+        if (state) {
+            needleButton.isDown = state.isDown;
+            needleButton.isUp = state.isUp;
+        }
+        this._needleGamepadButtons[index] = needleButton;
+        return needleButton;
+    }
     /**
      * Get the values of a controller joystick
      * @link https://github.com/immersive-web/webxr-gamepads-module/blob/main/gamepads-module-explainer.md
@@ -394,7 +413,7 @@
     }
-    private readonly _buttonMap = new Map<ButtonName, GamepadButton>();
+    private readonly _buttonMap = new Map<ButtonName, number>();
     // the motion controller contains the controller scheme, we use this to simplify button access
     private _motioncontroller?: MotionController;
@@ -506,11 +525,19 @@
                 // is down
                 if (button.pressed && !state.pressed) {
                     inputEvent = InputEvents.PointerDown;
+                    state.isDown = true;
+                    state.isUp = false;
                 }
                 // is up
                 else if (!button.pressed && state.pressed) {
                     inputEvent = InputEvents.PointerUp;
+                    state.isDown = false;
+                    state.isUp = true;
                 }
+                else {
+                    state.isDown = false;
+                    state.isUp = false;
+                }
                 state.value = button.value;
                 state.pressed = button.pressed;
@@ -553,6 +580,22 @@
 }
 class InputState {
+    /** if the button was pressed the last update */
+    isDown: boolean = false;
+    /** if the button was released the last update */
+    isUp: boolean = false;
     pressed: boolean = false;
     value: number = 0;
-}
+};
+/** Enhanced GamepadButton with `isDown` and `isUp` information */
+class NeedleGamepadButton {
+    touched: boolean = false;
+    pressed: boolean = false;
+    value: number = 0;
+    /** was the button just pressed down the last update */
+    isDown: boolean = false;
+    /** was the button just released the last update */
+    isUp: boolean = false;
+}

src/engine/xr/NeedleXRSession.ts CHANGED Viewed

@@ -7,7 +7,7 @@
 import type { IXRRig } from "./XRRig.js";
 import { ImplictXRRig, flipForwardMatrix, flipForwardQuaternion } from "./internal.js";
 import { delay, getParam, isDesktop, isQuest } from "../engine_utils.js";
-import { ICamera, IComponent } from "../engine_types.js";
+import { ICamera, IComponent, INeedleXRSession } from "../engine_types.js";
 import { NeedleXRSync } from "./NeedleXRSync.js";
 import { isDevEnvironment, showBalloonMessage, showBalloonWarning } from "../debug/index.js";
 import { registerFrameEventCallback, unregisterFrameEventCallback } from "../engine_lifecycle_functions_internal.js";
@@ -131,7 +131,7 @@
  * - Listen to XRSession controller removed events with `NeedleXRSession.onControllerRemoved(...)`
  *
  */
-export class NeedleXRSession {
+export class NeedleXRSession implements INeedleXRSession {
     private static _sync: NeedleXRSync | null = null;
     static getXRSync(context: Context) {
@@ -386,7 +386,7 @@
     }
     /** Returns true if the xr session is still active */
-    get running() { return !this._ended && this.session; }
+    get running(): boolean { return !this._ended && this.session != null; }
     /**
      * @link https://developer.mozilla.org/en-US/docs/Web/API/XRSession
@@ -438,6 +438,9 @@
             if (this.controllers.some(c => c.inputSource.targetRayMode === "tracked-pointer"))
                 return true;
         }
+        if (isDevEnvironment() && isDesktop() && this.mode === "immersive-ar") {
+            return true;
+        }
         return false;
     }
     get isAR() { return this.mode === 'immersive-ar'; }
@@ -658,9 +661,9 @@
         this.session = session;
         this.mode = mode;
         this.context = context;
-        this.context.xrSessionMode = this.mode;
         this.context.renderer.xr.enabled = true;
         this.context.renderer.xr.setSession(this.session);
+        this.context.xr = this;
         this._xr_scripts = [...extra.scripts];
         this._xr_update_scripts = this._xr_scripts.filter(e => typeof e.onUpdateXR === "function");
@@ -767,8 +770,8 @@
         const index2 = this.context.post_render_callbacks.indexOf(this.onAfter);
         if (index2 >= 0) this.context.post_render_callbacks.splice(index2, 1);
+        this.context.xr = null;
         this.context.renderer.xr.enabled = false;
-        this.context.xrSessionMode = undefined;
         this.context.mainCameraComponent?.applyClearFlags();
         // make sure we disconnect all controllers
@@ -834,6 +837,9 @@
         const frame = context.xrFrame;
         if (!frame) return;
+        // ensure that XR is always set to a running session
+        this.context.xr = this;
         // ensure that we always have the correct main camera reference
         // we need to store the main camera reference here because the main camera can be disabled and then it's removed from the context
         // but in XR we want to ensure we always have a active camera (or at least parent the camera to the active rig)
@@ -911,6 +917,7 @@
                     continue;
                 }
                 if (!script.activeAndEnabled) {
+                    this.context.new_scripts_xr.splice(i, 1);
                     this.markInactive(script);
                     continue;
                 }
@@ -1017,10 +1024,10 @@
     /** mark a script as inactive and invokes callbacks */
     private markInactive(script: INeedleXRSessionEventReceiver) {
-        if (this._inactive_scripts.includes(script)) return;
+        if (this._inactive_scripts.indexOf(script) >= 0) return;
+        // inactive scripts should not receive any regular callbacks anymore
+        this.removeScript(script, false);
         this._inactive_scripts.push(script);
-        // inactive scripts should not receive any regular callbacks anymore
-        this.removeScript(script);
         // inactive scripts receive callbacks as if the XR session has ended
         for (const ctrl of this.controllers) this.invokeCallback_ControllerRemoved(script, ctrl);
         this.invokeCallback_LeaveXR(script);
@@ -1041,14 +1048,16 @@
     private readonly _script_to_remove: INeedleXRSessionEventReceiver[] = [];
-    private removeScript(script: INeedleXRSessionEventReceiver) {
+    private removeScript(script: INeedleXRSessionEventReceiver, removeCompletely: boolean = true) {
         if (debug) console.log("Remove XRScript", script);
         const index = this._xr_scripts.indexOf(script);
         if (index >= 0) this._xr_scripts.splice(index, 1);
         const index2 = this._xr_update_scripts.indexOf(script);
         if (index2 >= 0) this._xr_update_scripts.splice(index2, 1);
-        const index3 = this._inactive_scripts.indexOf(script);
-        if (index3 >= 0) this._inactive_scripts.splice(index3, 1);
+        if (removeCompletely) {
+            const index3 = this._inactive_scripts.indexOf(script);
+            if (index3 >= 0) this._inactive_scripts.splice(index3, 1);
+        }
     }
     private invokeCallback_EnterXR(script: INeedleXRSessionEventReceiver) {

src/engine-components/SyncedTransform.ts CHANGED Viewed

@@ -10,6 +10,7 @@
 import { Transform } from '../engine-schemes/transform.js';
 import { registerBinaryType } from '../engine-schemes/schemes.js';
 import { setWorldEuler } from '../engine/engine_three_utils.js';
+import { onUpdate } from '../engine/engine_lifecycle_api.js';
 const debug = utils.getParam("debugsync");
 export const SyncedTransformIdentifier = "STRS";
@@ -35,8 +36,19 @@
 }
+let FAST_ACTIVE_SYNCTRANSFORMS = 0;
+let FAST_INTERVAL = 0;
+onUpdate((ctx) => {
+    const isRunningOnGlitch = ctx.connection.currentServerUrl?.includes("glitch");
+    const threshold = isRunningOnGlitch ? 10 : 40;
+    FAST_INTERVAL = Math.floor(FAST_ACTIVE_SYNCTRANSFORMS / threshold);
+    FAST_ACTIVE_SYNCTRANSFORMS = 0;
+    if(debug && FAST_INTERVAL > 0) console.log("Sync Transform Fast Interval", FAST_INTERVAL);
+})
 export class SyncedTransform extends Behaviour {
     // public autoOwnership: boolean = true;
     public overridePhysics: boolean = true
     public interpolatePosition: boolean = true;
@@ -293,8 +305,12 @@
         const updateInterval = 10;
         const fastUpdate = this.rb || this.fastMode;
         if (this._needsUpdate && (updateInterval <= 0 || updateInterval > 0 && this.context.time.frameCount % updateInterval === 0 || fastUpdate)) {
+            FAST_ACTIVE_SYNCTRANSFORMS++;
+            if (fastUpdate && FAST_INTERVAL > 0 && this.context.time.frameCount % FAST_INTERVAL !== 0) return;
             if (debug)
                 console.log("send update", this.context.connection.connectionId, this.guid, this.gameObject.name, this.gameObject.guid);

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

@@ -108,13 +108,17 @@
     }
     private async handleOfferSession() {
-        const hasVRSupport = await NeedleXRSession.isVRSupported();
-        if (hasVRSupport) {
-            return NeedleXRSession.offerSession("immersive-vr", "default", this.context);
+        if (this.createVRButton) {
+            const hasVRSupport = await NeedleXRSession.isVRSupported();
+            if (hasVRSupport && this.createVRButton) {
+                return NeedleXRSession.offerSession("immersive-vr", "default", this.context);
+            }
         }
-        const hasARSupport = await NeedleXRSession.isARSupported();
-        if (hasARSupport) {
-            return NeedleXRSession.offerSession("immersive-ar", "default", this.context);
+        if (this.createARButton) {
+            const hasARSupport = await NeedleXRSession.isARSupported();
+            if (hasARSupport && this.createARButton) {
+                return NeedleXRSession.offerSession("immersive-ar", "default", this.context);
+            }
         }
         return false;
     }