Needle Engine 3.48.0

Files changed (28) hide show

plugins/vite/poster.js +17 -11
src/engine-components/export/usdz/extensions/behavior/Actions.ts +1 -1
src/engine-components/export/usdz/extensions/Animation.ts +18 -14
src/engine-components/export/usdz/extensions/behavior/Behaviour.ts +58 -1
src/engine-components/export/usdz/extensions/behavior/BehaviourComponents.ts +4 -4
src/engine-components/export/usdz/extensions/behavior/BehavioursBuilder.ts +8 -3
src/engine/engine_components.ts +2 -2
src/engine/engine_input.ts +6 -1
src/engine/engine_loaders.ts +2 -14
src/engine/engine_physics_rapier.ts +8 -6
src/engine/engine_three_utils.ts +8 -1
src/engine/engine_types.ts +5 -2
src/engine-components/ui/EventSystem.ts +1 -1
src/engine-components/utils/LookAt.ts +2 -2
src/engine/webcomponents/needle menu/needle-menu-spatial.ts +19 -3
src/engine/webcomponents/needle menu/needle-menu.ts +8 -0
src/engine/xr/NeedleXRController.ts +70 -19
src/engine/xr/NeedleXRSession.ts +2 -1
src/engine-components/postprocessing/PostProcessingEffect.ts +2 -0
src/engine-components/postprocessing/PostProcessingHandler.ts +1 -1
src/engine-components/RigidBody.ts +4 -0
src/engine-components/SceneSwitcher.ts +8 -3
src/engine-components/export/usdz/ThreeUSDZExporter.ts +318 -42
src/engine-components/export/usdz/USDZExporter.ts +2 -0
src/engine-components/export/usdz/extensions/USDZText.ts +3 -2
src/engine-components/export/usdz/extensions/USDZUI.ts +2 -2
src/engine-components/postprocessing/Volume.ts +11 -0
src/engine-components/webxr/WebXRImageTracking.ts +2 -3

plugins/vite/poster.js CHANGED Viewed

@@ -34,18 +34,24 @@
                         return;
                     }
                 }
-                const targetPath = "./" + getPosterPath();
-                console.log("Received poster, saving to " + targetPath);
-                // remove data:image/png;base64, from the beginning of the string
-                if (targetPath.endsWith(".webp"))
-                    data.data = data.data.replace(/^data:image\/webp;base64,/, "");
-                else
-                    data.data = data.data.replace(/^data:image\/png;base64,/, "");
-                const dir = path.dirname(targetPath);
-                if (!fs.existsSync(dir)) {
-                    fs.mkdirSync(dir, { recursive: true })
+                try {
+                    const targetPath = "./" + getPosterPath();
+                    console.debug(`Received poster, saving to ${targetPath}`);
+                    // remove data:image/png;base64, from the beginning of the string
+                    if (targetPath.endsWith(".webp"))
+                        data.data = data.data.replace(/^data:image\/webp;base64,/, "");
+                    else
+                        data.data = data.data.replace(/^data:image\/png;base64,/, "");
+                    const dir = path.dirname(targetPath);
+                    if (!fs.existsSync(dir)) {
+                        fs.mkdirSync(dir, { recursive: true })
+                    }
+                    fs.writeFileSync(targetPath, Buffer.from(data.data, "base64"));
+                    console.debug("Saved poster to file");
                 }
-                fs.writeFileSync(targetPath, Buffer.from(data.data, "base64"));
+                catch (err) {
+                    console.error("Failed to save poster", err.message);
+                }
             });
         },
         transformIndexHtml: {

src/engine-components/export/usdz/extensions/behavior/Actions.ts CHANGED Viewed

@@ -47,7 +47,7 @@
             USDObject.createEmptyParent(model);
         }
         const clone = model.clone();
-        if (this.matrix) clone.matrix = this.matrix;
+        if (this.matrix) clone.setMatrix(this.matrix);
         if (this.material) clone.material = this.material;
         if (this.geometry) clone.geometry = this.geometry;
         model.parent?.add(clone);

src/engine-components/export/usdz/extensions/Animation.ts CHANGED Viewed

@@ -812,11 +812,11 @@
             writer.appendLine( `uniform token[] joints = [${bonesArray}]` );
             writer.appendLine( `uniform token purpose = "guide"` );
             writer.appendLine( `uniform matrix4d[] restTransforms = [${rest.map( m => buildMatrix( m ) ).join( ', ' )}]` );
             // In glTF, transformations on the Skeleton are ignored (NODE_SKINNED_MESH_LOCAL_TRANSFORMS validator warning)
-            // So here we also just write an identity transform.
-            writer.appendLine( `matrix4d xformOp:transform = ${buildMatrix( new Matrix4() )}` );
-            // writer.appendLine( `matrix4d xformOp:transform = ${buildMatrix( matrix )}` );
-            writer.appendLine( `uniform token[] xformOpOrder = ["xformOp:transform"]` );
+            // So here we don't write anything to get an identity transform.
+            // writer.appendLine( `matrix4d xformOp:transform = ${buildMatrix( new Matrix4() )}` );
+            // writer.appendLine( `uniform token[] xformOpOrder = ["xformOp:transform"]` );
             const timeSampleObjects = createAllTimeSampleObjects ( boneAndInverse.map( x => x.bone ) );
@@ -902,6 +902,7 @@
         this.skinnedMeshExport(writer, _context);
         const object = this.object;
+        const model = this.model;
         // do we have animation data for this node? if not, return
         const arr = this.dict.get(object);
@@ -951,9 +952,6 @@
             useGrouping: false,
         });
