fixed artoolkitUrl for the importScript

kalwalt · Apr 6, 2020 · 70ccbec · 70ccbec
1 parent b7dd550
commit 70ccbec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/nft/nftLoader.js b/nft/nftLoader.js
@@ -220,7 +220,8 @@
             pw: pw,
             ph: ph,
             camera_para: configData.cameraPara,
-            marker: markerUrl
+            marker: markerUrl,
+            artoolkitUrl: configData.artoolkitUrl
         });
 
         worker.onmessage = function(ev) {

diff --git a/resources/jsartoolkit5/artoolkit/artoolkit.worker.js b/resources/jsartoolkit5/artoolkit/artoolkit.worker.js
@@ -1,5 +1,3 @@
-importScripts('../standard/artoolkit.min.js');
-
 self.onmessage = function(e) {
     var msg = e.data;
     switch (msg.type) {
@@ -22,6 +20,8 @@ var markerResult = null;
 
 function load(msg) {
 
+    importScripts(msg.artoolkitUrl);
+
     var param = new ARCameraParam(msg.camera_para);
 
     param.onload = function () {