latest changes before release 1.6.1

- improving docs and prettifying
webarkit · Nov 22, 2023 · 7a9524e · 7a9524e
1 parent 6d5ee50
commit 7a9524e
Show file tree

Hide file tree

Showing 15 changed files with 123 additions and 124 deletions.
diff --git a/js/artoolkitNFT_ES6_custom.worker.js b/js/artoolkitNFT_ES6_custom.worker.js
@@ -98,14 +98,9 @@ function load(msg) {
   console.debug("Loading camera at:", msg.camera_para);
 
   // we cannot pass the entire ARControllerNFT, so we re-create one inside the Worker, starting from camera_param
-  ARControllerNFT.customInit(
-    msg.pw,
-    msg.ph,
-    msg.camera_para,
-    function () {
-      console.log("Message from the callback.");
-    }
-  )
+  ARControllerNFT.customInit(msg.pw, msg.ph, msg.camera_para, function () {
+    console.log("Message from the callback.");
+  })
     .then(onLoad)
     .catch(onError);
 }

diff --git a/js/artoolkitNFT_ES6_gray.worker.js b/js/artoolkitNFT_ES6_gray.worker.js
@@ -130,11 +130,7 @@ function load(msg) {
   console.debug("Loading camera at:", msg.camera_para);
 
   // we cannot pass the entire ARControllerNFT, so we re-create one inside the Worker, starting from camera_param
-  ARControllerNFT.initWithDimensions(
-    width,
-    height,
-    msg.camera_para
-  )
+  ARControllerNFT.initWithDimensions(width, height, msg.camera_para)
     .then(onLoad)
     .catch(onError);
 }

