@needle-tools/engine 3.5.7-alpha → 3.5.9-alpha

package/src/engine/assets/index.ts

@@ -1,4 +1,9 @@
 
 //@ts-ignore
 import _logo from "./logo.svg"
-export const logoSVG = _logo;
+let logoUrl = _logo;
+// in next dev mode the logo is { src: string }
+if (typeof logoUrl === "object") {
+    logoUrl = (logoUrl as any).src;
+}
+export const logoSVG: string = logoUrl;

package/src/engine/engine_element_loading.ts

@@ -178,7 +178,7 @@ export class EngineLoadingView implements ILoadingViewHandler {
 
         const hasLicense = hasProLicense();
         if (!existing) {
-            this._loadingElement.style.position = "fixed";
+            this._loadingElement.style.position = "absolute";
             this._loadingElement.style.width = "100%";
             this._loadingElement.style.height = "100%";
             this._loadingElement.style.left = "0";

package/src/engine-components/AudioSource.ts

@@ -197,7 +197,7 @@ export class AudioSource extends Behaviour {
     private onVisibilityChanged = () => {
         switch (document.visibilityState) {
             case "hidden":
-                if (this.playInBackground === false) {
+                if (this.playInBackground === false || utils.isMobileDevice()) {
                     this.wasPlaying = this.isPlaying;
                     if (this.isPlaying) {
                         this.pause();

package/src/engine-components/ParticleSystem.ts

@@ -663,6 +663,9 @@ export class ParticleSystem extends Behaviour implements IParticleSystem {
         }
     }
 
+    @serializable()
+    playOnAwake: boolean = true;
+
     @serializable(ColorOverLifetimeModule)
     readonly colorOverLifetime!: ColorOverLifetimeModule;
 
@@ -881,7 +884,9 @@ export class ParticleSystem extends Behaviour implements IParticleSystem {
             this.inheritVelocity.system = this;
         if (this._batchSystem)
             this._batchSystem.visible = true;
-        this.play();
+        if (this.playOnAwake)
+            this.play();
+        this._isPlaying = this.playOnAwake;
     }
 
     onDisable() {

package/src/engine-components/SceneSwitcher.ts

@@ -77,6 +77,10 @@ export class SceneSwitcher extends Behaviour {
 
     private _preloadScheduler?: PreLoadScheduler;
 
+    awake(): void {
+        if(debug) console.log("SceneSwitcher", this);
+    }
+
     async start() {
         if (this._currentIndex === -1 && !await this.tryLoadFromQueryParam()) {
             const value = this.context.domElement.getAttribute(ENGINE_ELEMENT_SCENE_ATTRIBUTE_NAME);
@@ -351,12 +355,12 @@ class PreLoadScheduler {
     maxConcurrent: number;
 
     private _isRunning: boolean = false;
-    private _rooms: SceneSwitcher;
-    private _roomTasks: LoadTask[] = [];
+    private _switcher: SceneSwitcher;
+    private _loadTasks: LoadTask[] = [];
     private _maxConcurrentLoads: number = 1;
 
     constructor(rooms: SceneSwitcher, ahead: number = 1, behind: number = 1, maxConcurrent: number = 2) {
-        this._rooms = rooms;
+        this._switcher = rooms;
         this.maxLoadAhead = ahead;
         this.maxLoadBehind = behind;
         this.maxConcurrent = maxConcurrent;
@@ -369,7 +373,7 @@ class PreLoadScheduler {
         let lastRoom: number = -1;
         let searchDistance: number;
         let searchCall: number;
-        const array = this._rooms.scenes;
+        const array = this._switcher.scenes;
         let interval = setInterval(() => {
             if (this.allLoaded()) {
                 if (debug)
@@ -381,8 +385,8 @@ class PreLoadScheduler {
                 return;
             }
             if (this.canLoadNewScene() === false) return;
-            if (lastRoom !== this._rooms.currentIndex) {
-                lastRoom = this._rooms.currentIndex;
+            if (lastRoom !== this._switcher.currentIndex) {
+                lastRoom = this._switcher.currentIndex;
                 searchCall = 0;
                 searchDistance = 0;
             }
@@ -396,7 +400,7 @@ class PreLoadScheduler {
             // if (roomIndex < 0) roomIndex = array.length + roomIndex;
             if (roomIndex < 0 || roomIndex >= array.length) return;
             const scene = array[roomIndex];
-            new LoadTask(roomIndex, scene, this._roomTasks);
+            new LoadTask(roomIndex, scene, this._loadTasks);
         }, 200);
     }
 
@@ -405,12 +409,12 @@ class PreLoadScheduler {
     }
 
     canLoadNewScene(): boolean {
-        return this._roomTasks.length < this._maxConcurrentLoads;
+        return this._loadTasks.length < this._maxConcurrentLoads;
     }
 
     allLoaded(): boolean {
-        for (const room of this._rooms.scenes) {
-            if (room.isLoaded() === false) return false;
+        for (const scene of this._switcher.scenes) {
+            if (scene?.isLoaded() === false) return false;
         }
         return true;
     }

package/src/engine-components/export/usdz/ThreeUSDZExporter.ts

@@ -66,6 +66,13 @@ class USDObject {
 
 	}
 
+	static createEmpty() {
+		
+		const empty = new USDObject( MathUtils.generateUUID(), 'Empty_' + ( USDObject.USDObject_export_id ++ ), new Matrix4() );
+		empty.isDynamic = true;
+		return empty;
+	}
+
 	constructor( id, name, matrix, mesh: BufferGeometry | null = null, material: Material | null = null, camera: Camera | null = null ) {
 
 		this.uuid = id;
@@ -443,7 +450,7 @@ class USDZExporter {
 
 		await invokeAll( context, 'onAfterSerialize' );
 
-		context.output += buildMaterials( materials, textures );
+		context.output += buildMaterials( materials, textures, options.quickLookCompatible );
 
 		const header = context.document.buildHeader();
 		const final = header + '\n' + context.output;
@@ -1100,7 +1107,7 @@ function buildVector2Array( attribute, count ) {
 
 // Materials
 
-function buildMaterials( materials, textures ) {
+function buildMaterials( materials, textures, quickLookCompatible = false ) {
 
 	const array: Array<string> = [];
 
@@ -1108,7 +1115,7 @@ function buildMaterials( materials, textures ) {
 
 		const material = materials[ uuid ];
 
-		array.push( buildMaterial( material, textures ) );
+		array.push( buildMaterial( material, textures, quickLookCompatible ) );
 
 	}
 
@@ -1121,14 +1128,13 @@ ${array.join( '' )}
 
 }
 
-function buildMaterial( material: MeshStandardMaterial, textures ) {
+function buildMaterial( material: MeshStandardMaterial, textures, quickLookCompatible = false ) {
 
 	// https://graphics.pixar.com/usd/docs/UsdPreviewSurface-Proposal.html
 
 	const pad = '            ';
 	const inputs: Array<string> = [];
 	const samplers: Array<string> = [];
-	const exportForQuickLook = false;
 
 	function buildTexture( texture, mapType, color: Color | undefined = undefined, opacity: number | undefined = undefined ) {
 
@@ -1151,7 +1157,7 @@ function buildMaterial( material: MeshStandardMaterial, textures ) {
 
 		// turns out QuickLook is buggy and interprets texture repeat inverted.
 		// Apple Feedback: 	FB10036297 and FB11442287
-		if ( exportForQuickLook ) {
+		if ( quickLookCompatible ) {
 
 			// This is NOT correct yet in QuickLook, but comes close for a range of models.
 			// It becomes more incorrect the bigger the offset is

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

@@ -110,6 +110,7 @@ export class TriggerModel implements IBehaviorElement {
     targetId?: string | Target;
     tokenId?: string;
     type?: string;
+    distance?: number;
 
     constructor(targetId?: string | Target, id?: string) {
         if (targetId) this.targetId = targetId;
@@ -127,6 +128,8 @@ export class TriggerModel implements IBehaviorElement {
             writer.appendLine(`token info:id = "${this.tokenId}"`);
         if (this.type)
             writer.appendLine(`token type = "${this.type}"`);
+        if (typeof this.distance === "number")
+            writer.appendLine(`double distance = ${this.distance}`);
         writer.closeBlock();
     }
 }
@@ -150,6 +153,13 @@ export class TriggerBuilder {
     static isTapTrigger(trigger?: TriggerModel) {
         return trigger?.tokenId === "TapGesture";
     }
+
+    static proximityToCameraTrigger(targetObject: Target, distance: number): TriggerModel {
+        const trigger = new TriggerModel(targetObject);
+        trigger.tokenId = "ProximityToCamera";
+        trigger.distance = distance;
+        return trigger;
+    }
 }
 
 export class GroupActionModel implements IBehaviorElement {

package/src/engine-components/export/usdz/index.ts

@@ -1 +1,3 @@
-export { USDZExporter } from "./USDZExporter"
+export { USDZExporter } from "./USDZExporter";
+export { USDObject } from "./ThreeUSDZExporter";
+export { type UsdzBehaviour } from "./extensions/behavior/Behaviour";

package/src/engine-components/utils/LookAt.ts

@@ -55,8 +55,9 @@ export class LookAt extends Behaviour implements UsdzBehaviour {
 
                 // rotate by 90° - counter-rotation on the parent makes sure 
                 // that without Preliminary Behaviours it still looks right
-                parent.matrix.multiply(new Matrix4().makeRotationZ(Math.PI / 2));
-                model.matrix.multiply(new Matrix4().makeRotationZ(-Math.PI / 2));
+                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));
             }
 
             const lookAt = new BehaviorModel("lookat " + this.name,