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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@needle-tools/engine",
-    "version": "2.67.14-pre",
+    "version": "2.67.15-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?");

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

@@ -363,6 +363,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

@@ -724,23 +724,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;
             }