@needle-tools/engine 4.12.0-next.fb75c78 → 4.12.0

package/src/engine-components/SceneSwitcher.ts

@@ -1,7 +1,7 @@
 import { EquirectangularReflectionMapping, Object3D, Scene, Texture } from "three";
 
 import { AssetReference } from "../engine/engine_addressables.js";
-import { destroy } from "../engine/engine_gameobject.js";
+import { destroy, instantiate } from "../engine/engine_gameobject.js";
 import { InputEvents } from "../engine/engine_input.js";
 import { isLocalNetwork } from "../engine/engine_networking_utils.js";
 import { serializable } from "../engine/engine_serialization.js";
@@ -247,14 +247,23 @@ export class SceneSwitcher extends Behaviour {
 
     private _currentIndex: number = -1;
     private _currentScene: AssetReference | undefined = undefined;
+    private _currentSceneAsset: Object3D | undefined = undefined;
     private _engineElementOverserver: MutationObserver | undefined = undefined;
 
     private _preloadScheduler?: PreLoadScheduler;
 
     private _menuButtons?: HTMLElement[];
 
+    // this is the scene that was requested last
+    private __lastSwitchScene?: AssetReference;
+    private __lastSwitchScenePromise?: Promise<boolean>;
+
     /** @internal */
     awake(): void {
+        this._currentScene = undefined;
+        this._lastLoadingScene = undefined;
+        this.__lastSwitchScenePromise = undefined;
+
         if (this.scenes === undefined) this.scenes = [];
         // remove all scenes from the url that are in the scenes array at startup
         for (const scene of this.scenes) {
@@ -538,10 +547,6 @@ export class SceneSwitcher extends Behaviour {
         return false;
     }
 
-    // this is the scene that was requested last
-    private __lastSwitchScene?: AssetReference;
-    private __lastSwitchScenePromise?: Promise<boolean>;
-
     /**
      * Switch to a scene by its AssetReference.  
      * If the scene is already loaded it will be unloaded and the new scene will be loaded.  
@@ -601,13 +606,15 @@ export class SceneSwitcher extends Behaviour {
                 const res = sceneListener.sceneClosing();
                 if (res instanceof Promise) await res;
             }
-            // if the current scene has a URL (so it can be reloaded)
-            // then we unload it
-            if (current.hasUrl)
+
+            // // if the current scene has a URL (so it can be reloaded)
+            // // then we unload it
+            if (current.hasUrl) {
                 current.unload();
-            // otherwise if it's a regular Object3D we just remove it from the scene
-            else if (current.asset instanceof Object3D) {
-                GameObject.remove(current.asset as any as Object3D);
+                if (this._currentSceneAsset) destroy(this._currentSceneAsset, true, false);
+            }
+            else {
+                GameObject.remove(this._currentSceneAsset);
             }
         }
     }
@@ -658,7 +665,6 @@ export class SceneSwitcher extends Behaviour {
                 if (debug) console.log("[SceneSwitcher] ADD", scene.url);
                 this._currentScene = scene;
 
-
                 // Experimental: replace the whole content of the scene
                 if (experimental_clearSceneOnLoad) {
                     const camera = this.context.mainCameraComponent?.gameObject || this.context.mainCamera;
@@ -672,7 +678,14 @@ export class SceneSwitcher extends Behaviour {
                     }
                 }
 
-                GameObject.add(scene.asset, this.gameObject);
+                // @TODO: if multiple scene switcher or scenes use this asset already it will be moved
+                if (!scene.asset.parent) {
+                    this._currentSceneAsset = scene.asset;
+                    GameObject.add(scene.asset, this.gameObject);
+                }
+                else {
+                    this._currentSceneAsset = instantiate(scene.asset, { parent: this.gameObject });
+                }
 
                 if (this.useSceneLighting)
                     this.context.sceneLighting.enable(scene);

package/src/engine-components/export/usdz/extensions/behavior/BehaviourComponents.ts

@@ -11,6 +11,7 @@ import { Animation } from "../../../../Animation.js";
 import { Animator } from "../../../../Animator.js";
 import { AudioSource } from "../../../../AudioSource.js";
 import { Behaviour, GameObject } from "../../../../Component.js";
+import { Rigidbody } from "../../../../RigidBody.js";
 import type { IPointerClickHandler, PointerEventData } from "../../../../ui/PointerEvents.js";
 import { ObjectRaycaster,Raycaster } from "../../../../ui/Raycaster.js";
 import { makeNameSafeForUSD,USDDocument, USDObject, USDZExporterContext } from "../../ThreeUSDZExporter.js";
@@ -68,6 +69,16 @@ export class ChangeTransformOnClick extends Behaviour implements IPointerClickHa
     }
 
     onPointerClick(args: PointerEventData) {
+
+        const rbs = this.object?.getComponentsInChildren(Rigidbody);
+
+        if (rbs){
+            for (const rb of rbs) {	
+                rb.resetVelocities();
+                rb.resetForcesAndTorques();
+            }
+        }
+
         args.use();
         if (this.coroutine) this.stopCoroutine(this.coroutine);
         if (!this.relativeMotion)

package/src/engine-components/webxr/WebARSessionRoot.ts

@@ -10,6 +10,7 @@ import type { IComponent, IGameObject } from "../../engine/engine_types.js";
 import { DeviceUtilities, getParam } from "../../engine/engine_utils.js";
 import { NeedleXRController, type NeedleXREventArgs, type NeedleXRHitTestResult, NeedleXRSession } from "../../engine/engine_xr.js";
 import { Behaviour, GameObject } from "../Component.js";
+import type { WebXR } from "./WebXR.js";
 
 // https://github.com/takahirox/takahirox.github.io/blob/master/js.mmdeditor/examples/js/controls/DeviceOrientationControls.js
 
@@ -20,14 +21,17 @@ const invertForwardMatrix = new Matrix4().makeRotationY(Math.PI);
 
 /**
  * The WebARSessionRoot is the root object for a WebAR session and used to place the scene in AR.  
- * It is also responsible for scaling the user in AR and to define the center of the AR scene. If not present in the scene it will be created automatically by the WebXR component when entering an AR session.
+ * It is also responsible for scaling the user in AR and to define the center of the AR scene.  
+ * If not present in the scene it will be created automatically by the WebXR component when entering an AR session.
  * 
- * @example 
+ * **Note**: If the WebXR component {@link WebXR.autoCenter} option is enabled the scene will be automatically centered based on the content in the scene.  
+ * 
+ * @example Callback when the scene has been placed in AR:
  * ```ts
  * WebARSessionRoot.onPlaced((args) => {
  *    console.log("Scene has been placed in AR");
  * });
- * ```
+ * ```  
  * 
  * @summary Root object for WebAR sessions, managing scene placement and user scaling in AR.
  * @category XR

package/src/engine-components/webxr/WebXR.ts

@@ -23,7 +23,7 @@ const debug = getParam("debugwebxr");
 const debugQuicklook = getParam("debugusdz");
 
 /**
- * Use the WebXR component to enable VR, AR and Quicklook on iOS in your scene.  
+ * Use the WebXR component to enable VR and AR on iOS and Android in your scene. VisionOS support is also provided via QuickLook USDZ export.  
  * 
  * The WebXR component is a simple to use wrapper around the {@link NeedleXRSession} API and adds some additional features like creating buttons for AR, VR, enabling default movement behaviour ({@link XRControllerMovement}) and controller rendering ({@link XRControllerModel}), as well as handling AR placement and Quicklook USDZ export.
  * 
@@ -146,7 +146,9 @@ export class WebXR extends Behaviour {
 
     /**
      * When enabled, the AR session root center will be automatically adjusted to place the center of the scene.  
-     * This helps ensure the scene is properly aligned with detected surfaces.
+     * This helps ensure the scene is properly aligned with detected surfaces.  
+     * 
+     * **Note**: This option overrides the placement of the {@link WebARSessionRoot} component if both are used.
      */
     @serializable()
     autoCenter: boolean = false;