simplifying C++ code

- removing not necessary classes - fix issue #11
webarkit · May 2, 2023 · e92312d · e92312d
1 parent 60523fa
commit e92312d
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 1,363 deletions.
diff --git a/build/webarkit_ES6_wasm.js b/build/webarkit_ES6_wasm.js
diff --git a/dist/GrayScale.js b/dist/GrayScale.js
diff --git a/dist/WebARKit.js b/dist/WebARKit.js
diff --git a/dist/WebARKit.js.LICENSE.txt b/dist/WebARKit.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/emscripten/WebARKitJS.cpp b/emscripten/WebARKitJS.cpp
@@ -3,38 +3,19 @@
 void WebARKit::initTrackerGray(emscripten::val data_buffer, int width, int height) {
   auto u8 =
       emscripten::convertJSArrayToNumberVector<uint8_t>(data_buffer);
-  if (this->m_trackerType == webarkit::TRACKER_TYPE::AKAZE_TRACKER) {
-    m_akaze_tracker->initialize_gray_raw(u8.data(), width, height);
-  } else if (this->m_trackerType == webarkit::TRACKER_TYPE::ORB_TRACKER) {
-    m_orb_tracker->initialize_gray_raw(u8.data(), width, height);
-  } else {
-    throw std::invalid_argument("Invalid tracker type");
-  }
+  m_tracker->initTracker(u8.data(), width, height);
 }
 
 void WebARKit::processFrame(emscripten::val data_buffer, webarkit::ColorSpace colorSpace) {
   auto u8 =
       emscripten::convertJSArrayToNumberVector<uint8_t>(data_buffer);
-  if (this->m_trackerType == webarkit::TRACKER_TYPE::AKAZE_TRACKER) {
-    m_akaze_tracker->processFrameData(u8.data(), this->videoWidth,
+  m_tracker->processFrameData(u8.data(), this->videoWidth,
                                       this->videoHeight, colorSpace);
-  } else if (this->m_trackerType == webarkit::TRACKER_TYPE::ORB_TRACKER) {
-    m_orb_tracker->processFrameData(u8.data(), this->videoWidth,
-                                    this->videoHeight, colorSpace);
-  } else {
-    throw std::invalid_argument("Invalid tracker type");
-  }
 }
 
 emscripten::val WebARKit::getHomography() {
   std::vector<double> output;
-  if (this->m_trackerType == webarkit::TRACKER_TYPE::AKAZE_TRACKER) {
-    output = m_akaze_tracker->getOutputData();
-  } else if (this->m_trackerType == webarkit::TRACKER_TYPE::ORB_TRACKER) {
-    output = m_orb_tracker->getOutputData();
-  } else {
-    throw std::invalid_argument("Invalid tracker type");
-  }
+   output = m_tracker->getOutputData();
   emscripten::val homography = emscripten::val::array();
   for (auto i = 0; i < 9; i++) {
     homography.call<void>("push", output[i]);
@@ -45,13 +26,7 @@ emscripten::val WebARKit::getHomography() {
 
 emscripten::val WebARKit::getCorners() {
    std::vector<double> output;
-  if (this->m_trackerType == webarkit::TRACKER_TYPE::AKAZE_TRACKER) {
-    output = m_akaze_tracker->getOutputData();
-  } else if (this->m_trackerType == webarkit::TRACKER_TYPE::ORB_TRACKER) {
-    output = m_orb_tracker->getOutputData();
-  } else {
-    throw std::invalid_argument("Invalid tracker type");
-  }
+  output = m_tracker->getOutputData();
   emscripten::val corners = emscripten::val::array();
   for (auto i = 9; i < 17; i++) {
     corners.call<void>("push", output[i]);
@@ -60,15 +35,7 @@ emscripten::val WebARKit::getCorners() {
 }
 
 bool WebARKit::isValid() {
-  auto valid = false;
-  if (this->m_trackerType == webarkit::TRACKER_TYPE::AKAZE_TRACKER) {
-    valid = m_akaze_tracker->isValid();
-  } else if (this->m_trackerType == webarkit::TRACKER_TYPE::ORB_TRACKER) {
-    valid = m_orb_tracker->isValid();
-  } else {
-    throw std::invalid_argument("Invalid tracker type");
-  }
-  return valid;
+  return m_tracker->isValid();
 }
 
 #include "bindings.cpp"
diff --git a/emscripten/WebARKitJS.h b/emscripten/WebARKitJS.h
@@ -2,8 +2,9 @@
 #include <AR2/config.h>
 #include <AR2/imageFormat.h>
 #include <AR2/util.h>
-#include <WebARKitTrackers/WebARKitOpticalTracking/WebARKitAkazeTracker.h>
-#include <WebARKitTrackers/WebARKitOpticalTracking/WebARKitOrbTracker.h>
+/*#include <WebARKitTrackers/WebARKitOpticalTracking/WebARKitAkazeTracker.h>
+#include <WebARKitTrackers/WebARKitOpticalTracking/WebARKitOrbTracker.h>*/
+#include <WebARKitTrackers/WebARKitOpticalTracking/WebARKitTracker.h>
 #include <WebARKitTrackers/WebARKitOpticalTracking/WebARKitEnums.h>
 #include <emscripten.h>
 #include <emscripten/val.h>
@@ -26,17 +27,16 @@ class WebARKit {
     this->videoWidth = videoWidth;
     this->videoHeight = videoHeight;
     this->m_trackerType = trackerType;
-    if(this->m_trackerType == webarkit::TRACKER_TYPE::AKAZE_TRACKER) {
-      m_akaze_tracker = std::make_unique<webarkit::WebARKitAkazeTracker>(webarkit::WebARKitAkazeTracker());
-    } else if(this->m_trackerType == webarkit::TRACKER_TYPE::ORB_TRACKER) {
-      m_orb_tracker = std::make_unique<webarkit::WebARKitOrbTracker>(webarkit::WebARKitOrbTracker());
+     m_tracker = std::make_unique<webarkit::WebARKitTracker>(webarkit::WebARKitTracker());
+    if(this->m_trackerType == webarkit::TRACKER_TYPE::AKAZE_TRACKER || webarkit::TRACKER_TYPE::ORB_TRACKER) {
+      m_tracker->initialize(trackerType);
     } else {
       throw std::invalid_argument("Invalid tracker type");
     }
   }
 
   void initTrackerGray(emscripten::val data_buffer, int width, int height);
-  void processFrame(emscripten::val data_buffer,  webarkit::ColorSpace colorSpace);
+  void processFrame(emscripten::val data_buffer, webarkit::ColorSpace colorSpace);
   emscripten::val getHomography();
   emscripten::val getCorners();
   bool isValid();
@@ -45,6 +45,5 @@ class WebARKit {
   int videoWidth;
   int videoHeight;
   int m_trackerType;
-  std::unique_ptr<webarkit::WebARKitAkazeTracker> m_akaze_tracker;
-  std::unique_ptr<webarkit::WebARKitOrbTracker> m_orb_tracker;
+  std::unique_ptr<webarkit::WebARKitTracker> m_tracker;
 };
diff --git a/emscripten/WebARKitLib b/emscripten/WebARKitLib
diff --git a/tools/makem.js b/tools/makem.js
@@ -136,8 +136,6 @@ var ar2_sources = [
 
 var webarkit_sources = [
     'WebARKitOpticalTracking/WebARKitTracker.cpp',
-    'WebARKitOpticalTracking/WebARKitAkazeTracker.cpp',
-	'WebARKitOpticalTracking/WebARKitOrbTracker.cpp',
     'WebARKitOpticalTracking/WebARKitConfig.cpp'
 ].map(function(src) {
 	return path.resolve(__dirname, WEBARKITLIB_ROOT + '/WebARKit/WebARKitTrackers/', src);