Needle Engine 3.24.1

Files changed (15) hide show

src/engine-components/AudioSource.ts +5 -2
src/engine-components/export/usdz/extensions/behavior/BehaviourComponents.ts +57 -38
src/engine-components/export/usdz/extensions/behavior/BehavioursBuilder.ts +0 -3
src/engine-components/BoxHelperComponent.ts +1 -1
src/engine-components/Collider.ts +1 -1
src/engine/engine_gizmos.ts +2 -2
src/engine/engine_networking_streams.ts +1 -1
src/engine/engine_networking.ts +12 -3
src/engine/engine_physics_rapier.ts +8 -3
src/engine/engine_serialization_core.ts +9 -3
src/engine/engine_types.ts +1 -0
src/engine-components/ParticleSystemModules.ts +1 -1
src/engine-components-experimental/networking/PlayerSync.ts +15 -11
src/engine-components/export/usdz/ThreeUSDZExporter.ts +31 -20
src/engine-components/export/usdz/extensions/USDZText.ts +8 -4

src/engine-components/AudioSource.ts CHANGED Viewed

@@ -5,6 +5,7 @@
 import { serializable } from "../engine/engine_serialization_decorator.js";
 import { ApplicationEvents } from "../engine/engine_application.js";
 import { Audio, AudioContext, AudioLoader, PositionalAudio } from "three";
+import { isDevEnvironment } from "../engine/debug/index.js";
 const debug = utils.getParam("debugaudio");
@@ -327,8 +328,10 @@
         // We only support strings and media stream
         // TODO: maybe we should return here if an invalid value is passed in
         if (clip !== undefined && typeof clip !== "string" && !(clip instanceof MediaStream)) {
-            console.warn("Called play on AudioSource with unknown argument type", clip)
-            clip = undefined;
+            if (isDevEnvironment())
+                console.warn("Called play on AudioSource with unknown argument type:", clip + "\nUsing the assigned clip instead:", this.clip)
+            // e.g. when a AudioSource.Play is called from SpatialTrigger onEnter this event is called with the TriggerReceiver... to still make this work we *re-use* our already assigned clip. Because otherwise calling `play` would not play the clip...
+            clip = this.clip;
         }
         // Check if we need to call load first

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

@@ -14,7 +14,16 @@
 import { AudioSource } from "../../../../AudioSource.js";
 import { NEEDLE_progressive } from "../../../../../engine/extensions/NEEDLE_progressive.js";
 import { isDevEnvironment } from "../../../../../engine/debug/index.js";
