Additional WebXR image tracking changes for native integration

packages/dev/core/src/Engines/engine.ts

@@ -297,7 +297,7 @@ export class Engine extends ThinEngine {
      * @param options An object that sets options for the image's extraction.
      * @returns ImageBitmap.
      */
-    public createImageBitmapFromSource(imageSource: string, options?: ImageBitmapOptions): Promise<ImageBitmap> {
+     public _createImageBitmapFromSource(imageSource: string, options?: ImageBitmapOptions): Promise<ImageBitmap> {
         const promise = new Promise<ImageBitmap>((resolve, reject) => {
             const image = new Image();
             image.onload = () => {

packages/dev/core/src/Engines/nativeEngine.ts

@@ -2405,20 +2405,19 @@ export class NativeEngine extends Engine {
      * @param options An object that sets options for the image's extraction.
      * @returns ImageBitmap
      */
-    public createImageBitmapFromSource(imageSource: string, options?: ImageBitmapOptions): Promise<ImageBitmap> {
+     public _createImageBitmapFromSource(imageSource: string, options?: ImageBitmapOptions): Promise<ImageBitmap> {
         const promise = new Promise<ImageBitmap>((resolve, reject) => {
             const image = this.createCanvasImage();
             image.onload = () => {
-                const imageBitmap = this._engine.createImageBitmap(image);
-                if (imageBitmap) {
+                try {
+                    const imageBitmap = this._engine.createImageBitmap(image);
                     resolve(imageBitmap);
-                    return;
-                } else {
-                    reject(`Error loading image ${image.src}`);
+                } catch (error) {
+                    reject(`Error loading image ${image.src} with exception: ${error}`);
                 }
             };
-            image.onerror = () => {
-                reject(`Error loading image ${image.src}`);
+            image.onerror = (error) => {
+                reject(`Error loading image ${image.src} with exception: ${error}`);
             };
 
             image.src = imageSource;

packages/dev/core/src/XR/features/WebXRImageTracking.ts

@@ -6,8 +6,6 @@ import { Matrix } from "../../Maths/math.vector";
 import { Nullable } from "../../types";
 import { Tools } from "../../Misc/tools";
 
-declare const XRImageTrackingResult: XRImageTrackingResult;
-
 /**
  * Options interface for the background remover plugin
  */
@@ -132,14 +130,6 @@ export class WebXRImageTracking extends WebXRAbstractFeature {
         return super.detach();
     }
 
-    /**
-     * Check if the needed objects are defined.
-     * This does not mean that the feature is enabled, but that the objects needed are well defined.
-     */
-    public isCompatible(): boolean {
-        return typeof XRImageTrackingResult !== "undefined";
-    }
-
     /**
      * Get a tracked image by its ID.
      *
@@ -174,7 +164,7 @@ export class WebXRImageTracking extends WebXRAbstractFeature {
         }
         const promises = this.options.images.map((image) => {
             if (typeof image.src === "string") {
-                return this._xrSessionManager.scene.getEngine().createImageBitmapFromSource(image.src);
+                return this._xrSessionManager.scene.getEngine()._createImageBitmapFromSource(image.src);
             } else {
                 return Promise.resolve(image.src); // resolve is probably unneeded
             }

packages/dev/core/src/XR/native/nativeXRFrame.ts

@@ -4,6 +4,7 @@ import { RegisterNativeTypeAsync } from "../../Engines/nativeEngine";
 interface INativeXRFrame extends XRFrame {
     // Native-only helper functions
     getPoseData: (space: XRSpace, baseSpace: XRReferenceSpace, vectorBuffer: ArrayBuffer, matrixBuffer: ArrayBuffer) => XRPose;
+    _imageTrackingResults?: XRImageTrackingResult[];
 }
 
 /** @hidden */
@@ -76,7 +77,9 @@ export class NativeXRFrame implements XRFrame {
         return this._nativeImpl.featurePointCloud;
     }
 
-    public readonly getImageTrackingResults = this._nativeImpl.getImageTrackingResults!.bind(this._nativeImpl);
+    public readonly getImageTrackingResults = (): XRImageTrackingResult[] => {
+        return this._nativeImpl._imageTrackingResults ?? [];
+    }
 }
 
-RegisterNativeTypeAsync("NativeXRFrame", NativeXRFrame);
+RegisterNativeTypeAsync("NativeXRFrame", NativeXRFrame);