Simplify ImageTrackerUtils.bestFitAspectRatioNDC()

src/trackers/image-tracker/image-tracker-utils.ts

@@ -28,7 +28,6 @@ import { SpeedyMatrix } from 'speedy-vision/types/core/speedy-matrix';
 import { SpeedyPoint2 } from 'speedy-vision/types/core/speedy-point';
 import { SpeedyVector2 } from 'speedy-vision/types/core/speedy-vector';
 import { SpeedyKeypoint } from 'speedy-vision/types/core/speedy-keypoint';
-import { ImageTracker } from './image-tracker';
 import { ReferenceImageWithMedia } from './reference-image';
 import { Utils } from '../../utils/utils';
 import { IllegalOperationError, IllegalArgumentError, NumericalError } from '../../utils/errors';
@@ -162,15 +161,12 @@ export class ImageTrackerUtils
 
     /**
      * Find the best-fit aspect ratio for the rectification of the reference image in NDC
-     * @param imageTracker
+     * @param screenSize
      * @param referenceImage
      * @returns a best-fit aspect ratio
      */
-    static bestFitAspectRatioNDC(imageTracker: ImageTracker, referenceImage: ReferenceImageWithMedia): number
+    static bestFitAspectRatioNDC(screenSize: SpeedySize, referenceImage: ReferenceImageWithMedia): number
     {
-        const screenSize = imageTracker.screenSize;
-        const screenAspectRatio = screenSize.width / screenSize.height;
-
         /*
         
         The best-fit aspectRatio (a) is constructed as follows:
@@ -192,6 +188,7 @@ export class ImageTrackerUtils
 
         */
 
+        const screenAspectRatio = screenSize.width / screenSize.height;
         return referenceImage.aspectRatio / screenAspectRatio;
     }
 

src/trackers/image-tracker/states/pre-tracking-a.ts

@@ -128,7 +128,7 @@ export class ImageTrackerPreTrackingAState extends ImageTrackerState
 
         // rectify the image
         const scale = TRACK_RECTIFIED_SCALE;
-        const aspectRatio = ImageTrackerUtils.bestFitAspectRatioNDC(this._imageTracker, this._referenceImage!);
+        const aspectRatio = ImageTrackerUtils.bestFitAspectRatioNDC(screenSize, this._referenceImage!);
         const shrink = ImageTrackerUtils.bestFitScaleNDC(aspectRatio, scale);
         const toScreen = ImageTrackerUtils.NDCToRaster(screenSize);
         const toNDC = ImageTrackerUtils.rasterToNDC(screenSize);

src/trackers/image-tracker/states/pre-tracking-b.ts

@@ -39,7 +39,7 @@ import { SpeedyKeypoint, SpeedyMatchedKeypoint } from 'speedy-vision/types/core/
 import { ImageTracker, ImageTrackerOutput, ImageTrackerStateName } from '../image-tracker';
 import { ImageTrackerUtils, ImageTrackerKeypointPair } from '../image-tracker-utils';
 import { ImageTrackerState, ImageTrackerStateOutput } from './state';