+import { Raycaster, ObjectRaycaster } from "../../../../ui/Raycaster.js";
+function ensureRaycaster(obj: GameObject) {
+    if (!obj) return;
+    if (!obj.getComponentInParent(Raycaster)) {
+        if (isDevEnvironment()) console.warn("Create Raycaster on " + obj.name + " because no raycaster was found in the hierarchy")
+        obj.addNewComponent(ObjectRaycaster);
+    }
+}
 export class ChangeTransformOnClick extends Behaviour implements IPointerClickHandler, UsdzBehaviour {
     @serializable(Object3D)
@@ -35,6 +44,19 @@
     private targetRot = new Quaternion();
     private targetScale = new Vector3();
+    start(): void {
+        ensureRaycaster(this.gameObject);
+    }
+    onPointerClick(args: PointerEventData) {
+        args.use();
+        if (this.coroutine) this.stopCoroutine(this.coroutine);
+        if (!this.relativeMotion)
+            this.coroutine = this.startCoroutine(this.moveToTarget());
+        else
+            this.coroutine = this.startCoroutine(this.moveRelative());
+    }
     private *moveToTarget() {
         if (!this.target || !this.object) return;
@@ -125,15 +147,6 @@
         this.coroutine = null;
     }
-    onPointerClick(args: PointerEventData) {
-        args.use();
-        if (this.coroutine) this.stopCoroutine(this.coroutine);
-        if (!this.relativeMotion)
-            this.coroutine = this.startCoroutine(this.moveToTarget());
-        else
-            this.coroutine = this.startCoroutine(this.moveRelative());
-    }
     beforeCreateDocument(ext) {
         if (this.target && this.object && this.gameObject) {
             const moveForward = new BehaviorModel("Move to " + this.target?.name,
@@ -154,7 +167,7 @@
     variantMaterial?: Material;
     @serializable()
-    fadeDuration : number = 0;
+    fadeDuration: number = 0;
     private _objectsWithThisMaterial: Mesh[] = [];
@@ -182,6 +195,10 @@
         }
     }
+    start(): void {
+        ensureRaycaster(this.gameObject);
+    }
     onPointerClick(args: PointerEventData) {
         args.use();
         if (!this.variantMaterial) return;
@@ -206,7 +223,7 @@
         if (this.materialToSwitch) {
             await NEEDLE_progressive.assignTextureLOD(this.context, this.sourceId, this.materialToSwitch, 0);
         }
-        if(this.variantMaterial) {
+        if (this.variantMaterial) {
             await NEEDLE_progressive.assignTextureLOD(this.context, this.sourceId, this.variantMaterial, 0);
         }
     }
@@ -233,17 +250,17 @@
         if (!this.materialToSwitch) return;
         const handlers = ChangeMaterialOnClick._materialTriggersPerId[this.materialToSwitch.uuid];
         if (handlers) {
-            const variants: { [key: string]: USDObject[] } = {}
+            const variants: { [key: string]: Array<USDObject> } = {}
             for (const handler of handlers) {
                 const createdVariants = handler.createVariants();
                 if (createdVariants && createdVariants.length > 0)
                     variants[handler.selfModel.uuid] = createdVariants;
             }
-            const otherVariants: any[] = [];
             for (const handler of handlers) {
+                const otherVariants: Array<USDObject> = [];
                 for (const key in variants) {
                     if (key !== handler.selfModel.uuid) {
-                        otherVariants.push(variants[key]);
+                        otherVariants.push(...variants[key]);
                     }
                 }
                 handler.createAndAttachBehaviors(ext, variants[handler.selfModel.uuid], otherVariants);
@@ -252,30 +269,21 @@
         delete ChangeMaterialOnClick._materialTriggersPerId[this.materialToSwitch.uuid];
     }
-    private createAndAttachBehaviors(ext: BehaviorExtension, myVariants, otherVariants) {
+    private createAndAttachBehaviors(ext: BehaviorExtension, myVariants: Array<USDObject>, otherVariants: Array<USDObject>) {
         const start: ActionModel[] = [];
         const select: ActionModel[] = [];
         const fadeDuration = Math.max(0, this.fadeDuration);
-        // the order here matters
-        for (const target of this.targetModels) {
-            const hideOriginal = ActionBuilder.fadeAction(target, fadeDuration, false);
-            select.push(hideOriginal);
-        }
-        for (const v of otherVariants) {
-            select.push(ActionBuilder.fadeAction(v, fadeDuration, false));
-        }
-        for (const v of myVariants) {
-            start.push(ActionBuilder.fadeAction(v, fadeDuration, false));
-            select.push(ActionBuilder.fadeAction(v, fadeDuration, true));
-        }
+        select.push(ActionBuilder.fadeAction([...this.targetModels, ...otherVariants], fadeDuration, false));
+        start.push(ActionBuilder.fadeAction(myVariants, fadeDuration, false));
+        select.push(ActionBuilder.fadeAction(myVariants, fadeDuration, true));
-        ext.addBehavior(new BehaviorModel("Select " + this.selfModel.name,
+        ext.addBehavior(new BehaviorModel("Select_" + this.selfModel.name,
             TriggerBuilder.tapTrigger(this.selfModel),
             ActionBuilder.parallel(...select))
         );
-        ext.addBehavior(new BehaviorModel("Start hidden " + this.selfModel.name,
+        ext.addBehavior(new BehaviorModel("StartHidden_" + this.selfModel.name,
             TriggerBuilder.sceneStartTrigger(),
             ActionBuilder.parallel(...start))
         );
@@ -318,6 +326,10 @@
     @serializable()
     hideSelf: boolean = true;
+    start(): void {
+        ensureRaycaster(this.gameObject);
+    }
     onPointerClick(args: PointerEventData) {
         args.use();
         if (!this.toggleOnClick && this.hideSelf)
@@ -460,12 +472,16 @@
     @serializable()
     toggleOnClick: boolean = false;
+    start(): void {
+        ensureRaycaster(this.gameObject);
+    }
     onPointerClick(args: PointerEventData) {
         args.use();
         if (!this.target && !this.clip) return;
         if (!this.target) {
             const newAudioSource = this.gameObject.addNewComponent(AudioSource);
             if (newAudioSource) {
                 newAudioSource.spatialBlend = 1;
@@ -474,9 +490,9 @@
                 this.target = newAudioSource;
             }
         }
         if (this.target) {
             if (this.target.isPlaying && this.toggleOnClick) {
                 this.target.stop();
             }
@@ -489,14 +505,14 @@
             }
         }
     }
     createBehaviours(ext, model, _context) {
         if (!this.target && !this.clip) return;
         if (model.uuid === this.gameObject.uuid) {
             const clipUrl = this.clip ? this.clip : this.target ? this.target.clip : undefined;
             if (!clipUrl) return;
-            if(typeof clipUrl !== "string") return;
+            if (typeof clipUrl !== "string") return;
             const playbackTarget = this.target ? this.target.gameObject : this.gameObject;
             const clipName = clipUrl.split("/").pop();
@@ -514,7 +530,7 @@
         if (!this.target && !this.clip) return;
         const clipUrl = this.clip ? this.clip : this.target ? this.target.clip : undefined;
         if (!clipUrl) return;
-        if(typeof clipUrl !== "string") return;
+        if (typeof clipUrl !== "string") return;
         const clipName = clipUrl.split("/").pop();
         const audio = await fetch(this.clip);
@@ -529,9 +545,6 @@
 export class PlayAnimationOnClick extends Behaviour implements IPointerClickHandler, UsdzBehaviour, UsdzAnimation {
-    @serializable(Object3D)
-    target?: Object3D;
     @serializable(Animator)
     animator?: Animator;
@@ -544,6 +557,12 @@
     @serializable()
     loopAfterPlaying: boolean = false;
+    private get target() { return this.animator?.gameObject }
+    start(): void {
+        ensureRaycaster(this.gameObject);
+    }
     onPointerClick(args: PointerEventData) {
         args.use();
         if (!this.target) return;

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

@@ -100,9 +100,6 @@
         result = (targetObject as any).getPath?.call(targetObject) as string;
     }
-    // in three there's now a new "Scenes" parent and "Scene" xform that's injected;
-    // we need to add this to our path here so that we have full paths
-    result = result.replace(document.name, document.name + "/Scenes/Scene");
     return result;
 }

src/engine-components/BoxHelperComponent.ts CHANGED Viewed

@@ -51,7 +51,7 @@
         const intersects = this.box?.intersectsBox(BoxHelperComponent.testBox);
         if (intersects) {
             if (debug)
-                Gizmos.DrawBox3(BoxHelperComponent.testBox, 0xff0000, 5);
+                Gizmos.DrawWireBox3(BoxHelperComponent.testBox, 0xff0000, 5);
         }
         return intersects;
     }

src/engine-components/Collider.ts CHANGED Viewed

@@ -131,7 +131,7 @@
         else {
             const group = this.sharedMesh as any as Group;
             if (group?.isGroup) {
-                console.warn(`MeshCollider mesh is a group \"${this.sharedMesh?.name}\", adding all children as colliders. This is currently not fully supported (colliders can not be removed from world again)`, this)
+                console.warn(`MeshCollider mesh is a group \"${this.sharedMesh?.name || this.gameObject.name}\", adding all children as colliders. This is currently not fully supported (colliders can not be removed from world again)`, this);
                 for (const ch in group.children) {
                     const child = group.children[ch] as Mesh;
                     if (child.isMesh) {

src/engine/engine_gizmos.ts CHANGED Viewed

@@ -94,7 +94,7 @@
         obj.material["depthWrite"] = false;
     }
-    static DrawBox(center: Vec3, size: Vec3, color: ColorRepresentation = defaultColor, duration: number = 0, depthTest: boolean = true) {
+    static DrawWireBox(center: Vec3, size: Vec3, color: ColorRepresentation = defaultColor, duration: number = 0, depthTest: boolean = true) {
         const obj = Internal.getBox(duration);
         obj.position.set(center.x, center.y, center.z);
         obj.scale.set(size.x, size.y, size.z);
@@ -104,7 +104,7 @@
         obj.material["depthWrite"] = false;
     }
-    static DrawBox3(box: Box3, color: ColorRepresentation = defaultColor, duration: number = 0, depthTest: boolean = true) {
+    static DrawWireBox3(box: Box3, color: ColorRepresentation = defaultColor, duration: number = 0, depthTest: boolean = true) {
         const obj = Internal.getBox(duration);
         obj.position.copy(box.getCenter(_tmp));
         obj.scale.copy(box.getSize(_tmp));

src/engine/engine_networking_streams.ts CHANGED Viewed

@@ -416,7 +416,7 @@
         }
     }
-    private onUserLeft(_: UserJoinedOrLeftRoomModel) {
+    private onUserLeft = (_: UserJoinedOrLeftRoomModel) => {
         this.stopCallsToUsersThatAreNotInTheRoomAnymore();
     }

src/engine/engine_networking.ts CHANGED Viewed

@@ -10,6 +10,7 @@
 import { PeerNetworking } from './engine_networking_peer.js';
 import { type IModel, type INetworkConnection, SendQueue } from './engine_networking_types.js';
 import { isHostedOnGlitch } from './engine_networking_utils.js';
+import { isDevEnvironment } from './debug/debug.js';
 export const debugNet = utils.getParam("debugnet") ? true : false;
 export const debugOwner = debugNet || utils.getParam("debugowner") ? true : false;
@@ -568,8 +569,9 @@
             else this.handleIncomingStringMessage(message);
             return;
         }
-        catch {
+        catch (err) {
             if (debugNet && msg === "pong") console.log("<<", msg);
+            else if (isDevEnvironment()) console.error("Failed to parse message", err);
         }
     }
@@ -685,10 +687,17 @@
             }
         }
-        const listeners = this._listeners[message.key];
+        let listeners = this._listeners[message.key];
         if (listeners) {
+            // Copy listeners array in case a listener is removed while iterating
+            listeners = [...listeners];
             for (const listener of listeners) {
-                listener(message.data);
+                try {
+                    listener(message.data);
+                }
+                catch (err) {
+                    console.error("Error invoking callback for \"" + message.key + "\"", err);
+                }
             }
         }

src/engine/engine_physics_rapier.ts CHANGED Viewed

@@ -65,6 +65,7 @@
 export class RapierPhysics implements IPhysicsEngine {
+    /** Enable to draw collider shapes */
     debugRenderColliders: boolean = false;
     removeBody(obj: IComponent) {
@@ -559,7 +560,11 @@
         // Prevent negative scales
         scale.x = Math.abs(scale.x);
         scale.y = Math.abs(scale.y);
-        const desc = ColliderDesc.capsule(height * .5 * radius * scale.y, radius * scale.x);
+        const finalRadius = radius * scale.x;
+        // half height = distance between capsule origin and top sphere origin (not the top end of the capsule)
+        height = Math.max(height, finalRadius * 2);
+        const hh = (height * .5 * scale.y) - (radius * scale.x);
+        const desc = ColliderDesc.capsule(hh, finalRadius);
         this.createCollider(collider, desc, center);
     }
@@ -594,7 +599,7 @@
                 positions = this._meshCache.get(key)!;
             }
             else {
-                console.warn(`Your MeshCollider \"${collider.name}\" is scaled\nthis is not optimal for performance since this isn't supported by the Rapier physics engine yet. Consider applying the scale to the collider mesh`);
+                console.warn(`Your MeshCollider \"${collider.name}\" is scaled (${scale.x}, ${scale.y}, ${scale.z})\nthis is not optimal for performance since this isn't supported by the Rapier physics engine yet. Consider applying the scale to the collider mesh`);
                 // showBalloonWarning("Your model is using scaled mesh colliders which is not optimal for performance: " + mesh.name + ", consider using unscaled objects");
                 const scaledPositions = new Float32Array(positions.length);
                 for (let i = 0; i < positions.length; i += 3) {
@@ -608,7 +613,7 @@
         }
         const desc = convex ? ColliderDesc.convexHull(positions) : ColliderDesc.trimesh(positions, indices);
         if (desc) {
-            const col = this.createCollider(collider, desc);
+            this.createCollider(collider, desc);
             // col.setMassProperties(1, { x: 0, y: 0, z: 0 }, { x: 0, y: 0, z: 0 }, { x: 0, y: 0, z: 0, w: 1 });
             // rb?.setTranslation({ x: 0, y: 2, z: 0 });
             // col.setTranslationWrtParent(new Vector3(0,2,0));

src/engine/engine_serialization_core.ts CHANGED Viewed

@@ -586,9 +586,15 @@
                 return null;
             }
         }
-        // the fallback - this assumes that the type has a constructor that accepts the serialized arguments
-        // made originally with THREE.Vector3 in mind but SHOULD actually not be used/called anymore
-        instance = new type(...setBuffer(data));
+        try {
+            // the fallback - this assumes that the type has a constructor that accepts the serialized arguments
+            // made originally with THREE.Vector3 in mind but SHOULD actually not be used/called anymore
+            instance = new type(...setBuffer(data));
+        }
+        catch (err) {
+            console.error("Error creating " + context.path, context.target, err)
+            return;
+        }
     }
     // recurse if the deserialized member also implements Iserializable

src/engine/engine_types.ts CHANGED Viewed

@@ -470,5 +470,6 @@
     addFixedJoint(body1: IRigidbody, body2: IRigidbody);
     addHingeJoint(body1: IRigidbody, body2: IRigidbody, anchor: Vec3, axis: Vec3);
+    /** Enable to render collider shapes */
     debugRenderColliders: boolean;
 }

src/engine-components/ParticleSystemModules.ts CHANGED Viewed

@@ -609,7 +609,7 @@
         if (this.enabled) {
             switch (this.shapeType) {
                 case ParticleSystemShapeType.Box:
-                    if (debug) Gizmos.DrawBox(this.position, this.scale, 0xdddddd, 1);
+                    if (debug) Gizmos.DrawWireBox(this.position, this.scale, 0xdddddd, 1);
                     this._vector.x = Math.random() * this.scale.x - this.scale.x / 2;
                     this._vector.y = Math.random() * this.scale.y - this.scale.y / 2;
                     this._vector.z = Math.random() * this.scale.z - this.scale.z / 2;

src/engine-components-experimental/networking/PlayerSync.ts CHANGED Viewed

@@ -165,7 +165,6 @@
             // console.warn(this.gameObject.guid, this.guid, this.owner, this.isLocalPlayer, PlayerState.isLocalPlayer(this));
             const evt = new CustomEvent("local-owner-changed", { detail: detail });
             this.dispatchEvent(evt);
-            PlayerState.dispatchEvent(PlayerStateEvent.OwnerChanged, evt);
         }
         const evt = new CustomEvent("owner-changed", { detail: detail });
         this.dispatchEvent(evt);
@@ -173,24 +172,28 @@
     }
     awake(): void {
-        PlayerState.all.push(this);
-        if(debug) console.log("Registered new PlayerState", this, PlayerState.all.length-1, PlayerState.all)
+        PlayerState.all.push(this);
+        if (debug) console.log("Registered new PlayerState", this.guid, PlayerState.all.length - 1, PlayerState.all)
-        this.context.connection.beginListen(RoomEvents.UserLeftRoom, (model: { userId: string }) => {
-            // console.log("USER LEFT", model.userId)
-            if (model.userId === this.owner) {
-                // console.log("LEFT", this.owner)
-                this.doDestroy();
-                return;
-            }
-        });
+        this.context.connection.beginListen(RoomEvents.UserLeftRoom, this.onUserLeftRoom);
     }
+    private onUserLeftRoom = (model: { userId: string }) => {
+        if (model.userId === this.owner) {
+            if (debug)
+                console.log("PLAYERSYNC LEFT", this.owner)
+            this.doDestroy();
+            return;
+        }
+    }
     start() {
         // If a player is spawned but not in the room anymore we want to destroy it
         // this might happen in a case where all users get disconnected at once and the server
         // still has the syncInstantiate messages that are sent to all clients
         if (this.owner && !this.context.connection.userIsInRoom(this.owner)) {
+            if (debug) console.log("PlayerSync.start → doDestroy because user is not in room anymore...", this)
             this.doDestroy();
             return;
         }
@@ -203,6 +206,7 @@
     }
     onDestroy() {
+        this.context.connection.stopListen(RoomEvents.UserLeftRoom, this.onUserLeftRoom);
         PlayerState.all.splice(PlayerState.all.indexOf(this), 1);
         if (this.isLocalPlayer) {

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

@@ -121,7 +121,11 @@
 		let path = this.name;
 		while ( current ) {
-			path = current.name + '/' + path;
+			// StageRoot has a special path right now since there's additional Xforms for encapsulation.
+			// Better would be to actually model them as part of our object graph, but they're written separately,
+			// so currently we don't and instead work around that here.
+			const currentName = current.parent ? current.name : (current.name + "/Scenes/Scene");
+			path = currentName + '/' + path;
 			current = current.parent;
 		}
@@ -295,6 +299,7 @@
 }
 const newLine = '\n';
+const materialRoot = '</StageRoot/Materials';
 class USDWriter {
 	str: string;
@@ -452,11 +457,16 @@
 		await invokeAll( context, 'onAfterBuildDocument' );
-		parseDocument( context );
+		parseDocument( context, () => {
+			// injected after stageRoot.
+			// TODO property use context/writer instead of string concat
+			return buildMaterials( materials, textures, options.quickLookCompatible );
+		} );
 		await invokeAll( context, 'onAfterSerialize' );
-		context.output += buildMaterials( materials, textures, options.quickLookCompatible );
+		// Moved into parseDocument callback for proper defaultPrim encapsulation
+		// context.output += buildMaterials( materials, textures, options.quickLookCompatible );
 		const header = context.document.buildHeader();
 		const final = header + '\n' + context.output;
@@ -613,7 +623,7 @@
 }
-async function parseDocument( context: USDZExporterContext ) {
+async function parseDocument( context: USDZExporterContext, afterStageRoot: () => string ) {
 	for ( const child of context.document.children ) {
@@ -656,6 +666,7 @@
 	writer.closeBlock();
 	writer.closeBlock();
+	writer.appendLine(afterStageRoot());
 	writer.closeBlock();
 	context.output += writer.toString();
@@ -927,8 +938,8 @@
 	if ( geometry ) {
 		writer.beginBlock( `def Xform "${name}" (
-prepend references = @./geometries/Geometry_${geometry.id}.usd@</Geometry>
-prepend apiSchemas = ["MaterialBindingAPI"]
+		prepend references = @./geometries/Geometry_${geometry.id}.usd@</Geometry>
+		${material ? 'prepend apiSchemas = ["MaterialBindingAPI"]' : ''}
 		)` );
 	}
 	else if ( camera )
@@ -936,8 +947,8 @@
 	else
 		writer.beginBlock( `def Xform "${name}"` );
-	if ( material )
-		writer.appendLine( `rel material:binding = </Materials/Material_${material.id}>` );
+	if ( geometry && material )
+		writer.appendLine( `rel material:binding = ${materialRoot}/Material_${material.id}>` );
 	writer.appendLine( `matrix4d xformOp:transform = ${transform}` );
 	writer.appendLine( 'uniform token[] xformOpOrder = ["xformOp:transform"]' );
@@ -1214,7 +1225,7 @@
 		}
 		const needsTextureTransform = ( repeat.x != 1 || repeat.y != 1 || offset.x != 0 || offset.y != 0 || rotation != 0 );
-		const textureTransformInput = `</Materials/Material_${material.id}/${'uvReader_' + uv}.outputs:result>`;		const textureTransformOutput = `</Materials/Material_${material.id}/Transform2d_${mapType}.outputs:result>`;
+		const textureTransformInput = `${materialRoot}/Material_${material.id}/${'uvReader_' + uv}.outputs:result>`;		const textureTransformOutput = `${materialRoot}/Material_${material.id}/Transform2d_${mapType}.outputs:result>`;
 		const needsTextureScale = mapType !== 'normal' && (color && (color.r !== 1 || color.g !== 1 || color.b !== 1 || opacity !== 1)) || false;
 		const needsNormalScaleAndBias = mapType === 'normal';
@@ -1279,15 +1290,15 @@
 	if ( material.map !== null ) {
-		inputs.push( `${pad}color3f inputs:diffuseColor.connect = </Materials/Material_${material.id}/Texture_${material.map.id}_diffuse.outputs:rgb>` );
+		inputs.push( `${pad}color3f inputs:diffuseColor.connect = ${materialRoot}/Material_${material.id}/Texture_${material.map.id}_diffuse.outputs:rgb>` );
 		if ( material.transparent ) {
-			inputs.push( `${pad}float inputs:opacity.connect = </Materials/Material_${material.id}/Texture_${material.map.id}_diffuse.outputs:a>` );
+			inputs.push( `${pad}float inputs:opacity.connect = ${materialRoot}/Material_${material.id}/Texture_${material.map.id}_diffuse.outputs:a>` );
 		} else if ( material.alphaTest > 0.0 ) {
-			inputs.push( `${pad}float inputs:opacity.connect = </Materials/Material_${material.id}/Texture_${material.map.id}_diffuse.outputs:a>` );
+			inputs.push( `${pad}float inputs:opacity.connect = ${materialRoot}/Material_${material.id}/Texture_${material.map.id}_diffuse.outputs:a>` );
 			inputs.push( `${pad}float inputs:opacityThreshold = ${material.alphaTest}` );
 		}
@@ -1302,7 +1313,7 @@
 	if ( material.aoMap ) {
-		inputs.push( `${pad}float inputs:occlusion.connect = </Materials/Material_${material.id}/Texture_${material.aoMap.id}_occlusion.outputs:r>` );
+		inputs.push( `${pad}float inputs:occlusion.connect = ${materialRoot}/Material_${material.id}/Texture_${material.aoMap.id}_occlusion.outputs:r>` );
 		samplers.push( buildTexture( material.aoMap, 'occlusion' ) );
@@ -1310,7 +1321,7 @@
 	if ( material.alphaMap ) {
-		inputs.push( `${pad}float inputs:opacity.connect = </Materials/Material_${material.id}/Texture_${material.alphaMap.id}_opacity.outputs:r>` );
+		inputs.push( `${pad}float inputs:opacity.connect = ${materialRoot}/Material_${material.id}/Texture_${material.alphaMap.id}_opacity.outputs:r>` );
 		inputs.push( `${pad}float inputs:opacityThreshold = 0.0001` );
 		samplers.push( buildTexture( material.alphaMap, 'opacity' ) );
@@ -1331,7 +1342,7 @@
 		if ( material.emissiveMap ) {
-			inputs.push( `${pad}color3f inputs:emissiveColor.connect = </Materials/Material_${material.id}/Texture_${material.emissiveMap.id}_emissive.outputs:rgb>` );
+			inputs.push( `${pad}color3f inputs:emissiveColor.connect = ${materialRoot}/Material_${material.id}/Texture_${material.emissiveMap.id}_emissive.outputs:rgb>` );
 			samplers.push( buildTexture( material.emissiveMap, 'emissive' ) );
@@ -1347,7 +1358,7 @@
 		if ( material.normalMap ) {
-			inputs.push( `${pad}normal3f inputs:normal.connect = </Materials/Material_${material.id}/Texture_${material.normalMap.id}_normal.outputs:rgb>` );
+			inputs.push( `${pad}normal3f inputs:normal.connect = ${materialRoot}/Material_${material.id}/Texture_${material.normalMap.id}_normal.outputs:rgb>` );
 			samplers.push( buildTexture( material.normalMap, 'normal' ) );
@@ -1355,7 +1366,7 @@
 		if ( material.roughnessMap && material.roughness === 1 ) {
-			inputs.push( `${pad}float inputs:roughness.connect = </Materials/Material_${material.id}/Texture_${material.roughnessMap.id}_roughness.outputs:g>` );
+			inputs.push( `${pad}float inputs:roughness.connect = ${materialRoot}/Material_${material.id}/Texture_${material.roughnessMap.id}_roughness.outputs:g>` );
 			samplers.push( buildTexture( material.roughnessMap, 'roughness' ) );
@@ -1367,7 +1378,7 @@
 		if ( material.metalnessMap && material.metalness === 1 ) {
-			inputs.push( `${pad}float inputs:metallic.connect = </Materials/Material_${material.id}/Texture_${material.metalnessMap.id}_metallic.outputs:b>` );
+			inputs.push( `${pad}float inputs:metallic.connect = ${materialRoot}/Material_${material.id}/Texture_${material.metalnessMap.id}_metallic.outputs:b>` );
 			samplers.push( buildTexture( material.metalnessMap, 'metallic' ) );
@@ -1387,7 +1398,7 @@
 		if ( !material.transparent && ! (material.alphaTest > 0.0) && material.transmissionMap) {
-			inputs.push( `${pad}float inputs:opacity.connect = </Materials/Material_${material.id}/Texture_${material.transmissionMap.id}_transmission.outputs:r>` );
+			inputs.push( `${pad}float inputs:opacity.connect = ${materialRoot}/Material_${material.id}/Texture_${material.transmissionMap.id}_transmission.outputs:r>` );
 			samplers.push( buildTexture( material.transmissionMap, 'transmission' ) );
 		}
@@ -1405,7 +1416,7 @@
             token outputs:surface
         }
-        token outputs:surface.connect = </Materials/Material_${material.id}/PreviewSurface.outputs:surface>
+        token outputs:surface.connect = ${materialRoot}/Material_${material.id}/PreviewSurface.outputs:surface>
         def Shader "uvReader_st"
         {

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

@@ -75,9 +75,10 @@
     writeTo(_document: USDDocument | undefined, writer: USDWriter) {
+		writer.beginBlock( `def Preliminary_Text "${this.id}" (
+            prepend apiSchemas = ["MaterialBindingAPI"]
+                    )` );
-        writer.beginBlock(`def Preliminary_Text "${this.id}"`);
         if (this.content)
             writer.appendLine(`string content = "${this.content}"`);
@@ -103,7 +104,7 @@
             writer.appendLine(`token verticalAlignment = "${this.verticalAlignment}"`);
         if (this.material !== undefined) {
-            writer.appendLine(`rel material:binding = </Materials/Material_${this.material.id}>`)
+            writer.appendLine(`rel material:binding = </StageRoot/Materials/Material_${this.material.id}>`)
         }
         writer.closeBlock();
@@ -211,11 +212,14 @@
         if (rt) // Not ideal but works for now:
             newModel.matrix.premultiply(invertX);
-        const color = new Color().copySRGBToLinear(text.color);
+        const color = text.color.clone();
         newModel.material = new MeshStandardMaterial({ color: color, emissive: color });
         newModel.addEventListener("serialize", (writer: USDWriter, _context: USDZExporterContext) => {
             let txt = text.text;
+            // Some texts use \r\n for newlines, we remove the \r here.
+            // Also encountered a single text ending with \r which broke the output.
+            txt = txt.replace(/\r/g, "");
             txt = txt.replace(/\n/g, "\\n");
             const textObj = TextBuilder.multiLine(txt, width, height, HorizontalAlignment.center, VerticalAlignment.bottom, TextWrapMode.flowing);
             this.setTextAlignment(textObj, text.alignment);