-        const xFormOrder: Array<"xformOp:translate" | "xformOp:orient" | "xformOp:scale"> = [];
         function writeAnimationTimesamples(arr: TransformData[], type: "position" | "rotation" | "scale") {
             const hasAnimationData = arr.some(x => x && {
@@ -967,15 +965,15 @@
             switch (type) {
                 case "position":
-                    xFormOrder.push("xformOp:translate");
+                    model.needsTranslate = true;
                     writer.beginBlock(`double3 xformOp:translate.timeSamples = {`, '');
                     break;
                 case "rotation":
-                    xFormOrder.push("xformOp:orient");
+                    model.needsOrient = true;
                     writer.beginBlock(`quatf xformOp:orient.timeSamples = {`, '');
                     break;
                 case "scale":
-                    xFormOrder.push("xformOp:scale");
+                    model.needsScale = true;
                     writer.beginBlock(`double3 xformOp:scale.timeSamples = {`, '');
                     break;
             }
@@ -1027,10 +1025,16 @@
         writeAnimationTimesamples(arr, "rotation");
         writeAnimationTimesamples(arr, "scale");
-        if (xFormOrder.length > 0) {
-            const xformUnique = [...new Set(xFormOrder)];
-            writer.appendLine(`uniform token[] xformOpOrder = [${xformUnique.map(x => `"${x}"`).join(', ')}]`);
-        }
+        // We must be careful here that we don't overwrite the xformOpOrder that the object already had.
+        // it _might_ not even have any (if the position/quaternion/scale are all indentity values)
+        // so in some cases we end up writing the same xformOpOrder multiple times here...
+        // So right now, we just always write the xformOpOrder when traversing the hierarchy, in case something is animated.
+        // if (xFormOrder.length > 0) {
+            // const xformUnique = [...new Set(xFormOrder)];
+            // writer.appendLine(`uniform token[] xformOpOrder = [${xformUnique.map(x => `"${x}"`).join(', ')}]`);
+            // writer.appendLine('uniform token[] xformOpOrder = ["xformOp:translate", "xformOp:orient", "xformOp:scale"]');
+        // }
         // for (let i = 0; i < arr.length; i++) {
         //     const transformData = arr[i];

src/engine-components/export/usdz/extensions/behavior/Behaviour.ts CHANGED Viewed

@@ -3,7 +3,7 @@
 import type { IUSDExporterExtension } from "../../Extension.js";
 import type { USDObject, USDWriter, USDZExporterContext } from "../../ThreeUSDZExporter.js";
 import { AudioExtension } from "./AudioExtension.js";
-import type { BehaviorModel } from "./BehavioursBuilder.js";
+import { ActionModel, type BehaviorModel, GroupActionModel, IBehaviorElement, type Target, TriggerModel } from "./BehavioursBuilder.js";
 const debug = getParam("debugusdzbehaviours");
@@ -44,6 +44,11 @@
     private behaviourComponentsCopy: Array<UsdzBehaviour> = [];
     private audioClips: Array<{clipUrl: string, filesKey: string}> = [];
     private audioClipsCopy: Array<{clipUrl: string, filesKey: string}> = [];
+    private targetUuids: Set<string> = new Set();
+    getAllTargetUuids() {
+        return this.targetUuids;
+    }
     onBeforeBuildDocument(context: USDZExporterContext) {
         if (!context.root) return Promise.resolve();
@@ -88,6 +93,58 @@
         this.behaviourComponents.length = 0;
         this.audioClipsCopy = this.audioClips.slice();
         this.audioClips.length = 0;
+        // We want to know all trigger sources and action targets.
+        // These can be nested in Group Actions.
+        const triggerSources = new Set<Target>();
+        const actionTargets = new Set<Target>();
+        const targetUuids = new Set<string>();
+        function collect (actionModel: IBehaviorElement) {
+            if (actionModel instanceof GroupActionModel) {
+                for (const action of actionModel.actions) {
+                    collect(action);
+                }
+            }
+            else if (actionModel instanceof ActionModel) {
+                const affected = actionModel.affectedObjects;
+                if (affected) {
+                    if (typeof affected === "object")
+                        actionTargets.add(affected as Target);
+                    else if (typeof affected === "string")
+                        actionTargets.add({uuid: affected} as any as Target);
+                }
+                const xform = actionModel.xFormTarget;
+                if (xform) {
+                    if (typeof xform === "object")
+                        actionTargets.add(xform as Target);
+                    else if (typeof xform === "string")
+                        actionTargets.add({uuid: xform} as any as Target);
+                }
+            }
+        }
+        // collect all targets of all triggers and actions
+        for (const beh of this.behaviours) {
+            if (beh.trigger instanceof TriggerModel && typeof beh.trigger.targetId === "object" )
+                triggerSources.add(beh.trigger.targetId as Target);
+            collect(beh.action);
+        }
+        for (const source of new Set([...triggerSources, ...actionTargets])) {
+            // shouldn't happen but strictly speaking a trigger source could be set to an array
+            if (Array.isArray(source)) {
+                for (const s of source)
+                    targetUuids.add(s.uuid);
+            }
+            else
+                targetUuids.add(source.uuid);
+        }
+        if (debug) console.log("All Behavior trigger sources and action targets", triggerSources, actionTargets, targetUuids);
+        this.targetUuids = new Set(targetUuids);
     }
     onAfterHierarchy(context: USDZExporterContext, writer: USDWriter) {

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

@@ -1,4 +1,4 @@
-import { Material, Mesh, Object3D, Quaternion, Vector3 } from "three";
+import { Material, Matrix4, Mesh, Object3D, Quaternion, Vector3 } from "three";
 import { isDevEnvironment, showBalloonWarning } from "../../../../../engine/debug/index.js";
 import { serializable } from "../../../../../engine/engine_serialization_decorator.js";
@@ -334,7 +334,7 @@
             variant.displayName = variant.displayName + ": Variant with material " + this.variantMaterial.name;
             variant.material = this.variantMaterial;
             variant.geometry = target.geometry;
-            variant.matrix = target.matrix;
+            variant.transform = target.transform;
             if (!target.parent || !target.parent.isEmpty()) {
                 USDObject.createEmptyParent(target);
@@ -471,7 +471,7 @@
                     // We create clones exactly once for this gameObject, so that all SetActiveOnClick on the same object use the same trigger.
                     if (!this.gameObject[SetActiveOnClick.toggleClone]) {
                         const clone = this.selfModelClone.clone();
-                        clone.matrix.identity();
+                        clone.setMatrix(new Matrix4());
                         clone.name += "_toggle" + (SetActiveOnClick.clonedToggleIndex++);
                         originalModel.add(clone);
                         this.gameObject[SetActiveOnClick.toggleClone] = clone;
@@ -482,7 +482,7 @@
                     if (!this.gameObject[SetActiveOnClick.reverseToggleClone]) {
                         const clone = this.selfModelClone.clone();
-                        clone.matrix.identity();
+                        clone.setMatrix(new Matrix4());
                         clone.name += "_toggleReverse" + (SetActiveOnClick.clonedToggleIndex++);
                         originalModel.add(clone);
                         this.gameObject[SetActiveOnClick.reverseToggleClone] = clone;

src/engine-components/export/usdz/extensions/behavior/BehavioursBuilder.ts CHANGED Viewed

@@ -91,7 +91,7 @@
 }
-type Target = USDObject | USDObject[] | Object3D | Object3D[];
+export type Target = USDObject | USDObject[] | Object3D | Object3D[];
 const addedStrings = new Set<string>();
 /** called to resolve target objects to usdz paths */
@@ -134,11 +134,16 @@
         addedStrings.clear();
     }
     else if (typeof targetObject === "object") {
+        const sourceObject = targetObject;
         //@ts-ignore
-        if (targetObject.isObject3D) {
+        if (sourceObject.isObject3D) {
             //@ts-ignore
-            targetObject = document.findById(targetObject.uuid);
+            targetObject = document.findById(sourceObject.uuid);
         }
+        if (!targetObject) {
+            console.error("Invalid target object in behavior, the target object is likely missing from USDZ export. Is the object exported?", sourceObject);
+            throw new Error(`Invalid target object in behavior, the target object is likely missing from USDZ export. Please report a bug. uuid: ${sourceObject.uuid}.`);
+        }
         result = (targetObject as any).getPath?.call(targetObject) as string;
     }

src/engine/engine_components.ts CHANGED Viewed

@@ -349,8 +349,8 @@
  * const myComponents = findObjectsOfType(MyComponent);
  * ```
  */
-export function findObjectsOfType<T extends IComponent>(type: Constructor<T>, array: T[], contextOrScene: undefined | Object3D | { scene: Scene } = undefined): T[] {
-    if (!type) return array;
+export function findObjectsOfType<T extends IComponent>(type: Constructor<T>, array?: T[], contextOrScene: undefined | Object3D | { scene: Scene } = undefined): T[] {
+    if (!type) return array ?? [];
     if (!array) array = [];
     array.length = 0;

src/engine/engine_input.ts CHANGED Viewed

@@ -134,7 +134,7 @@
         this._used = true;
     }
-    /** Unique identifier for this input: a combination of the deviceIndex + button to uniquely identify the exact input (e.g. LeftController:Button0 = 0, RightController:Button1 = 101) */
+    /** Unique identifier for this input: a combination of the deviceIndex + button to uniquely identify the exact input (e.g. LeftController:Button0 = 0, RightController:Button1 = 11) */
     override get pointerId(): number { return this._pointerid; }
     private readonly _pointerid;
@@ -419,6 +419,11 @@
         return count;
     }
+    /**
+     * Gets the position of the given pointer index in pixel
+     * @param i The pointer index
+     * @returns The position of the pointer in pixel
+     */
     getPointerPosition(i: number): Vector2 | null {
         if (i >= this._pointerPositions.length) return null;
         return this._pointerPositions[i];

src/engine/engine_loaders.ts CHANGED Viewed

@@ -5,23 +5,11 @@
 import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js'
 import { KTX2Loader } from 'three/examples/jsm/loaders/KTX2Loader.js';
-import { isDevEnvironment } from './debug/index.js';
 import { Context } from "./engine_setup.js"
 import { getParam } from "./engine_utils.js";
 const debug = getParam("debugdecoders");
-// NOTE: keep in sync with gltf-progressive
-let DEFAULT_DRACO_DECODER_LOCATION = 'https://www.gstatic.com/draco/versioned/decoders/1.5.7/';
-let DEFAULT_KTX2_TRANSCODER_LOCATION = 'https://www.gstatic.com/basis-universal/versioned/2021-04-15-ba1c3e4/';
-fetch(DEFAULT_DRACO_DECODER_LOCATION + "draco_decoder.js", { method: "head" })
-    .catch(_ => {
-        if (isDevEnvironment()) console.warn("Failed to load draco decoder from \"" + DEFAULT_DRACO_DECODER_LOCATION + "\".\nFalling back to local version at \"./include/draco\"");
-        DEFAULT_DRACO_DECODER_LOCATION = "./include/draco/";
-        DEFAULT_KTX2_TRANSCODER_LOCATION = "./include/ktx2/";
-    });
 let meshoptDecoder: typeof MeshoptDecoder;
 let loaders: null | { dracoLoader: DRACOLoader, ktx2Loader: KTX2Loader, meshoptDecoder: typeof MeshoptDecoder } = null;
@@ -36,10 +24,10 @@
 export function setDracoDecoderPath(path: string | undefined) {
     if (path !== undefined && typeof path === "string") {
+        setDracoDecoderLocation(path);
         const loaders = ensureLoaders();
         if (debug) console.log("Setting draco decoder path to", path);
         loaders.dracoLoader.setDecoderPath(path);
-        setDracoDecoderLocation(path);
     }
 }
@@ -53,10 +41,10 @@
 export function setKtx2TranscoderPath(path: string) {
     if (path !== undefined && typeof path === "string") {
+        setKTX2TranscoderLocation(path);
         const loaders = ensureLoaders();
         if (debug) console.log("Setting ktx2 transcoder path to", path);
         loaders.ktx2Loader.setTranscoderPath(path);
-        setKTX2TranscoderLocation(path);
     }
 }

src/engine/engine_physics_rapier.ts CHANGED Viewed

@@ -167,13 +167,13 @@
         this.validate();
         const body = this.internal_getRigidbody(rigidbody);
         if (body) body.addForce(force, wakeup)
-        else console.warn("Rigidbody doesn't exist: can not apply force");
+        else console.warn("Rigidbody doesn't exist: can not apply force (does your object with the Rigidbody have a collider?)");
     }
     addImpulse(rigidbody: IRigidbody, force: Vec3, wakeup: boolean) {
         this.validate();
         const body = this.internal_getRigidbody(rigidbody);
         if (body) body.applyImpulse(force, wakeup);
-        else console.warn("Rigidbody doesn't exist: can not apply impulse");
+        else console.warn("Rigidbody doesn't exist: can not apply impulse (does your object with the Rigidbody have a collider?)");
     }
     getLinearVelocity(comp: IRigidbody | ICollider): Vec3 | null {
         this.validate();
@@ -182,6 +182,7 @@
             const vel = body.linvel();
             return vel;
         }
+        // else console.warn("Rigidbody doesn't exist: can not get linear velocity (does your object with the Rigidbody have a collider?)");
         return null;
     }
     getAngularVelocity(rb: IRigidbody): Vec3 | null {
@@ -191,6 +192,7 @@
             const vel = body.angvel();
             return vel;
         }
+        // else console.warn("Rigidbody doesn't exist: can not get angular velocity (does your object with the Rigidbody have a collider?)");
         return null;
     }
     resetForces(rb: IRigidbody, wakeup: boolean) {
@@ -207,14 +209,14 @@
         this.validate();
         const body = this.internal_getRigidbody(rb);
         if (body) body.applyImpulse(vec, wakeup);
-        else console.warn("Rigidbody doesn't exist: can not apply impulse");
+        else console.warn("Rigidbody doesn't exist: can not apply impulse (does your object with the Rigidbody have a collider?)");
     }
     wakeup(rb: IRigidbody) {
         this.validate();
         const body = this.internal_getRigidbody(rb);
         if (body) body.wakeUp();
-        else console.warn("Rigidbody doesn't exist: can not wake up");
+        else console.warn("Rigidbody doesn't exist: can not wake up (does your object with the Rigidbody have a collider?)");
     }
     isSleeping(rb: IRigidbody) {
         this.validate();
@@ -225,13 +227,13 @@
         this.validate();
         const body = this.internal_getRigidbody(rb);
         if (body) body.setAngvel(vec, wakeup);
-        else console.warn("Rigidbody doesn't exist: can not set angular velocity");
+        else console.warn("Rigidbody doesn't exist: can not set angular velocity (does your object with the Rigidbody have a collider?)");
     }
     setLinearVelocity(rb: IRigidbody, vec: Vec3, wakeup: boolean) {
         this.validate();
         const body = this.internal_getRigidbody(rb);
         if (body) body.setLinvel(vec, wakeup);
-        else console.warn("Rigidbody doesn't exist: can not set linear velocity");
+        else console.warn("Rigidbody doesn't exist: can not set linear velocity (does your object with the Rigidbody have a collider?)");
     }
     private context?: IContext;

src/engine/engine_three_utils.ts CHANGED Viewed

@@ -4,6 +4,7 @@
 import { useForAutoFit } from "./engine_camera.js";
 import { Mathf } from "./engine_math.js"
+import { Vec3 } from "./engine_types.js";
 import { CircularBuffer } from "./engine_utils.js";
 /**
@@ -91,10 +92,11 @@
 export function getTempVector(): Vector3;
 export function getTempVector(vec3: Vector3): Vector3;
 export function getTempVector(vec3: [number, number, number]): Vector3;
+export function getTempVector(vec3: Vec3): Vector3;
 export function getTempVector(dom: DOMPointReadOnly): Vector3;
 export function getTempVector(x: number): Vector3;
 export function getTempVector(x: number, y: number, z: number): Vector3;
-export function getTempVector(vecOrX?: Vector3 | [number, number, number] | DOMPointReadOnly | number, y?: number, z?: number): Vector3 {
+export function getTempVector(vecOrX?: Vec3 | Vector3 | [number, number, number] | DOMPointReadOnly | number, y?: number, z?: number): Vector3 {
     const vec = _tempVecs.get();
     vec.set(0, 0, 0); // initialize with default values
     if (vecOrX instanceof Vector3) vec.copy(vecOrX);
@@ -106,6 +108,11 @@
             vec.y = y !== undefined ? y : vec.x;
             vec.z = z !== undefined ? z : vec.x;
         }
+        else if (typeof vecOrX === "object") {
+            vec.x = vecOrX.x;
+            vec.y = vecOrX.y;
+            vec.z = vecOrX.z;
+        }
     }
     return vec;
 }

src/engine/engine_types.ts CHANGED Viewed

@@ -523,10 +523,13 @@
  * https://w3c.github.io/gamepad/#remapping
  */
 export type GamepadButtonName = "a-button" | "b-button" | "x-button" | "y-button";
+/** Needle-defined names for stylus (MX Ink) */
+export type StylusButtonName = "stylus-touch" | "stylus-tip";
 /** Button names as used in the xr profile */
+export type XRControllerButtonName = "thumbrest" | "xr-standard-trigger" | "xr-standard-squeeze" | "xr-standard-thumbstick" | "xr-standard-touchpad" | "menu" | GamepadButtonName | StylusButtonName;
-export type XRControllerButtonName = "thumbrest" | "xr-standard-trigger" | "xr-standard-squeeze" | "xr-standard-thumbstick" | "xr-standard-touchpad" | "menu" | GamepadButtonName;
 export type XRGestureName = "pinch";
 /** All known (types) button names for various devices and cases combined. You should use the device specific names if you e.g. know you only deal with a mouse use MouseButtonName  */

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

@@ -93,7 +93,7 @@
         if (this.raycaster.length <= 0) {
             const res = GameObject.findObjectOfType(Raycaster, this.context);
             if (!res) {
-                const rc = GameObject.addNewComponent(this.context.scene, ObjectRaycaster);
+                const rc = GameObject.addComponent(this.context.scene, ObjectRaycaster);
                 this.raycaster.push(rc);
                 if (isDevEnvironment() || debug)
                     console.warn("Added an ObjectRaycaster to the scene because no raycaster was found.");

src/engine-components/utils/LookAt.ts CHANGED Viewed

@@ -70,8 +70,8 @@
                 // rotate by 90° - counter-rotation on the parent makes sure
                 // that without Preliminary Behaviours it still looks right
                 const flip = this.invertForward ? -1 : 1;
-                parent.matrix.multiply(new Matrix4().makeRotationZ(Math.PI / 2 * flip));
-                model.matrix.multiply(new Matrix4().makeRotationZ(-Math.PI / 2 * flip));
+                parent.setMatrix(parent.getMatrix().multiply(new Matrix4().makeRotationZ(Math.PI / 2 * flip)));
+                model.setMatrix(model.getMatrix().multiply(new Matrix4().makeRotationZ(-Math.PI / 2 * flip)));
             }
             const lookAt = new BehaviorModel("lookat " + this.name,

src/engine/webcomponents/needle menu/needle-menu-spatial.ts CHANGED Viewed

@@ -62,6 +62,18 @@
             this.menu?.removeFromParent();
     }
+    private userRequestedMenu = false;
+    /** Bring up the spatial menu. This is typically invoked from a button click.
+     * The menu will show at a lower height to be easily accessible.
+     * @returns true if the menu was shown, false if it can't be shown because the menu has been disabled.
+     */
+    setDisplay(display: boolean) {
+        if (!this.enabled) return false;
+        this.userRequestedMenu = display;
+        return true;
+    }
     onDestroy() {
         const index = this._context.pre_render_callbacks.indexOf(this.preRender);
         if (index > -1) {
@@ -156,7 +168,7 @@
             const showMenuThreshold = fwd.y > .6;
             const hideMenuThreshold = fwd.y > .4;
-            const newVisibleState = menu.visible ? hideMenuThreshold : showMenuThreshold;
+            const newVisibleState = (menu.visible ? hideMenuThreshold : showMenuThreshold) || this.userRequestedMenu;
             const becomesVisible = !menu.visible && newVisibleState;
             menu.visible = newVisibleState || (isDesktop() && debug as boolean);
@@ -167,7 +179,7 @@
             if (becomesVisible || testBecomesVisible) {
                 menu.position.copy(this._menuTarget.position);
-                menu.position.y += 1;
+                menu.position.y += 0.25;
                 this._menuTarget.position.copy(menu.position);
                 this.positionFilter.reset(menu.position);
                 menu.quaternion.copy(this._menuTarget.quaternion);
@@ -178,7 +190,7 @@
                 this.ensureRenderOnTop(this.menu as any as Object3D);
                 this._menuTarget.position.copy(menuTargetPosition);
                 this._context.scene.add(this._menuTarget);
-                lookAtObject(this._menuTarget, this._context.mainCamera!, false, true);
+                lookAtObject(this._menuTarget, this._context.mainCamera!, true, true);
                 this._menuTarget.removeFromParent();
             }
             this.positionFilter.filter(this._menuTarget.position, menu.position, this._context.time.time);
@@ -212,6 +224,10 @@
     private familyName = "Needle Spatial Menu";
     private menu?: ThreeMeshUI.Block;
+    get isVisible() {
+        return this.menu?.visible;
+    }
     private getMenu() {
         if (this.menu) {
             return this.menu;

src/engine/webcomponents/needle menu/needle-menu.ts CHANGED Viewed

@@ -178,6 +178,14 @@
         this._spatialMenu.setEnabled(enabled);
     }
+    setSpatialMenuVisible(display: boolean) {
+        this._spatialMenu.setDisplay(display);
+    }
+    get spatialMenuIsVisible() {
+        return this._spatialMenu.isVisible;
+    }
     /**
      * Call to add or remove a button to the menu to show a QR code for the current page
      * If enabled=true then a button will be added to the menu that will show a QR code for the current page when clicked.

src/engine/xr/NeedleXRController.ts CHANGED Viewed

@@ -134,6 +134,9 @@
     /** is left side. shorthand for `side === 'left'` */
     get isLeft() { return this.side === 'left'; }
+    /** is XR stylus, e.g. Logitech MX Ink */
+    get isStylus() { return this._isMxInk; }
     /** The XRTransientInputHitTestSource can be used to perform hit tests with the controller ray against the real world.
      * see https://developer.mozilla.org/en-US/docs/Web/API/XRSession/requestHitTestSourceForTransientInput for more information
      * Requires the hit-test feature to be enabled in the XRSession
@@ -158,6 +161,7 @@
     private _hasSelectEvent = false;
     get hasSelectEvent() { return this._hasSelectEvent; }
     private _isMxInk = false;
+    private _isMetaQuestTouchController = false;
     /** Perform a hit test against the XR planes or meshes. shorthand for `xr.getHitTest(controller)`
      * @returns the hit test result (with position and rotation in worldspace) or null if no hit was found
@@ -736,8 +740,15 @@
     private initialize() {
         // WORKAROUND for hand controllers that don't have a select event
         this._hasSelectEvent = this.profiles.includes("generic-hand-select") || this.profiles.some(p => p.startsWith("generic-trigger"));
-        // WORKAROUND for Logitech MX Ink not having a proper profile on QuestOS v68
-        this._isMxInk = this.profiles.includes("meta-quest-touch-plus") && this.inputSource.gamepad?.buttons.length === 7;
+        // Used to determine special layout for Quest controllers, e.g. last button is menu button
+        this._isMetaQuestTouchController = this.profiles.includes("meta-quest-touch-plus") || this.profiles.includes("oculus-touch-v3");
+        this._isMxInk =
+            // Proper profile starting with v69 and browser 35.1
+            this.profiles.includes("logitech-mx-ink") ||
+            // Workaround for Logitech MX Ink not having a proper profile on QuestOS v68
+            this.profiles.includes("meta-quest-touch-plus") && this.inputSource.gamepad?.buttons.length === 7;
         if (!this._layout) {
             // Ignore transient-pointer since we likely don't want to spawn a controller visual just for a temporary pointer.
@@ -893,36 +904,76 @@
                 const state = this.states[index] || new InputState();
                 let eventName: InputEventNames | null = null;
-                // is down
-                if (button.pressed && !state.pressed) {
-                    eventName = "pointerdown";
-                    state.isDown = true;
-                    state.isUp = false;
+                // Special handling for MX Ink stylus on Quest OS v69+.
+                // We're never getting a "pressed" state here, so we determine pressed state based on the value.
+                if (this._isMxInk && (index === 4 || index === 5)) {
+                    if (button.value > 0 && !state.pressed) {
+                        eventName = "pointerdown";
+                        state.isDown = true;
+                        state.isUp = false;
+                    }
+                    else if (button.value === 0 && state.pressed) {
+                        eventName = "pointerup";
+                        state.isDown = false;
+                        state.isUp = true;
+                    }
+                    else if (state.pressed) {
+                        eventName = "pointermove";
+                        state.isDown = false;
+                        state.isUp = false;
+                    }
+                    state.pressed = button.value > 0;
+                    state.value = button.value;
                 }
-                // is up
-                else if (!button.pressed && state.pressed) {
-                    eventName = "pointerup"
-                    state.isDown = false;
-                    state.isUp = true;
-                }
+                // Regular controller handling.
                 else {
-                    state.isDown = false;
-                    state.isUp = false;
+                    // is down
+                    if (button.pressed && !state.pressed) {
+                        eventName = "pointerdown";
+                        state.isDown = true;
+                        state.isUp = false;
+                    }
+                    // is up
+                    else if (!button.pressed && state.pressed) {
+                        eventName = "pointerup"
+                        state.isDown = false;
+                        state.isUp = true;
+                    }
+                    else {
+                        state.isDown = false;
+                        state.isUp = false;
+                    }
+                    state.pressed = button.pressed;
+                    state.value = button.value;
                 }
-                state.value = button.value;
-                state.pressed = button.pressed;
                 this.states[index] = state;
                 // the selection event is handled in the "selectstart" callback
                 const emitEvent = index !== this._selectButtonIndex && index !== this._squeezeButtonIndex;
                 if (eventName != null && emitEvent) {
-                    const name = this._layout?.gamepad[index];
+                    let name = this._layout?.gamepad[index];
+                    if (this._isMxInk && index === 4) name = "stylus-touch";
+                    if (this._isMxInk && index === 5) name = "stylus-tip";
                     if (debug || debugCustomGesture) console.log("Emitting pointer event", eventName, index, name, button.value, this.gamepad, this._layout);
                     this.emitPointerEvent(eventName, index, name ?? "none", false, null, button.value);
                 }
             }
+            // For Quest controllers, the last button is the menu button
+            if (this._isMetaQuestTouchController) {
+                const menuButtonIndex = this.gamepad.buttons.length - 1;
+                const menuButtonState = this.states[menuButtonIndex];
+                if (menuButtonState) {
+                    if (menuButtonState.isDown) {
+                        const menu = this.context.menu;
+                        if (menu.spatialMenuIsVisible)
+                            menu.setSpatialMenuVisible(false);
+                        else
+                            this.context.menu.setSpatialMenuVisible(true);
+                    }
+                }
+            }
         }
         // update hand gesture states

src/engine/xr/NeedleXRSession.ts CHANGED Viewed

@@ -373,7 +373,8 @@
         // handle iOS platform where "immersive-ar" is not supported
         // TODO: should we add a separate mode (e.g. "AR")? https://linear.app/needle/issue/NE-5303
         if (mode === "immersive-ar" && isiOS()) {
-            if (InternalUSDZRegistry.exportAndOpen()) {
+            const arSupported = await this.isARSupported();
+            if (!arSupported && InternalUSDZRegistry.exportAndOpen()) {
                 return null;
             }
         }

src/engine-components/postprocessing/PostProcessingEffect.ts CHANGED Viewed

@@ -78,6 +78,7 @@
     private _manager: IPostProcessingManager | null = null;
     onEnable(): void {
+        super.onEnable();
         this.onEffectEnabled();
         // Dont override the serialized value by enabling (we could also just disable this component / map enabled to active)
         if (this.__internalDidAwakeAndStart)
@@ -85,6 +86,7 @@
     }
     onDisable(): void {
+        super.onDisable();
         this._manager?.removeEffect(this);
         this.active = false;
     }

src/engine-components/postprocessing/PostProcessingHandler.ts CHANGED Viewed

@@ -91,7 +91,7 @@
         context[activeKey] = this;
-        if (debug) console.log("refreshing volume profile", components);
+        if (debug) console.log("Apply Postprocessing Effects", components);
         this._lastVolumeComponents = [...components];

src/engine-components/RigidBody.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { Matrix4, Object3D, Quaternion, Vector3, Vector3Like } from "three";
+import { isDevEnvironment } from "../engine/debug/index.js";
 import { CollisionDetectionMode, RigidbodyConstraints } from "../engine/engine_physics.types.js";
 import { serializable } from "../engine/engine_serialization_decorator.js";
 import { Context, FrameEvent } from "../engine/engine_setup.js";
@@ -313,6 +314,9 @@
         }
         this._watch.start(true, true);
         this.startCoroutine(this.beforePhysics(), FrameEvent.LateUpdate);
+        if (isDevEnvironment() && !this.context.physics.engine?.getBody(this)) {
+            console.warn(`Rigidbody was not created: Does your object (${this.name}) have a collider?`);
+        }
     }
     onDisable() {

src/engine-components/SceneSwitcher.ts CHANGED Viewed

@@ -65,12 +65,13 @@
  **/
 export interface ISceneEventListener {
     /** Called when the scene is loaded and added */
-    sceneOpened?(sceneSwitcher: SceneSwitcher): Promise<void>
+    sceneOpened(sceneSwitcher: SceneSwitcher): Promise<void>
     /** Called before the scene is being removed (due to another scene being loaded) */
-    sceneClosing?(): Promise<void>
+    sceneClosing(): Promise<void>
 }
 /** The SceneSwitcher can be used to dynamically load and unload extra content
  * Available scenes are defined in the `scenes` array.
  * Loaded scenes will be added to the SceneSwitcher's GameObject as a child and removed when another scene is loaded by the same SceneSwitcher.
@@ -783,7 +784,11 @@
     }
     private tryGetSceneEventListener(obj: Object3D, level: number = 0): ISceneEventListener | null {
-        const sceneListener = GameObject.foreachComponent(obj, c => (c as any as ISceneEventListener).sceneClosing ? c : undefined) as ISceneEventListener | undefined;
+        const sceneListener = GameObject.foreachComponent(obj, c => {
+            const i = c as any as ISceneEventListener;
+            if (i.sceneClosing! || i.sceneOpened!) return i;
+            else return undefined;
+        });
         // if we didnt find any component with the listener on the root object
         // we also check the first level of its children because a scene might be a group
         if (level === 0 && !sceneListener && obj.children.length) {

src/engine-components/export/usdz/ThreeUSDZExporter.ts CHANGED Viewed

@@ -7,6 +7,7 @@
 	BufferGeometry,
 	Color,
 	DoubleSide,
+	InterleavedBufferAttribute,
 	LinearFilter,
 	Material,
 	MathUtils,
@@ -19,6 +20,7 @@
 	OrthographicCamera,
 	PerspectiveCamera,
 	PlaneGeometry,
+	Quaternion,
 	RGBAFormat,
 	Scene,
 	ShaderMaterial,
@@ -27,6 +29,7 @@
 	Texture,
 	Uniform,
 	UnsignedByteType,
+	Vector3,
 	Vector4,
 	WebGLRenderer,
 	WebGLRenderTarget} from 'three';
@@ -89,6 +92,16 @@
 	return structuralNodes;
 }
+declare type USDObjectTransform = {
+	position: Vector3 | null;
+	quaternion: Quaternion | null;
+	scale: Vector3 | null;
+}
+const PositionIdentity = new Vector3();
+const QuaternionIdentity = new Quaternion();
+const ScaleIdentity = new Vector3(1,1,1);
 class USDObject {
 	static USDObject_export_id = 0;
@@ -101,7 +114,30 @@
 	extraSchemas: string[] = [];
 	displayName?: string;
 	visibility?: "inherited" | "invisible"; // defaults to "inherited" in USD
-	matrix: Matrix4;
+	getMatrix(): Matrix4 {
+		if (!this.transform) return new Matrix4();
+		const { position, quaternion, scale } = this.transform;
+		const matrix = new Matrix4();
+		matrix.compose(position || PositionIdentity, quaternion || QuaternionIdentity, scale || ScaleIdentity);
+		return matrix;
+	}
+	setMatrix( value ) {
+		if (!value || !(value instanceof Matrix4)) {
+			this.transform = null;
+			return;
+		}
+		const position = new Vector3();
+		const quaternion = new Quaternion();
+		const scale = new Vector3();
+		value.decompose(position, quaternion, scale);
+		this.transform = { position, quaternion, scale };
+	}
+	/** @deprecated Use `transform`, or `getMatrix()` if you really need the matrix */
+	get matrix() { return this.getMatrix(); }
+	/** @deprecated Use `transform`, or `setMatrix()` if you really need the matrix */
+	set matrix( value ) { this.setMatrix( value ); }
+	transform: USDObjectTransform | null = null;
 	private _isDynamic: boolean;
 	get isDynamic() { return this._isDynamic; }
 	private set isDynamic( value ) { this._isDynamic = value; }
@@ -114,31 +150,42 @@
 	animations: AnimationClip[] | null;
 	_eventListeners: {};
+	// these are for tracking which xformops are needed
+	needsTranslate: boolean = false;
+	needsOrient: boolean = false;
+	needsScale: boolean = false;
 	static createEmptyParent( object: USDObject ) {
-		const emptyParent = new USDObject( MathUtils.generateUUID(), object.name + '_empty_' + ( USDObject.USDObject_export_id ++ ), object.matrix );
+		const emptyParent = new USDObject( MathUtils.generateUUID(), object.name + '_empty_' + ( USDObject.USDObject_export_id ++ ), object.transform );
 		const parent = object.parent;
 		if (parent) parent.add( emptyParent );
 		emptyParent.add( object );
 		emptyParent.isDynamic = true;
-		object.matrix = new Matrix4().identity();
+		object.transform = null;
 		return emptyParent;
 	}
 	static createEmpty() {
-		const empty = new USDObject( MathUtils.generateUUID(), 'Empty_' + ( USDObject.USDObject_export_id ++ ), new Matrix4() );
+		const empty = new USDObject( MathUtils.generateUUID(), 'Empty_' + ( USDObject.USDObject_export_id ++ ) );
 		empty.isDynamic = true;
 		return empty;
 	}
-	constructor( id, name, matrix, mesh: BufferGeometry | null = null, material: MeshStandardMaterial | MeshBasicMaterial | Material | null = null, camera: PerspectiveCamera | OrthographicCamera | null = null, skinnedMesh: SkinnedMesh | null = null, animations: AnimationClip[] | null = null ) {
+	constructor( id, name, transform: USDObjectTransform | null = null, mesh: BufferGeometry | null = null, material: MeshStandardMaterial | MeshBasicMaterial | Material | null = null, camera: PerspectiveCamera | OrthographicCamera | null = null, skinnedMesh: SkinnedMesh | null = null, animations: AnimationClip[] | null = null ) {
 		this.uuid = id;
 		this.name = makeNameSafe( name );
 		this.displayName = name;
-		this.matrix = matrix.clone();
+		if (!transform) this.transform = null;
+		else this.transform = {
+			position: transform.position?.clone() || null,
+			quaternion: transform.quaternion?.clone() || null,
+			scale: transform.scale?.clone() || null
+		};
 		this.geometry = mesh;
 		this.material = material;
 		this.camera = camera;
@@ -166,7 +213,7 @@
 	clone() {
-		const clone = new USDObject( MathUtils.generateUUID(), this.name, this.matrix, this.geometry, this.material );
+		const clone = new USDObject( MathUtils.generateUUID(), this.name, this.transform, this.geometry, this.material );
 		clone.isDynamic = this.isDynamic;
 		return clone;
@@ -276,7 +323,7 @@
 	constructor() {
-		super(undefined, 'StageRoot', new Matrix4(), null, null, null);
+		super(undefined, 'StageRoot', null, null, null, null);
 		this.children = [];
 		this.stageLength = 200;
@@ -320,9 +367,9 @@
 	findById( uuid: string ) {
 		let found = false;
-		function search( current: USDObject ) {
+		function search( current: USDObject ): USDObject | undefined {
-			if ( found ) return;
+			if ( found ) return undefined;
 			if ( current.uuid === uuid ) {
 				found = true;
@@ -341,7 +388,7 @@
 				}
 			}
+			return undefined;
 		}
 		return search( this );
@@ -531,6 +578,7 @@
 class USDZExporter {
 	debug: boolean;
+	pruneUnusedNodes: boolean;
 	sceneAnchoringOptions: USDZExporterOptions = new USDZExporterOptions();
 	extensions: Array<IUSDExporterExtension> = [];
 	keepObject?: (object: Object3D) => boolean;
@@ -538,6 +586,7 @@
 	constructor() {
 		this.debug = false;
+		this.pruneUnusedNodes = true;
 	}
@@ -563,8 +612,11 @@
 		Progress.report('export-usdz', "Done onBeforeBuildDocument");
 		Progress.report('export-usdz', "Reparent bones to common ancestor");
-		// HACK let's find all skeletons and reparent them to their skelroot / armature / uppermost bone parent
+		// Find all skeletons and reparent them to their skelroot / armature / uppermost bone parent.
+		// This may not be correct in all cases.
 		const reparentings: Array<{ object: Object3D, originalParent: Object3D | null, newParent: Object3D }> = [];
+		const allReparentingObjects = new Set<string>();
 		scene?.traverse(object => {
 			if (!options.exportInvisible && !object.visible) return;
@@ -573,14 +625,19 @@
 				const commonAncestor = findCommonAncestor(bones);
 				if (commonAncestor) {
-					reparentings.push( { object, originalParent: object.parent, newParent: commonAncestor } );
+					const newReparenting = { object, originalParent: object.parent, newParent: commonAncestor };
+					reparentings.push( newReparenting );
+					// keep track of which nodes are important for skeletal export consistency
+					allReparentingObjects.add(newReparenting.object.uuid);
+					if (newReparenting.newParent) allReparentingObjects.add(newReparenting.newParent.uuid);
+					if (newReparenting.originalParent) allReparentingObjects.add(newReparenting.originalParent.uuid);
 				}
 			}
 		});
 		for ( const reparenting of reparentings ) {
 			const { object, originalParent, newParent } = reparenting;
-			// if (this.debug) console.log("REPARENTING", object, "from", originalParent, "to", newParent);
 			newParent.add( object );
 		}
@@ -595,6 +652,28 @@
 		Progress.report('export-usdz', "Invoking onAfterBuildDocument");
 		await invokeAll( context, 'onAfterBuildDocument' );
+		// At this point, we know all animated objects, all skinned mesh objects, and all objects targeted by behaviors.
+		// We can prune all empty nodes (no geometry or material) depth-first.
+		// This avoids unnecessary export of e.g. animated bones as nodes when they have no children
+		// (for example, a sword attached to a hand still needs that entire hierarchy exported)
+		const behaviorExt = context.extensions.find( ext => ext.extensionName === 'Behaviour' ) as BehaviorExtension | undefined;
+		const allBehaviorTargets = behaviorExt?.getAllTargetUuids() ?? new Set<string>();
+		// Prune pass. Depth-first removal of nodes that don't affect the outcome of the scene.
+		if (this.pruneUnusedNodes) {
+			const options = {
+				allBehaviorTargets,
+				debug: false,
+				boneReparentings: allReparentingObjects
+			};
+			if (this.debug) logUsdHierarchy(context.document, "Hierarchy BEFORE pruning", options);
+			prune( context.document, options );
+			if (this.debug) logUsdHierarchy(context.document, "Hierarchy AFTER pruning");
+		}
+		else if (this.debug) {
+			console.log("Pruning of empty nodes is disabled. This may result in a larger USDZ file.");
+		}
 		Progress.report('export-usdz', { message: "Parsing document", autoStep: 10 });
 		await parseDocument( context, () => {
 			// injected after stageRoot.
@@ -724,6 +803,14 @@
 	let model: USDObject | undefined = undefined;
 	let geometry: BufferGeometry | undefined = undefined;
 	let material: Material | Material[] | undefined = undefined;
+	const transform: USDObjectTransform = { position: object.position, quaternion: object.quaternion, scale: object.scale };
+	if (object.position.x === 0 && object.position.y === 0 && object.position.z === 0)
+		transform.position = null;
+	if (object.quaternion.x === 0 && object.quaternion.y === 0 && object.quaternion.z === 0 && object.quaternion.w === 1)
+		transform.quaternion = null;
+	if (object.scale.x === 1 && object.scale.y === 1 && object.scale.z === 1)
+		transform.scale = null;
 	if (object instanceof Mesh || object instanceof SkinnedMesh) {
 		geometry = object.geometry;
@@ -745,17 +832,17 @@
 		const name = getObjectId( object );
 		const skinnedMeshObject = object instanceof SkinnedMesh ? object : null;
-		model = new USDObject( object.uuid, name, object.matrix, geometry, material, undefined, skinnedMeshObject, object.animations );
+		model = new USDObject( object.uuid, name, transform, geometry, material, undefined, skinnedMeshObject, object.animations );
 	} else if ( object instanceof PerspectiveCamera || object instanceof OrthographicCamera ) {
 		const name = getObjectId( object );
-		model = new USDObject( object.uuid, name, object.matrix, undefined, undefined, object );
+		model = new USDObject( object.uuid, name, transform, undefined, undefined, object );
 	} else {
 		const name = getObjectId( object );
-		model = new USDObject( object.uuid, name, object.matrix, undefined, undefined, undefined, undefined, object.animations );
+		model = new USDObject( object.uuid, name, transform, undefined, undefined, undefined, undefined, object.animations );
 	}
@@ -785,7 +872,7 @@
 	} else {
 		const name = getObjectId( object );
-		const empty = new USDObject( object.uuid, name, object.matrix );
+		const empty = new USDObject( object.uuid, name, { position: object.position, quaternion: object.quaternion, scale: object.scale } );
 		if ( parentModel ) {
 			parentModel.add( empty );
@@ -804,6 +891,106 @@
 }
+function logUsdHierarchy( object: USDObject, prefix: string, ...extraLogObjects: any[] ) {
+	const item = {};
+	let itemCount = 0;
+	function collectItem( object: USDObject, current) {
+		itemCount++;
+		let name = object.displayName || object.name;
+		name += " (" + object.uuid + ")";
+		const hasAny = object.geometry || object.material || object.camera || object.skinnedMesh;
+		if (hasAny) {
+			name += " (" + (object.geometry ? "geo, " : "") + (object.material ? "mat, " : "") + (object.camera ? "cam, " : "") + (object.skinnedMesh ? "skin, " : "") + ")";
+		}
+		current[name] = {};
+		const props = { object };
+		if (object.material) props['mat'] = true;
+		if (object.geometry) props['geo'] = true;
+		if (object.camera) props['cam'] = true;
+		if (object.skinnedMesh) props['skin'] = true;
+		current[name]._self = props;
+		for ( const child of object.children ) {
+			if (child) {
+				collectItem(child, current[name]);
+			}
+		}
+	}
+	collectItem(object, item);
+	console.log(prefix + " (" + itemCount + " nodes)", item, ...extraLogObjects);
+}
+function prune ( object: USDObject, options : {
+	allBehaviorTargets: Set<string>,
+	debug: boolean,
+	boneReparentings: Set<string>
+} ) {
+	let allChildsWerePruned = true;
+	const prunedChilds = new Array<USDObject>();
+	const keptChilds = new Array<USDObject>();
+	if (object.children.length === 0) {
+		allChildsWerePruned = true;
+	}
+	else {
+		const childs = [...object.children];
+		for ( const child of childs ) {
+			if (child) {
+				const childWasPruned = prune(child, options);
+				if (options.debug) {
+					if (childWasPruned) prunedChilds.push(child);
+					else keptChilds.push(child);
+				}
+				allChildsWerePruned = allChildsWerePruned && childWasPruned;
+			}
+		}
+	}
+	// check if this object is referenced by any behavior
+	const isBehaviorSourceOrTarget = options.allBehaviorTargets.has(object.uuid);
+	// check if this object has any material or geometry
+	const isVisible = object.geometry || object.material || object.camera || object.skinnedMesh || false;
+	// check if this object is part of any reparenting
+	const isBoneReparenting = options.boneReparentings.has(object.uuid);
+	const canBePruned = allChildsWerePruned && !isBehaviorSourceOrTarget && !isVisible && !isBoneReparenting;
+	if (canBePruned) {
+		if (options.debug) console.log("Pruned object:", (object.displayName || object.name) + " (" + object.uuid + ")", {
+			isVisible,
+			isBehaviorSourceOrTarget,
+			allChildsWerePruned,
+			isBoneReparenting,
+			object,
+			prunedChilds,
+			keptChilds
+		});
+		object.parent?.remove(object);
+	}
+	else {
+		if (options.debug) console.log("Kept object:", (object.displayName || object.name) + " (" + object.uuid + ")", {
+			isVisible,
+			isBehaviorSourceOrTarget,
+			allChildsWerePruned,
+			isBoneReparenting,
+			object,
+			prunedChilds,
+			keptChilds
+		});
+	}
+	// if it has no children and is not a behavior source or target, and is not visible, prune it
+	return canBePruned;
+}
 async function parseDocument( context: USDZExporterContext, afterStageRoot: () => string ) {
 	Progress.start("export-usdz-resources", "export-usdz");
@@ -1224,7 +1411,8 @@
 	Progress.report("export-usdz-xforms", { message: "buildXform " + model.displayName || model.name, autoStep: true });
-	const matrix = model.matrix;
+	// const matrix = model.matrix;
+	const transform = model.transform;
 	const geometry = model.geometry;
 	const material = model.material;
 	const camera = model.camera;
@@ -1236,13 +1424,15 @@
 		}
 	}
-	const transform = buildMatrix( matrix );
+	// const transform = buildMatrix( matrix );
+	/*
 	if ( matrix.determinant() < 0 ) {
 		console.warn( 'NeedleUSDZExporter: USDZ does not support negative scales', name );
 	}
+	*/
 	const isSkinnedMesh = geometry && geometry.isBufferGeometry && geometry.attributes.skinIndex !== undefined && geometry.attributes.skinIndex.count > 0;
 	const objType = isSkinnedMesh ? 'SkelRoot' : 'Xform';
@@ -1264,16 +1454,20 @@
 		writer.beginBlock( `def Camera "${name}"`, "(", false );
 	else if ( model.type !== undefined)
 		writer.beginBlock( `def ${model.type} "${name}"` );
-	else
+	else // if (model.type === undefined)
 		writer.beginBlock( `def Xform "${name}"`, "(", false);
-	if (model.displayName)
-		writer.appendLine(`displayName = "${model.displayName}"`);
 	if (model.type === undefined) {
 		if (model.extraSchemas?.length)
 			_apiSchemas.push(...model.extraSchemas);
 		if (_apiSchemas.length)
 			writer.appendLine(`prepend apiSchemas = [${_apiSchemas.map(s => `"${s}"`).join(', ')}]`);
+	}
+	if (model.displayName)
+		writer.appendLine(`displayName = "${model.displayName}"`);
+	if ( camera || model.type === undefined) {
 		writer.closeBlock( ")" );
 		writer.beginBlock();
 	}
@@ -1292,16 +1486,30 @@
 			writer.closeBlock();
 		}
 	}
+	let haveWrittenAnyXformOps = false;
 	if ( isSkinnedMesh ) {
 		writer.appendLine( `rel skel:skeleton = <Rig>` );
 		writer.appendLine( `rel skel:animationSource = <Rig/_anim>`);
-		writer.appendLine( `matrix4d xformOp:transform = ${buildMatrix(new Matrix4())}` ); // always identity / in world space
+		haveWrittenAnyXformOps = false;
+		// writer.appendLine( `matrix4d xformOp:transform = ${buildMatrix(new Matrix4())}` ); // always identity / in world space
 	}
 	else if (model.type === undefined) {
-		writer.appendLine( `matrix4d xformOp:transform = ${transform}` );
+		if (transform) {
+			haveWrittenAnyXformOps = haveWrittenAnyXformOps || (transform.position !== null || transform.quaternion !== null || transform.scale !== null);
+			if (transform.position) {
+				model.needsTranslate = true;
+				writer.appendLine( `double3 xformOp:translate = (${fn(transform.position.x)}, ${fn(transform.position.y)}, ${fn(transform.position.z)})` );
+			}
+			if (transform.quaternion) {
+				model.needsOrient = true;
+				writer.appendLine( `quatf xformOp:orient = (${fn(transform.quaternion.w)}, ${fn(transform.quaternion.x)}, ${fn(transform.quaternion.y)}, ${fn(transform.quaternion.z)})` );
+			}
+			if (transform.scale) {
+				model.needsScale = true;
+				writer.appendLine( `double3 xformOp:scale = (${fn(transform.scale.x)}, ${fn(transform.scale.y)}, ${fn(transform.scale.z)})` );
+			}
+		}
 	}
-	if (model.type === undefined)
-		writer.appendLine( 'uniform token[] xformOpOrder = ["xformOp:transform"]' );
 	if (model.visibility !== undefined)
 		writer.appendLine(`token visibility = "${model.visibility}"`);
@@ -1333,6 +1541,20 @@
 	}
+	// after serialization, we know which xformops to actually define here:
+	if (model.type === undefined) {
+		// TODO only write the necessary ones – this isn't trivial though because we need to know
+		// if some of them are animated, and then we need to include those.
+		// Best approach would likely be to write xformOpOrder _after_ onSerialize
+		// and keep track of what was written in onSerialize (e.g. model.needsTranslate = true)
+		const ops = new Array<string>();
+		if (model.needsTranslate) ops.push('"xformOp:translate"');
+		if (model.needsOrient) ops.push('"xformOp:orient"');
+		if (model.needsScale) ops.push('"xformOp:scale"');
+		if (ops.length)
+			writer.appendLine( `uniform token[] xformOpOrder = [${ops.join(', ')}]` );
+	}
 	if ( model.children ) {
 		writer.appendLine();
@@ -1380,7 +1602,7 @@
 }
-function buildMesh( geometry, bones: Bone[] = [], quickLookCompatible: boolean = true) {
+function buildMesh( geometry: BufferGeometry, bones: Bone[] = [], quickLookCompatible: boolean = true) {
 	const name = 'Geometry';
 	const attributes = geometry.attributes;
@@ -1394,7 +1616,7 @@
 	const sortedBones: Array<{bone: Object3D, index: number}> = [];
 	const indexMapping: number[] = [];
 	let sortedSkinIndex = new Array<number>();
-	let sortedSkinIndexAttribute: BufferAttribute | null = attributes.skinIndex;
+	let sortedSkinIndexAttribute: BufferAttribute | InterleavedBufferAttribute | null = attributes.skinIndex;
 	let bonesArray = "";
 	if (hasBones) {
 		const uuidsFound:string[] = [];
@@ -1468,13 +1690,12 @@
         )` : '' }
         point3f[] points = [${buildVector3Array( attributes.position, count )}]
         ${attributes.uv ?
-		`texCoord2f[] primvars:st = [${buildVector2Array( attributes.uv, count )}] (
+		`texCoord2f[] primvars:st = [${buildVector2Array( attributes.uv, count, true )}] (
             interpolation = "vertex"
         )` : '' }
-		${attributes.uv2 ?
-		`texCoord2f[] primvars:st2 = [${buildVector2Array( attributes.uv2, count )}] (
-            interpolation = "vertex"
-        )` : '' }
+		${attributes.uv1 ? buildCustomAttributeAccessor('st1', attributes.uv1) : '' }
+		${attributes.uv2 ? buildCustomAttributeAccessor('st2', attributes.uv2) : '' }
+		${attributes.uv3 ? buildCustomAttributeAccessor('st3', attributes.uv3) : '' }
 		${isSkinnedMesh ?
 			`matrix4d primvars:skel:geomBindTransform = ( (1, 0, 0, 0), (0, 1, 0, 0), (0, 0, 1, 0), (0, 0, 0, 1) ) (
 				elementSize = 1
@@ -1490,6 +1711,10 @@
 			elementSize = 4
 			interpolation = "vertex"
 		)` : '' }
+		${attributes.color ?
+		`color3f[] primvars:displayColor = [${buildVector3Array( attributes.color, count )}] (
+			interpolation = "vertex"
+		)` : '' }
         uniform token subdivisionScheme = "none"
     }
 }
@@ -1510,7 +1735,7 @@
 `;
 }
-function buildMeshVertexCount( geometry ) {
+function buildMeshVertexCount( geometry: BufferGeometry ) {
 	const count = geometry.index !== null ? geometry.index.count : geometry.attributes.position.count;
@@ -1553,6 +1778,29 @@
 }
+/** Returns a string with the correct attribute declaration for the given attribute. Could have 2,3,4 components. */
+function buildCustomAttributeAccessor( primvarName: string, attribute: BufferAttribute | InterleavedBufferAttribute ) {
+	const count = attribute.itemSize;
+	switch (count) {
+		case 2:
+			// TODO: Check if we want to flip Y here as well. We do that for texcoords, but the data in UV1..N could be intended for other purposes.
+			return `texCoord2f[] primvars:${primvarName} = [${buildVector2Array( attribute, count, true )}] (
+				interpolation = "vertex"
+			)`;
+		case 3:
+			return `texCoord3f[] primvars:${primvarName} = [${buildVector3Array( attribute, count )}] (
+				interpolation = "vertex"
+			)`;
+		case 4:
+			return `double4[] primvars:${primvarName} = [${buildVector4Array2( attribute, count )}] (
+				interpolation = "vertex"
+			)`;
+		default:
+			console.warn('USDZExporter: Attribute with ' + count + ' components are currently not supported. Results may be undefined for ' + primvarName + '.');
+			return '';
+	}
+}
 function buildVector3Array( attribute, count ) {
 	if ( attribute === undefined ) {
@@ -1578,6 +1826,33 @@
 }
+function buildVector4Array2( attribute, count ) {
+	if ( attribute === undefined ) {
+		console.warn( 'USDZExporter: Attribute is missing. Results may be undefined.' );
+		return Array( count ).fill( '(0, 0, 0, 0)' ).join( ', ' );
+	}
+	const array: Array<string> = [];
+	for ( let i = 0; i < attribute.count; i ++ ) {
+		const x = attribute.getX( i );
+		const y = attribute.getY( i );
+		const z = attribute.getZ( i ) || 0;
+		const w = attribute.getW( i ) || 0;
+		array.push( `(${x.toPrecision( PRECISION )}, ${y.toPrecision( PRECISION )}, ${z.toPrecision( PRECISION )}, ${w.toPrecision( PRECISION )})` );
+	}
+	return array.join( ', ' );
+}
 function buildVector4Array( attribute, ints = false ) {
 	const array: Array<string> = [];
@@ -1599,8 +1874,8 @@
 }
-function buildVector2Array( attribute, count ) {
+function buildVector2Array( attribute: BufferAttribute | InterleavedBufferAttribute, count: number, flipY: boolean = false ) {
 	if ( attribute === undefined ) {
 		console.warn( 'USDZExporter: UVs missing.' );
@@ -1613,10 +1888,11 @@
 	for ( let i = 0; i < attribute.count; i ++ ) {
 		const x = attribute.getX( i );
-		const y = attribute.getY( i );
+		let y = attribute.getY( i );
+		if (flipY)
+			y = 1 - y;
+		array.push( `(${x.toPrecision( PRECISION )}, ${y.toPrecision( PRECISION )})` );
-		array.push( `(${x.toPrecision( PRECISION )}, ${1 - y.toPrecision( PRECISION )})` );
 	}
 	return array.join( ', ' );
@@ -1993,10 +2269,10 @@
 			}
 ` : ''}
 ${usedUVChannels.has(1) ? `
-			def Shader "uvReader_st2"
+			def Shader "uvReader_st1"
 			{
 				uniform token info:id = "UsdPrimvarReader_float2"
-				token inputs:varname = "st2"
+				token inputs:varname = "st1"
 				float2 inputs:fallback = (0.0, 0.0)
 				float2 outputs:result
 			}

src/engine-components/export/usdz/USDZExporter.ts CHANGED Viewed

@@ -26,6 +26,7 @@
 import { ensureQuicklookLinkIsCreated } from "./utils/quicklook.js";
 const debug = getParam("debugusdz");
+const debugUsdzPruning = getParam("debugusdzpruning");
 /**
  * Custom branding for the QuickLook overlay, used by {@link USDZExporter}.
@@ -384,6 +385,7 @@
         //@ts-ignore
         exporter.debug = debug;
+        exporter.pruneUnusedNodes = !debugUsdzPruning;
         exporter.keepObject = (object) => {
             // This explicitly removes geometry and material data from disabled renderers.
             // Note that this is different to the object itself being active –

src/engine-components/export/usdz/extensions/USDZText.ts CHANGED Viewed

@@ -161,9 +161,10 @@
             height = rt.height;
         }
-        newModel.matrix = rotateYAxisMatrix.clone();
+        const mat = rotateYAxisMatrix.clone();
         if (rt) // Not ideal but works for now:
-            newModel.matrix.premultiply(invertX);
+            mat.premultiply(invertX);
+        newModel.setMatrix(mat);
         const color = text.color.clone();
         newModel.material = new MeshStandardMaterial({ color: color, emissive: color });

src/engine-components/export/usdz/extensions/USDZUI.ts CHANGED Viewed

@@ -99,7 +99,7 @@
                 if (shadowComponent) {
                     const mat = shadowComponent.matrix;
-                    shadowRootModel.matrix.copy(mat);
+                    shadowRootModel.setMatrix(mat);
                     const usdObjectMap = new Map<Object3D, USDObject>();
                     const opacityMap = new Map<Object3D, number>();
@@ -111,7 +111,7 @@
                         if (child === shadowComponent) return;
                         const childModel = USDObject.createEmpty();
-                        childModel.matrix.copy(child.matrix);
+                        childModel.setMatrix(child.matrix);
                         const childParent = child.parent;
                         const isText = !!childParent && typeof childParent["textContent"] === "string" && childParent["textContent"].length > 0;

src/engine-components/postprocessing/Volume.ts CHANGED Viewed

@@ -82,6 +82,15 @@
             this._isDirty = true;
             return effect;
         }
+        else if (effect instanceof PostProcessingEffect) {
+            // if the effect is part of the shared profile remove it from there
+            const si = this.sharedProfile?.components?.indexOf(effect);
+            if (si !== undefined && si !== -1) {
+                this._isDirty = true;
+                this.sharedProfile?.components?.splice(si, 1);
+            }
+        }
         return effect;
     }
@@ -191,6 +200,8 @@
                 this._activeEffects.push(effect);
         }
+        if(debug) console.log("Apply PostProcessing", this._activeEffects);
         if (this._activeEffects.length > 0) {
             if (!this._postprocessing)
                 this._postprocessing = new PostProcessingHandler(this.context);

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

@@ -206,9 +206,8 @@
                 const mat = relativeMatrix
                     .clone()
                     .invert()
-                model.matrix = mat
-                    // apply session root scale again after undoing the world transformation
-                    .scale(new Vector3(scale, scale, scale));
+                // apply session root scale again after undoing the world transformation
+                model.setMatrix(mat.scale(new Vector3(scale, scale, scale)));
                 // Unfortunately looks like Apple's docs are incomplete:
                 // https://developer.apple.com/documentation/realitykit/preliminary_anchoringapi#Nest-and-Layer-Anchorable-Prims