Merge pull request #180 from webarkit/dev

latest from dev (SIMD fixes)
webarkit · Jun 29, 2022 · 1d650bd · 1d650bd
2 parents 211bbaa + 9c63804
commit 1d650bd
Show file tree

Hide file tree

Showing 28 changed files with 4,640 additions and 3,913 deletions.
diff --git a/build/artoolkitNFT.debug.js b/build/artoolkitNFT.debug.js
diff --git a/build/artoolkitNFT.min.js b/build/artoolkitNFT.min.js
diff --git a/build/artoolkitNFT_ES6_wasm.js b/build/artoolkitNFT_ES6_wasm.js
diff --git a/build/artoolkitNFT_ES6_wasm.simd.js b/build/artoolkitNFT_ES6_wasm.simd.js
diff --git a/build/artoolkitNFT_wasm.js b/build/artoolkitNFT_wasm.js
diff --git a/build/artoolkitNFT_wasm.simd.js b/build/artoolkitNFT_wasm.simd.js
diff --git a/dist/ARToolkitNFT.js b/dist/ARToolkitNFT.js
diff --git a/dist/ARToolkitNFT.js.LICENSE.txt b/dist/ARToolkitNFT.js.LICENSE.txt
@@ -0,0 +1 @@
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
diff --git a/dist/ARToolkitNFT_simd.js b/dist/ARToolkitNFT_simd.js
diff --git a/dist/ARToolkitNFT_simd.js.LICENSE.txt b/dist/ARToolkitNFT_simd.js.LICENSE.txt
@@ -0,0 +1 @@
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
diff --git a/js/artoolkitNFT.api.js b/js/artoolkitNFT.api.js
@@ -61,7 +61,7 @@
         this._bwpointer = undefined;
         this._lumaCtx = undefined;
 
