small changes, still not works

webarkit · Nov 6, 2024 · 771a085 · 771a085
1 parent 4dea691
commit 771a085
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 41 deletions.
diff --git a/examples/css/nft-style.css b/examples/css/nft-style.css
@@ -22,10 +22,10 @@ html {
 }
 
 #loading img {
-    height: 5em;
+  height: 5em;
 }
 
-#loading span{
+#loading span {
   color: black;
   font-weight: bold;
 }
@@ -35,7 +35,7 @@ html {
 
   margin: 0.5rem;
 
-  background-color: rgba( 255,255,255,0.6 );
+  background-color: rgba(255, 255, 255, 0.6);
   border-radius: 6px;
 }
 
@@ -49,7 +49,6 @@ html {
 
 .stats-item {
   margin: 0 0 0.5rem;
-
 }
 
 .stats-item-title {
@@ -106,29 +105,6 @@ html {
   object-fit: cover;
 }
 
-#canvas_process {
-  position: absolute;
-  left: 0;
-  top: 0;
-  z-index: 80;
-
-  display: block;
-  width: 1280px;;
-  height: 720px;
-  object-fit: cover;
-}
-
 #arvideo {
   display: none;
-}
-
-#status {
-  position: absolute;
-  left:10px;
-  top: 180px;
-  background: lightslategrey;
-  border-radius: 6px;
-  color: #fff;
-  padding: 4px;
-  user-select: none;
-}
+}
diff --git a/examples/threejs_ES6_example.html b/examples/threejs_ES6_example.html
@@ -8,7 +8,7 @@
 </head>
 <body>
 <div id="loading" >
-    <!--<img  src="Data/JsartoolkitNFT-logo.gif"/>-->
+    <img  src="data/aframe-k.png"/>
     <span class="loading-text">Loading, please wait</span>
 </div>
 <!--
@@ -41,7 +41,7 @@
     <canvas id="canvas"></canvas>
     <!--<canvas width="1280" height="720" id="canvas_process"></canvas>-->
 </div>
-<img id="refIm" src="./data/pinball.jpg" width="1637" height="2048" style="display:none;">
+<!--<img id="refIm" src="./data/pinball.jpg" width="1637" height="2048" style="display:none;">-->
 <script src="js/stats.min.js"></script>
 <script src="js/three.min.js"></script>
 <script>

diff --git a/examples/threejs_worker_ES6.js b/examples/threejs_worker_ES6.js
@@ -90,7 +90,7 @@ function start(markerUrl, video, input_width, input_height, render_update, track
 
     worker = new Worker('./worker_threejs.js')
 
-    const refIm = document.getElementById("refIm");
+    //const refIm = document.getElementById("refIm");
 
     const type = setTrackerType();
     const loadImage =  (URL) => {
@@ -102,8 +102,10 @@ function start(markerUrl, video, input_width, input_height, render_update, track
               type: "initTracker",
               trackerType: type,
               imageData: buffer,
-              imgWidth: refIm.width,
-              imgHeight: refIm.height,
+              //imgWidth: refIm.width,
+              imgWidth: 1637,
+              //imgHeight: refIm.height,
+              imgHeight: 2048,
               //videoWidth: oWidth,
               //videoHeight: oHeight,
               videoWidth: vw,
@@ -204,7 +206,7 @@ function start(markerUrl, video, input_width, input_height, render_update, track
     context_process.drawImage(video, 0, 0, vw, vh, ox, oy, w, h);
 
     const imageData = context_process.getImageData(0, 0, pw, ph);
-    worker.postMessage({ type: 'process', data: imageData }, [imageData.data.buffer]);
+    worker.postMessage({ type: 'process', imagedata: imageData }, [imageData.data.buffer]);
   }
 
   const tick = function () {

diff --git a/examples/worker_threejs.js b/examples/worker_threejs.js
@@ -1,35 +1,35 @@
 importScripts("../dist/WebARKit.js");
 
 var ar;
-var next = null;
-var markerResult = null;
+let next = null;
+let markerResult = null;
 
 self.onmessage = (e) => {
-  var msg = e.data;
+  const msg = e.data;
   switch (msg.type) {
     case "initTracker": {
       initTracker(msg);
       return;
     }
     case "process": {
-      next = msg.data;
+      next = msg.imagedata;
       processFrame();
       return;
     }
   }
 };
 
 function initTracker(msg) {
-  var trackerType = msg.trackerType;
+  const trackerType = msg.trackerType;
   //console.log("msg from initTracker: ", msg);
 
-  var onLoad = function (wark) {
+  const onLoad = function (wark) {
     ar = wark;
     //console.log("wark: ", wark)
     wark.setLogLevel(WebARKit.WebARKitController.WEBARKIT_LOG_LEVEL_DEBUG);
     wark.loadTrackerGrayImage(msg.imageData, msg.imgWidth, msg.imgHeight, WebARKit.WebARKitController.RGBA);
 
-    var cameraProjMat = wark.getCameraProjectionMatrix();
+    const cameraProjMat = wark.getCameraProjectionMatrix();
     console.log("camera proj Mat: ", cameraProjMat);
 
     postMessage({