webarkit · kalwalt · Jul 9, 2024 · Sep 12, 2024 · Sep 12, 2024 · Sep 12, 2024
diff --git a/build/webarkit_ES6_wasm.js b/build/webarkit_ES6_wasm.js
diff --git a/build/webarkit_ES6_wasm.simd.js b/build/webarkit_ES6_wasm.simd.js
diff --git a/dist/GrayScale.js b/dist/GrayScale.js
diff --git a/dist/WebARKit.js b/dist/WebARKit.js
diff --git a/emscripten/WebARKitJS.cpp b/emscripten/WebARKitJS.cpp
@@ -5,9 +5,9 @@ void WebARKit::initTrackerGray(emscripten::val data_buffer, int width, int heigh
     manager.initTracker(u8.data(), width, height, colorSpace);
 }
 
-void WebARKit::processFrame(emscripten::val data_buffer, webarkit::ColorSpace colorSpace, bool enableBlur) {
+void WebARKit::processFrame(emscripten::val data_buffer, webarkit::ColorSpace colorSpace, webarkit::BLUR_TYPE blurType) {
     auto u8 = emscripten::convertJSArrayToNumberVector<uint8_t>(data_buffer);
-    manager.processFrameData(u8.data(), this->videoWidth, this->videoHeight, colorSpace, enableBlur);
+    manager.processFrameData(u8.data(), this->videoWidth, this->videoHeight, colorSpace, blurType);
 }
 
 void WebARKit::setLogLevel(int logLevel) { manager.setLogLevel(logLevel); }

diff --git a/emscripten/WebARKitJS.h b/emscripten/WebARKitJS.h
@@ -32,7 +32,7 @@ class WebARKit {
     }
 
     void initTrackerGray(emscripten::val data_buffer, int width, int height, webarkit::ColorSpace colorSpace);
-    void processFrame(emscripten::val data_buffer, webarkit::ColorSpace colorSpace, bool enableBlur);
+    void processFrame(emscripten::val data_buffer, webarkit::ColorSpace colorSpace, webarkit::BLUR_TYPE blurType);
     void setLogLevel(int logLevel);
     emscripten::val getHomography();
     emscripten::val getPoseMatrix();

diff --git a/emscripten/WebARKitLib b/emscripten/WebARKitLib
diff --git a/emscripten/bindings.cpp b/emscripten/bindings.cpp
@@ -14,6 +14,11 @@ EMSCRIPTEN_BINDINGS(constant_bindings) {
       .value("RGB", webarkit::RGB)
       .value("GRAY", webarkit::GRAY);
 
+  enum_<webarkit::BLUR_TYPE>("BLUR_TYPE")
+      .value("MEDIAN_BLUR", webarkit::MEDIAN_BLUR)
+      .value("BOX_BLUR", webarkit::BOX_BLUR)
+      .value("NONE_BLUR", webarkit::NONE_BLUR);
+
   constant("WEBARKIT_LOG_LEVEL_DEBUG", WEBARKIT_LOG_LEVEL_DEBUG + 0);
   constant("WEBARKIT_LOG_LEVEL_INFO", WEBARKIT_LOG_LEVEL_INFO + 0);
   constant("WEBARKIT_LOG_LEVEL_WARN", WEBARKIT_LOG_LEVEL_WARN + 0);

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/initCamera.js b/examples/initCamera.js
@@ -1,12 +1,13 @@
 async function initCamera(width, height) {
-
+    var aspect = width / height;
     const constraints = {
         audio: false,
         video: {
             // using the "environment" rear camera
             facingMode: "environment",
             // using the "user" front camera
             // facingMode: "user",
+            aspectRatio: { ideal: aspect },
             width: width,
             height: height
         }
@@ -21,6 +22,7 @@ async function initCamera(width, height) {
 
     return new Promise(resolve => {
         video.onloadedmetadata = () => {
+            video.play();
             resolve(video);
         };
     });

diff --git a/examples/js/jsfeatNext.js b/examples/js/jsfeatNext.js
diff --git a/examples/teblid_advanced_example.html b/examples/teblid_advanced_example.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8">
+  <title>Simple example with WebARKit</title>
+  <meta http-equiv="X-UA-Compatible" content="chrome=1">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <script src="../dist/GrayScale.js"></script>
+  <script type="text/javascript" src="stats.min.js"></script>
+  <script> 
+  function setTrackerType(){
+    return 'teblid';
+  }
+  </script>
+  <script src="worker_setup_advanced.js"></script>
+  <link rel="stylesheet" href="css/style.css">
+</head>
+
+<body>
+  <div id="stats"></div>
+  <img id="refIm" src="./data/pinball.jpg" width="1637" height="2048" style="display:none;">
+  <img id="arElem" src="./data/aframe-k.png"></img>
+  <div id="loading">Loading Image Tracking Modules...</div>
+</body>
+
+</html>
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>
 <!--
@@ -39,9 +39,9 @@
             id="video">
     </video>
     <canvas id="canvas"></canvas>
-    <canvas width="1280" height="720" id="canvas_process"></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>
@@ -73,7 +73,6 @@
                 sourceVideo = video;
                 sourceVideo.width = 1280;
                 sourceVideo.height = 720;
-                sourceVideo.play();
 
                 // init target canvas
                 initTargetCanvas();