@needle-tools/engine 4.8.6 → 4.8.7-next.3c34e8b

package/src/engine-components/webxr/WebXRImageTracking.ts

@@ -12,6 +12,7 @@ import { imageToCanvas, USDObject, USDWriter, USDZExporterContext } from "../../
 import { USDZExporter } from "../../engine-components/export/usdz/USDZExporter.js";
 import { Behaviour, GameObject } from "../Component.js";
 import { Renderer } from "../Renderer.js";
+import { Context } from "../../engine/engine_context.js";
 
 // https://github.com/immersive-web/marker-tracking/blob/main/explainer.md
 
@@ -159,6 +160,10 @@ class ImageTrackingExtension implements IUSDExporterExtension {
         this.widthInMeters = widthInMeters;
     }
 
+    private getImageTrackingComponents() {
+        return GameObject.findObjectsOfType(WebXRImageTracking, Context.Current).filter(c => c.trackedImages && c.trackedImages.length > 0 && c.activeAndEnabled);
+    }
+
     onAfterHierarchy(_context: USDZExporterContext, writer: USDWriter) {
         const iOSVersion = DeviceUtilities.getiOSVersion();
         const majorVersion = iOSVersion ? parseInt(iOSVersion.split(".")[0]) : 18;
@@ -171,12 +176,10 @@ class ImageTrackingExtension implements IUSDExporterExtension {
     }
 
     onBeforeBuildDocument(_context: USDZExporterContext) {
-        const imageTracking = GameObject.findObjectOfType(WebXRImageTracking);
-        if (!imageTracking || !imageTracking.trackedImages) return;
+        const imageTracking = this.getImageTrackingComponents()[0];
 
         // Warn if more than one tracked image is used for USDZ; that's not supported at the moment.
-        if (imageTracking.trackedImages.length > 1) 
-        {
+        if (imageTracking && imageTracking.trackedImages?.length > 1) {
             if (isDevEnvironment()) showBalloonWarning("USDZ: Only one tracked image is supported.");
             console.warn("USDZ: Only one tracked image is supported.");
         }
@@ -187,15 +190,14 @@ class ImageTrackingExtension implements IUSDExporterExtension {
     }
 
     onExportObject(object: Object3D<Object3DEventMap>, model: USDObject, _context: USDZExporterContext) {
-        const imageTracking = GameObject.findObjectOfType(WebXRImageTracking);
-        if (!imageTracking || !imageTracking.trackedImages) return;
+        const imageTracking = this.getImageTrackingComponents()[0];
+        if (!imageTracking || !imageTracking.trackedImages?.length) return;
 
+        const exporter = GameObject.findObjectOfType(USDZExporter);
+        if (!exporter) return;
 
         for (const trackedImage of imageTracking.trackedImages) {
             if (trackedImage.object?.asset === object) {
-                const exporter = GameObject.findObjectOfType(USDZExporter);
-                if (!exporter) continue;
-
                 const { scale, target } = exporter.getARScaleAndTarget();
 
                 // We have to reset the image tracking object's position and rotation, because QuickLook applies them.
@@ -220,8 +222,8 @@ class ImageTrackingExtension implements IUSDExporterExtension {
                 // Thus, we can't have separate transforms for "regularly placing content" and "placing content with an image marker".
                 // model.extraSchemas.push("Preliminary_AnchoringAPI");
                 // model.addEventListener("serialize", (_writer: USDWriter, _context: USDZExporterContext) => {
-                    // writer.appendLine( `token preliminary:anchoring:type = "image"` );
-                    // writer.appendLine( `rel preliminary:imageAnchoring:referenceImage = </${context.document.name}/Scenes/Scene/AnchoringReferenceImage>` );
+                // writer.appendLine( `token preliminary:anchoring:type = "image"` );
+                // writer.appendLine( `rel preliminary:imageAnchoring:referenceImage = </${context.document.name}/Scenes/Scene/AnchoringReferenceImage>` );
                 // });
 
                 // We can only apply this to the first tracked image, more are not supported by QuickLook.
@@ -238,7 +240,7 @@ class ImageTrackingExtension implements IUSDExporterExtension {
 export class WebXRImageTracking extends Behaviour {
 
     @serializable(WebXRImageTrackingModel)
-    trackedImages?: WebXRImageTrackingModel[];
+    trackedImages: WebXRImageTrackingModel[] = [];
 
     /** Applies smoothing based on detected jitter to the tracked image. */
     @serializable()
@@ -337,7 +339,7 @@ export class WebXRImageTracking extends Behaviour {
 
     onLeaveXR(_args: NeedleXREventArgs): void {
 
-        if(!this.supported && DeviceUtilities.isAndroidDevice()) {
+        if (!this.supported && DeviceUtilities.isAndroidDevice()) {
             showBalloonWarning(this.webXRIncubationsWarning);
         }
 
@@ -364,7 +366,7 @@ export class WebXRImageTracking extends Behaviour {
     private readonly imageToObjectMap = new Map<WebXRImageTrackingModel, { object: Object3D | null, frames: number, lastTrackingTime: number }>();
     private readonly currentImages: WebXRTrackedImage[] = [];
 
-    
+
     private readonly webXRIncubationsWarning = "Image tracking is currently not supported on this device. On Chrome for Android, you can enable the <a target=\"_blank\" href=\"#\" onclick=\"() => console.log('I')\">chrome://flags/#webxr-incubations</a> flag.";
 
     onUpdateXR(args: NeedleXREventArgs): void {