-import { ReferenceImage } from '../reference-image';
+import { ReferenceImageWithMedia } from '../reference-image';
 import { Nullable, Utils } from '../../../utils/utils';
 import { TrackingError } from '../../../utils/errors';
 import {
@@ -64,7 +64,7 @@ import {
 export class ImageTrackerPreTrackingBState extends ImageTrackerState
 {
     /** reference image */
-    private _referenceImage: Nullable<ReferenceImage>;
+    private _referenceImage: Nullable<ReferenceImageWithMedia>;
 
     /** a snapshot of the video from the scanning state and corresponding to the initial homography */
     private _snapshot: Nullable<SpeedyPipelineNodeImagePortalSink>;
@@ -101,7 +101,7 @@ export class ImageTrackerPreTrackingBState extends ImageTrackerState
     onEnterState(settings: Record<string,any>)
     {
         const homography = settings.homography as SpeedyMatrix;
-        const referenceImage = settings.referenceImage as ReferenceImage;
+        const referenceImage = settings.referenceImage as ReferenceImageWithMedia;
         const snapshot = settings.snapshot as SpeedyPipelineNodeImagePortalSink;
         const referenceKeypointPortalSink = settings.referenceKeypointPortalSink as SpeedyPipelineNodeKeypointPortalSink;
 
@@ -143,7 +143,7 @@ export class ImageTrackerPreTrackingBState extends ImageTrackerState
 
         // rectify the image
         const scale = TRACK_RECTIFIED_SCALE;
-        const aspectRatio = ImageTrackerUtils.bestFitAspectRatioNDC(this._imageTracker, this._referenceImage!);
+        const aspectRatio = ImageTrackerUtils.bestFitAspectRatioNDC(screenSize, this._referenceImage!);
         const shrink = ImageTrackerUtils.bestFitScaleNDC(aspectRatio, scale);
         const undistort = this._homography.inverse();
         const toScreen = ImageTrackerUtils.NDCToRaster(screenSize);
@@ -233,7 +233,7 @@ export class ImageTrackerPreTrackingBState extends ImageTrackerState
         }).then(([ warp, score ]) => {
 
             const scale = TRACK_RECTIFIED_SCALE;
-            const aspectRatio = ImageTrackerUtils.bestFitAspectRatioNDC(this._imageTracker, this._referenceImage!);
+            const aspectRatio = ImageTrackerUtils.bestFitAspectRatioNDC(this.screenSize, this._referenceImage!);
             const shrink = ImageTrackerUtils.bestFitScaleNDC(aspectRatio, scale);
             const grow = ImageTrackerUtils.inverseBestFitScaleNDC(aspectRatio, scale);
             const scaledWarp = grow.times(warp).times(shrink);

src/trackers/image-tracker/states/tracking.ts

@@ -228,7 +228,7 @@ export class ImageTrackerTrackingState extends ImageTrackerState
 
         // rectify the image
         const scale = TRACK_RECTIFIED_SCALE;
-        const aspectRatio = ImageTrackerUtils.bestFitAspectRatioNDC(this._imageTracker, this._referenceImage!);
+        const aspectRatio = ImageTrackerUtils.bestFitAspectRatioNDC(screenSize, this._referenceImage!);
         const shrink = ImageTrackerUtils.bestFitScaleNDC(aspectRatio, scale);
         const undistort = this._warpHomography.inverse();
         const toScreen = ImageTrackerUtils.NDCToRaster(screenSize);
@@ -461,7 +461,7 @@ export class ImageTrackerTrackingState extends ImageTrackerState
         }).then(([ warp, score ]) => {
 
             const scale = TRACK_RECTIFIED_SCALE;
-            const aspectRatio = ImageTrackerUtils.bestFitAspectRatioNDC(this._imageTracker, this._referenceImage!);
+            const aspectRatio = ImageTrackerUtils.bestFitAspectRatioNDC(this.screenSize, this._referenceImage!);
             const shrink = ImageTrackerUtils.bestFitScaleNDC(aspectRatio, scale);
             const grow = ImageTrackerUtils.inverseBestFitScaleNDC(aspectRatio, scale);
             const scaledWarp = grow.times(warp).times(shrink);
@@ -496,7 +496,7 @@ export class ImageTrackerTrackingState extends ImageTrackerState
         }).then(([ warp, score ]) => {
 
             const scale = TRACK_RECTIFIED_SCALE;
-            const aspectRatio = ImageTrackerUtils.bestFitAspectRatioNDC(this._imageTracker, this._referenceImage!);
+            const aspectRatio = ImageTrackerUtils.bestFitAspectRatioNDC(this.screenSize, this._referenceImage!);
             const shrink = ImageTrackerUtils.bestFitScaleNDC(aspectRatio, scale);
             const grow = ImageTrackerUtils.inverseBestFitScaleNDC(aspectRatio, scale);
             const scaledWarp = grow.times(warp).times(shrink);