diff --git a/js/artoolkitNFT_multi_ES6.worker.js b/js/artoolkitNFT_multi_ES6.worker.js
@@ -87,17 +87,21 @@ function load(msg) {
     ar.loadNFTMarkers(msg.marker, function (ids) {
       for (var i = 0; i < ids.length; i++) {
         ar.trackNFTMarkerId(i);
-        nftMarkers.push_back(ar.getNFTData(i,i));
+        nftMarkers.push_back(ar.getNFTData(i, i));
       }
-  
+
       marker1 = ar.getNFTData(ids[0], 0);
       marker2 = ar.getNFTData(ids[1], 1);
       marker3 = ar.getNFTData(ids[2], 2);
-     
+
       nftMarkers.push_back(marker1);
 
-      console.log("Array of nftData: ", [nftMarkers.get(0), nftMarkers.get(1), nftMarkers.get(2)]);
-
+      console.log("Array of nftData: ", [
+        nftMarkers.get(0),
+        nftMarkers.get(1),
+        nftMarkers.get(2),
+      ]);
+
       postMessage({
         type: "markerInfos",
         marker1: marker1,
@@ -120,11 +124,7 @@ function load(msg) {
   console.debug("Loading camera at:", msg.camera_para);
 
   // we cannot pass the entire ARControllerNFT, so we re-create one inside the Worker, starting from camera_param
-  ARControllerNFT.initWithDimensions(
-    msg.pw,
-    msg.ph,
-    msg.camera_para
-  )
+  ARControllerNFT.initWithDimensions(msg.pw, msg.ph, msg.camera_para)
     .then(onLoad)
     .catch(onError);
 }

diff --git a/src/ARControllerNFT.ts b/src/ARControllerNFT.ts
@@ -170,7 +170,7 @@ export class ARControllerNFT implements AbstractARControllerNFT {
   static async initWithDimensions(
     width: number,
     height: number,
-    cameraParam: string
+    cameraParam: string,
   ): Promise<ARControllerNFT> {
     // directly init with given width / height
     const arControllerNFT = new ARControllerNFT(width, height, cameraParam);
@@ -198,7 +198,7 @@ export class ARControllerNFT implements AbstractARControllerNFT {
    */
   static async initWithImage(
     image: IImageObj,
-    cameraParam: string
+    cameraParam: string,
   ): Promise<ARControllerNFT> {
     const width = image.videoWidth || image.width;
     const height = image.videoHeight || image.height;
@@ -237,7 +237,7 @@ export class ARControllerNFT implements AbstractARControllerNFT {
     width: number,
     height: number,
     cameraParam: string,
-    callback: () => void
+    callback: () => void,
   ): Promise<ARControllerNFT> {
     const arControllerNFT = new ARControllerNFT(width, height, cameraParam);
     callback();
@@ -495,7 +495,7 @@ export class ARControllerNFT implements AbstractARControllerNFT {
   transMatToGLMat(
     transMat: Float64Array,
     glMat: Float64Array,
-    scale?: number
+    scale?: number,
   ): Float64Array {
     if (glMat == undefined) {
       glMat = new Float64Array(16);
@@ -538,7 +538,7 @@ export class ARControllerNFT implements AbstractARControllerNFT {
   arglCameraViewRHf(
     glMatrix: Float64Array,
     glRhMatrix?: Float64Array,
-    scale?: number
+    scale?: number,
   ): Float64Array {
     let m_modelview;
     if (glRhMatrix == undefined) {
@@ -746,15 +746,15 @@ export class ARControllerNFT implements AbstractARControllerNFT {
   async loadNFTMarker(
     urlOrData: string,
     onSuccess: (ids: number) => void,
-    onError: (err: number) => void
+    onError: (err: number) => void,
   ): Promise<number[]> {
     let nft = await this.artoolkitNFT.addNFTMarkers(
       [urlOrData],
       (ids: number[]) => {
         this.nftMarkerCount += ids.length;
         onSuccess(ids[0]);
       },
-      onError
+      onError,
     );
     return nft;
   }
@@ -766,15 +766,15 @@ export class ARControllerNFT implements AbstractARControllerNFT {
   async loadNFTMarkers(
     urlOrData: Array<string>,
     onSuccess: (ids: number[]) => void,
-    onError: (err: number) => void
+    onError: (err: number) => void,
   ): Promise<number[]> {
     let nft = await this.artoolkitNFT.addNFTMarkers(
       urlOrData,
       (ids: number[]) => {
         this.nftMarkerCount += ids.length;
         onSuccess(ids);
       },
-      onError
+      onError,
     );
     return nft;
   }
@@ -851,7 +851,7 @@ export class ARControllerNFT implements AbstractARControllerNFT {
     console.log(
       "[ARControllerNFT]",
       "Camera params loaded with ID",
-      this.cameraId
+      this.cameraId,
     );
 
     // setup

diff --git a/src/ARControllerNFT_simd.ts b/src/ARControllerNFT_simd.ts
@@ -170,7 +170,7 @@ export class ARControllerNFT implements AbstractARControllerNFT {
   static async initWithDimensions(
     width: number,
     height: number,
-    cameraParam: string
+    cameraParam: string,
   ): Promise<ARControllerNFT> {
     // directly init with given width / height
     const arControllerNFT = new ARControllerNFT(width, height, cameraParam);
@@ -198,7 +198,7 @@ export class ARControllerNFT implements AbstractARControllerNFT {
    */
   static async initWithImage(
     image: IImageObj,
-    cameraParam: string
+    cameraParam: string,
   ): Promise<ARControllerNFT> {
     const width = image.videoWidth || image.width;
     const height = image.videoHeight || image.height;
@@ -237,7 +237,7 @@ export class ARControllerNFT implements AbstractARControllerNFT {
     width: number,
     height: number,
     cameraParam: string,
-    callback: () => void
+    callback: () => void,
   ): Promise<ARControllerNFT> {
     const arControllerNFT = new ARControllerNFT(width, height, cameraParam);
     callback();
@@ -495,7 +495,7 @@ export class ARControllerNFT implements AbstractARControllerNFT {
   transMatToGLMat(
     transMat: Float64Array,
     glMat: Float64Array,
-    scale?: number
+    scale?: number,
   ): Float64Array {
     if (glMat == undefined) {
       glMat = new Float64Array(16);
@@ -538,7 +538,7 @@ export class ARControllerNFT implements AbstractARControllerNFT {
   arglCameraViewRHf(
     glMatrix: Float64Array,
     glRhMatrix?: Float64Array,
-    scale?: number
+    scale?: number,
   ): Float64Array {
     let m_modelview;
     if (glRhMatrix == undefined) {
@@ -746,15 +746,15 @@ export class ARControllerNFT implements AbstractARControllerNFT {
   async loadNFTMarker(
     urlOrData: string,
     onSuccess: (ids: number) => void,
-    onError: (err: number) => void
+    onError: (err: number) => void,
   ): Promise<number[]> {
     let nft = await this.artoolkitNFT.addNFTMarkers(
       [urlOrData],
       (ids: number[]) => {
         this.nftMarkerCount += ids.length;
         onSuccess(ids[0]);
       },
-      onError
+      onError,
     );
     return nft;
   }
@@ -766,15 +766,15 @@ export class ARControllerNFT implements AbstractARControllerNFT {
   async loadNFTMarkers(
     urlOrData: Array<string>,
     onSuccess: (ids: number[]) => void,
-    onError: (err: number) => void
+    onError: (err: number) => void,
   ): Promise<number[]> {
     let nft = await this.artoolkitNFT.addNFTMarkers(
       urlOrData,
       (ids: number[]) => {
         this.nftMarkerCount += ids.length;
         onSuccess(ids);
       },
-      onError
+      onError,
     );
     return nft;
   }
@@ -851,7 +851,7 @@ export class ARControllerNFT implements AbstractARControllerNFT {
     console.log(
       "[ARControllerNFT]",
       "Camera params loaded with ID",
-      this.cameraId
+      this.cameraId,
     );
 
     // setup

diff --git a/src/ARControllerNFT_td.ts b/src/ARControllerNFT_td.ts
@@ -170,7 +170,7 @@ export class ARControllerNFT implements AbstractARControllerNFT {
   static async initWithDimensions(
     width: number,
     height: number,
-    cameraParam: string
+    cameraParam: string,
   ): Promise<ARControllerNFT> {
     // directly init with given width / height
     const arControllerNFT = new ARControllerNFT(width, height, cameraParam);
@@ -198,7 +198,7 @@ export class ARControllerNFT implements AbstractARControllerNFT {
    */
   static async initWithImage(
     image: IImageObj,
-    cameraParam: string
+    cameraParam: string,
   ): Promise<ARControllerNFT> {
     const width = image.videoWidth || image.width;
     const height = image.videoHeight || image.height;
@@ -237,7 +237,7 @@ export class ARControllerNFT implements AbstractARControllerNFT {
     width: number,
     height: number,
     cameraParam: string,
-    callback: () => void
+    callback: () => void,
   ): Promise<ARControllerNFT> {
     const arControllerNFT = new ARControllerNFT(width, height, cameraParam);
     callback();
@@ -495,7 +495,7 @@ export class ARControllerNFT implements AbstractARControllerNFT {
   transMatToGLMat(
     transMat: Float64Array,
     glMat: Float64Array,
-    scale?: number
+    scale?: number,
   ): Float64Array {
     if (glMat == undefined) {
       glMat = new Float64Array(16);
@@ -538,7 +538,7 @@ export class ARControllerNFT implements AbstractARControllerNFT {
   arglCameraViewRHf(
     glMatrix: Float64Array,
     glRhMatrix?: Float64Array,
-    scale?: number
+    scale?: number,
   ): Float64Array {
     let m_modelview;
     if (glRhMatrix == undefined) {
@@ -746,15 +746,15 @@ export class ARControllerNFT implements AbstractARControllerNFT {
   async loadNFTMarker(
     urlOrData: string,
     onSuccess: (ids: number) => void,
-    onError: (err: number) => void
+    onError: (err: number) => void,
   ): Promise<number[]> {
     let nft = await this.artoolkitNFT.addNFTMarkers(
       [urlOrData],
       (ids: number[]) => {
         this.nftMarkerCount += ids.length;
         onSuccess(ids[0]);
       },
-      onError
+      onError,
     );
     return nft;
   }
@@ -766,15 +766,15 @@ export class ARControllerNFT implements AbstractARControllerNFT {
   async loadNFTMarkers(
     urlOrData: Array<string>,
     onSuccess: (ids: number[]) => void,
-    onError: (err: number) => void
+    onError: (err: number) => void,
   ): Promise<number[]> {
     let nft = await this.artoolkitNFT.addNFTMarkers(
       urlOrData,
       (ids: number[]) => {
         this.nftMarkerCount += ids.length;
         onSuccess(ids);
       },
-      onError
+      onError,
     );
     return nft;
   }
@@ -851,7 +851,7 @@ export class ARControllerNFT implements AbstractARControllerNFT {
     console.log(
       "[ARControllerNFT]",
       "Camera params loaded with ID",
-      this.cameraId
+      this.cameraId,
     );
 
     // setup