Merge pull request #154 from webarkit/dev

fix for webpack config and separate simd libs build

.github/workflows/main.yml

@@ -40,6 +40,7 @@ jobs:
         path: |
           build
           !build/libar.bc
+          !build/libar_simd.bc
     - run: git submodule update --init
     - run: npm install
     - run: docker run -dit --name emscripten -v $(pwd):/src emscripten/emsdk:3.1.7 bash
@@ -62,10 +63,15 @@ jobs:
       with:
         files: |
           build/artoolkitNFT_ES6_wasm.js
+          build/artoolkitNFT_ES6_wasm.simd.js
           build/artoolkitNFT_wasm.js
+          build/artoolkitNFT_wasm.simd.js
           build/artoolkitNFT.debug.js
           build/artoolkitNFT.min.js
           js/artoolkitNFT_ES6.worker.js
+          js/artoolkitNFT_multi_ES6.worker.js
           js/artoolkitNFT.api.js
           js/artoolkitNFT.worker.js
-          dist/ARToolkitNFT.js
+          js/artoolkitNFT.multi_worker.js
+          dist/ARToolkitNFT.js
+          dist/ARToolkitNFT_simd.js

js/artoolkitNFT.api.js

@@ -61,7 +61,7 @@
         this._bwpointer = undefined;
         this._lumaCtx = undefined;
 
-        this.version = '1.1.1';
+        this.version = '1.1.2';
         console.info('JsartoolkitNFT ', this.version);
 
         if (typeof cameraPara === 'string') {

js/artoolkitNFT.multi_worker.js

@@ -1,4 +1,24 @@
-importScripts("../build/artoolkitNFT_wasm.js");
+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";
+  }
+})();
+
+if(browser == "Apple Safari") {
+  importScripts("../build/artoolkitNFT_wasm.js");
+} else {
+  importScripts("../build/artoolkitNFT_wasm.simd.js");
+}
+
 self.onmessage = function (e) {
   var msg = e.data;
   switch (msg.type) {

js/artoolkitNFT.worker.js

@@ -1,4 +1,24 @@
-importScripts("../build/artoolkitNFT_wasm.js");
+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";
+  }
+})();
+
+if(browser == "Apple Safari") {
+  importScripts("../build/artoolkitNFT_wasm.js");
+} else {
+  importScripts("../build/artoolkitNFT_wasm.simd.js");
+}
+
 self.onmessage = function (e) {
   var msg = e.data;
   switch (msg.type) {

js/artoolkitNFT_ES6.worker.js

@@ -1,4 +1,23 @@
-importScripts("../dist/ARToolkitNFT.js");
+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";
+  }
+})();
+
+if(browser == "Apple Safari") {
+  importScripts("../dist/ARToolkitNFT.js");
+} else {
+  importScripts("../dist/ARToolkitNFT_simd.js");
+}
 
 self.onmessage = function (e) {
   var msg = e.data;

js/artoolkitNFT_multi_ES6.worker.js

@@ -1,4 +1,23 @@
-importScripts("../dist/ARToolkitNFT.js");
+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";
+  }
+})();
+
+if(browser == "Apple Safari") {
+  importScripts("../dist/ARToolkitNFT.js");
+} else {
+  importScripts("../dist/ARToolkitNFT_simd.js");
+}
 
 self.onmessage = function (e) {
   var msg = e.data;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webarkit/jsartoolkit-nft",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "dist/ARToolkitNFT.js",
   "types": "types/src/index.d.ts",
   "description": "Emscripten port of ARToolKit5 to JavaScript. It is a lighter version of Jsartoolkit5 with only NFT markerless support",

src/ARToolkitNFT.ts

@@ -107,14 +107,14 @@ export default class ARToolkitNFT {
    * - cameraCount
    * - version
    * A message is displayed in the browser console during the intitialization, for example:
-   * "ARToolkitNFT 1.1.0"
+   * "ARToolkitNFT 1.1.2"
    */
   constructor() {
     // reference to WASM module
     this.instance;
     this.markerNFTCount = 0;
     this.cameraCount = 0;
-    this.version = "1.1.1";
+    this.version = "1.1.2";
     console.info("ARToolkitNFT ", this.version);
   }