@needle-tools/engine 2.67.14-pre → 2.67.16-pre

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@needle-tools/engine",
-    "version": "2.67.14-pre",
+    "version": "2.67.16-pre",
     "description": "Needle Engine is a web-based runtime for 3D apps. It runs on your machine for development, and can be deployed anywhere. It is flexible, extensible, and collaboration and XR come naturally.",
     "main": "dist/needle-engine.umd.cjs",
     "module": "lib/needle-engine.js",

package/plugins/generate-font.js

@@ -48,7 +48,9 @@ generateBMFont(fontPath, opts,
     (error, textures, font) => {
         if (error) throw error;
         textures.forEach((texture, index) => {
-            const fileName = path.parse(texture.filename).name.toLocaleLowerCase() + ".png";
+            const directory = path.dirname(texture.filename);
+            // remove the directory from the filename, we can not rely on path.parse because it fails if the filename contains a dot
+            const fileName = texture.filename.substring(directory.length) + ".png";
             const outputPath = outputDir + "/" + fileName;
             console.log("Write to", outputPath);
             if (index > 0) console.log("WARN: Multiple font textures generated but they will override each other. You have currently " + charset?.length + " characters configured. Maybe too many?");
@@ -58,7 +60,7 @@ generateBMFont(fontPath, opts,
         });
 
         const fileName = path.parse(font.filename).name;
-        const name = outputDir + "/" + fileName.toLocaleLowerCase() + "-msdf.json";
+        const name = outputDir + "/" + fileName + "-msdf.json";
         fs.writeFile(name, font.data, (err) => {
             if (err) throw err;
         });

package/src/engine/codegen/register_types.js

@@ -1,5 +1,5 @@
 import { TypeStore } from "./../engine_typestore"
-
+
 // Import types
 import { __Ignore } from "../../engine-components/codegen/components";
 import { AlignmentConstraint } from "../../engine-components/AlignmentConstraint";
@@ -179,7 +179,7 @@ import { XRGrabModel } from "../../engine-components/WebXRGrabRendering";
 import { XRGrabRendering } from "../../engine-components/WebXRGrabRendering";
 import { XRRig } from "../../engine-components/WebXRRig";
 import { XRState } from "../../engine-components/XRFlag";
-
+
 // Register types
 TypeStore.add("__Ignore", __Ignore);
 TypeStore.add("AlignmentConstraint", AlignmentConstraint);

package/src/engine-components/timeline/PlayableDirector.ts

@@ -6,7 +6,7 @@ import { AudioSource } from '../AudioSource';
 import { SignalReceiver } from './SignalAsset';
 import * as Models from "./TimelineModels";
 import * as Tracks from "./TimelineTracks";
-import { deepClone, getParam } from '../../engine/engine_utils';
+import { deepClone, delay, getParam } from '../../engine/engine_utils';
 import { GuidsMap } from '../../engine/engine_types';
 import { Object3D } from 'three';
 import { isLocalNetwork } from '../../engine/engine_networking_utils';
@@ -87,6 +87,8 @@ export class PlayableDirector extends Behaviour {
     get speed(): number { return this._speed; }
     set speed(value: number) { this._speed = value; }
 
+    /** When enabled the timeline will wait for audio tracks to load at the current time before starting to play */
+    waitForAudio: boolean = true;
 
     private _visibilityChangeEvt?: any;
     private _clonedPlayableAsset: boolean = false;
@@ -151,13 +153,28 @@ export class PlayableDirector extends Behaviour {
         this.setupAndCreateTrackHandlers();
     }
 
-    play() {
+    async play() {
         if (!this.isValid()) return;
         const pauseChanged = this._isPaused == true;
         this._isPaused = false;
         if (pauseChanged) this.invokePauseChangedMethodsOnTracks();
         if (this._isPlaying) return;
         this._isPlaying = true;
+        if (this.waitForAudio) {
+            // Make sure audio tracks have loaded at the current time
+            const promises: Array<Promise<any>> = [];
+            for (const track of this._audioTracks) {
+                const promise = track.loadAudio(this._time, 1, 0);
+                if (promise)
+                    promises.push(promise);
+            }
+            if (promises.length > 0) {
+                await Promise.all(promises);
+                if (!this._isPlaying) return;
+            }
+            while(this._audioTracks.length > 0 && this._isPlaying && !AudioSource.userInteractionRegistered && this.waitForAudio) 
+                await delay(200);
+        }
         this._internalUpdateRoutine = this.startCoroutine(this.internalUpdate());
     }
 
@@ -363,6 +380,25 @@ export class PlayableDirector extends Behaviour {
                         console.warn("Missing binding", binding, track.name, track.type, this.name, this.playableAsset.name);
                 }
             }
+            if (track.type === Models.TrackType.Control) {
+                for (let i = 0; i < track.clips.length; i++) {
+                    const clip = track.clips[i];
+                    let binding = clip.asset.sourceObject;
+                    if (typeof binding === "string") {
+                        if (this._guidsMap && this._guidsMap[binding])
+                            binding = this._guidsMap[binding];
+                        const obj = GameObject.findByGuid(binding, root);
+                        if (obj === null || typeof obj !== "object") {
+                            console.warn("Failed to resolve sourceObject binding", binding, track.name, clip);
+                        }
+                        else {
+                            if (debug)
+                                console.log("Resolved binding", binding, "to", obj);
+                            clip.asset.sourceObject = obj;
+                        }
+                    }
+                }
+            }
         }
     }
 

package/src/engine-components/timeline/TimelineTracks.ts

@@ -657,6 +657,9 @@ export class AudioTrackHandler extends TrackHandler {
     }
 
     private static _currentlyLoading: Map<string, Promise<AudioBuffer | null>> = new Map();
+    public static dispose() {
+        AudioTrackHandler._currentlyLoading.clear();
+    }
     
     private handleAudioLoading(model: Models.ClipModel, audio: THREE.Audio): Promise<AudioBuffer | null> | null {
         if (!this._audioLoader) {
@@ -665,8 +668,12 @@ export class AudioTrackHandler extends TrackHandler {
         // TODO: maybe we should cache the loaders / buffers here by path
         const path = this.getAudioFilePath(model.asset.clip);
 
-        if(AudioTrackHandler._currentlyLoading.get(path)) {
-            return AudioTrackHandler._currentlyLoading.get(path)!;
+        if (AudioTrackHandler._currentlyLoading.get(path)) {
+            const promise = AudioTrackHandler._currentlyLoading.get(path)!
+            promise.then((buffer) => {
+                if (buffer) audio.setBuffer(buffer);
+            });
+            return promise;
         }
         
         if (debug) console.warn("LOAD audio track", path, this.director.sourceId);
@@ -724,23 +731,13 @@ export class ControlTrackHandler extends TrackHandler {
     models: Array<Models.ClipModel> = [];
     timelines: Array<PlayableDirector | null> = [];
 
-    private static resolved: { [key: string]: THREE.Object3D } = {};
-
-    resolveSourceObjects(context: Context) {
+    resolveSourceObjects(_context: Context) {
         for (let i = this.models.length - 1; i >= 0; i--) {
             const model = this.models[i];
             const asset = model.asset as Models.ControlClipModel;
-            if (typeof asset.sourceObject === "string") {
-                const key = asset.sourceObject;
-                if (ControlTrackHandler.resolved[key]) {
-                    asset.sourceObject = ControlTrackHandler.resolved[key];
-                }
-                else {
-                    asset.sourceObject = GameObject.findByGuid(key, context.scene) as THREE.Object3D
-                    ControlTrackHandler.resolved[key] = asset.sourceObject;
-                }
-            }
-            if (!asset.sourceObject) {
+
+            if (!asset.sourceObject || typeof asset.sourceObject !== "object") {
+                console.log("no source object, removing model", i, asset);
                 this.models.splice(i, 1);
                 continue;
             }

package/src/engine-components/ui/Text.ts

@@ -176,7 +176,6 @@ export class Text extends Graphic {
             fontSize: fontSize,
             fontKerning: "normal",
         };
-        this.font = this.font?.toLocaleLowerCase();
         this.setFont(textOpts, this.fontStyle);
         return textOpts;
     }