-        this.version = '1.1.3';
+        this.version = '1.1.4';
         console.info('JsartoolkitNFT ', this.version);
 
         if (typeof cameraPara === 'string') {

diff --git a/js/artoolkitNFT.multi_worker.js b/js/artoolkitNFT.multi_worker.js
@@ -1,19 +1,30 @@
-var browser = (function() {
-  var test = function(regexp) {return regexp.test(navigator.userAgent)}
+var browser = (function () {
+  var test = function (regexp) {
+    return regexp.test(navigator.userAgent);
+  };
   switch (true) {
-      case test(/edg/i): return "Microsoft Edge";
-      case test(/trident/i): return "Microsoft Internet Explorer";
-      case test(/firefox|fxios/i): return "Mozilla Firefox";
-      case test(/opr\//i): return "Opera";
-      case test(/ucbrowser/i): return "UC Browser";
-      case test(/samsungbrowser/i): return "Samsung Browser";
-      case test(/chrome|chromium|crios/i): return "Google Chrome";
-      case test(/safari/i): return "Apple Safari";
-      default: return "Other";
+    case test(/edg/i):
+      return "Microsoft Edge";
+    case test(/trident/i):
+      return "Microsoft Internet Explorer";
+    case test(/firefox|fxios/i):
+      return "Mozilla Firefox";
+    case test(/opr\//i):
+      return "Opera";
+    case test(/ucbrowser/i):
+      return "UC Browser";
+    case test(/samsungbrowser/i):
+      return "Samsung Browser";
+    case test(/chrome|chromium|crios/i):
+      return "Google Chrome";
+    case test(/safari/i):
+      return "Apple Safari";
+    default:
+      return "Other";
   }
 })();
 
-if(browser == "Apple Safari") {
+if (browser == "Apple Safari") {
   importScripts("../build/artoolkitNFT_wasm.js");
 } else {
   importScripts("../build/artoolkitNFT_wasm.simd.js");

diff --git a/js/artoolkitNFT.worker.js b/js/artoolkitNFT.worker.js
@@ -1,19 +1,30 @@
-var browser = (function() {
-  var test = function(regexp) {return regexp.test(navigator.userAgent)}
+var browser = (function () {
+  var test = function (regexp) {
+    return regexp.test(navigator.userAgent);
+  };
   switch (true) {
-      case test(/edg/i): return "Microsoft Edge";
-      case test(/trident/i): return "Microsoft Internet Explorer";
-      case test(/firefox|fxios/i): return "Mozilla Firefox";
-      case test(/opr\//i): return "Opera";
-      case test(/ucbrowser/i): return "UC Browser";
-      case test(/samsungbrowser/i): return "Samsung Browser";
-      case test(/chrome|chromium|crios/i): return "Google Chrome";
-      case test(/safari/i): return "Apple Safari";
-      default: return "Other";
+    case test(/edg/i):
+      return "Microsoft Edge";
+    case test(/trident/i):
+      return "Microsoft Internet Explorer";
+    case test(/firefox|fxios/i):
+      return "Mozilla Firefox";
+    case test(/opr\//i):
+      return "Opera";
+    case test(/ucbrowser/i):
+      return "UC Browser";
+    case test(/samsungbrowser/i):
+      return "Samsung Browser";
+    case test(/chrome|chromium|crios/i):
+      return "Google Chrome";
+    case test(/safari/i):
+      return "Apple Safari";
+    default:
+      return "Other";
   }
 })();
 
-if(browser == "Apple Safari") {
+if (browser == "Apple Safari") {
   importScripts("../build/artoolkitNFT_wasm.js");
 } else {
   importScripts("../build/artoolkitNFT_wasm.simd.js");

diff --git a/js/artoolkitNFT_ES6.worker.js b/js/artoolkitNFT_ES6.worker.js
@@ -1,19 +1,30 @@
-var browser = (function() {
-  var test = function(regexp) {return regexp.test(navigator.userAgent)}
+var browser = (function () {
+  var test = function (regexp) {
+    return regexp.test(navigator.userAgent);
+  };
   switch (true) {
-      case test(/edg/i): return "Microsoft Edge";
-      case test(/trident/i): return "Microsoft Internet Explorer";
-      case test(/firefox|fxios/i): return "Mozilla Firefox";
-      case test(/opr\//i): return "Opera";
-      case test(/ucbrowser/i): return "UC Browser";
-      case test(/samsungbrowser/i): return "Samsung Browser";
-      case test(/chrome|chromium|crios/i): return "Google Chrome";
-      case test(/safari/i): return "Apple Safari";
-      default: return "Other";
+    case test(/edg/i):
+      return "Microsoft Edge";
+    case test(/trident/i):
+      return "Microsoft Internet Explorer";
+    case test(/firefox|fxios/i):
+      return "Mozilla Firefox";
+    case test(/opr\//i):
+      return "Opera";
+    case test(/ucbrowser/i):
+      return "UC Browser";
+    case test(/samsungbrowser/i):
+      return "Samsung Browser";
+    case test(/chrome|chromium|crios/i):
+      return "Google Chrome";
+    case test(/safari/i):
+      return "Apple Safari";
+    default:
+      return "Other";
   }
 })();
 
-if(browser == "Apple Safari") {
+if (browser == "Apple Safari") {
   importScripts("../dist/ARToolkitNFT.js");
 } else {
   importScripts("../dist/ARToolkitNFT_simd.js");

diff --git a/js/artoolkitNFT_multi_ES6.worker.js b/js/artoolkitNFT_multi_ES6.worker.js
@@ -1,19 +1,30 @@
-var browser = (function() {
-  var test = function(regexp) {return regexp.test(navigator.userAgent)}
+var browser = (function () {
+  var test = function (regexp) {
+    return regexp.test(navigator.userAgent);
+  };
   switch (true) {
-      case test(/edg/i): return "Microsoft Edge";
-      case test(/trident/i): return "Microsoft Internet Explorer";
-      case test(/firefox|fxios/i): return "Mozilla Firefox";
-      case test(/opr\//i): return "Opera";
-      case test(/ucbrowser/i): return "UC Browser";
-      case test(/samsungbrowser/i): return "Samsung Browser";
-      case test(/chrome|chromium|crios/i): return "Google Chrome";
-      case test(/safari/i): return "Apple Safari";
-      default: return "Other";
+    case test(/edg/i):
+      return "Microsoft Edge";
+    case test(/trident/i):
+      return "Microsoft Internet Explorer";
+    case test(/firefox|fxios/i):
+      return "Mozilla Firefox";
+    case test(/opr\//i):
+      return "Opera";
+    case test(/ucbrowser/i):
+      return "UC Browser";
+    case test(/samsungbrowser/i):
+      return "Samsung Browser";
+    case test(/chrome|chromium|crios/i):
+      return "Google Chrome";
+    case test(/safari/i):
+      return "Apple Safari";
+    default:
+      return "Other";
   }
 })();
 
-if(browser == "Apple Safari") {
+if (browser == "Apple Safari") {
   importScripts("../dist/ARToolkitNFT.js");
 } else {
   importScripts("../dist/ARToolkitNFT_simd.js");
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE /