src/IFaceTracker re-org

Add OpenFaceTracker.*

src/BaseFaceTracker.cpp

@@ -0,0 +1,37 @@
+#include "BaseFaceTracker.h"
+#include "JasonFaceTracker.h"
+#include "OpenFaceTracker.h"
+
+namespace jing
+{
+    using namespace std;
+    using namespace ci;
+
+    BaseFaceTrackerRef BaseFaceTracker::create(Option option)
+    {
+        BaseFaceTracker* tracker = nullptr;
+
+        if (option.method == "JasonFaceTracker")
+        {
+            auto ciTracker = new ciFaceTracker;
+            ciTracker->setRescale(option.scale);
+
+            tracker = ciTracker;
+        }
+        else if (option.method == "OpenFaceTracker")
+        {
+            auto openFaceTracker = new OpenFaceTracker;
+
+            tracker = openFaceTracker;
+        }
+        else
+        {
+            throw ci::Exception("Unknown method");
+        }
+
+        auto trackerRef = BaseFaceTrackerRef(tracker);
+        trackerRef->setup();
+
+        return trackerRef;
+    }
+}

src/IFaceTracker/IFaceTracker.h → src/BaseFaceTracker.h

@@ -4,25 +4,25 @@
 #include <cinder/Surface.h>
 #include "cinder/TriMesh.h"
 
-namespace ft
+namespace jing
 {
-    typedef std::shared_ptr<struct IFaceTracker> FaceTrackerRef;
+    typedef std::shared_ptr<struct BaseFaceTracker> BaseFaceTrackerRef;
 
     struct Option
     {
         Option()
         {
-            method = "jason_saragih_tracker";
+            method = "JasonFaceTracker";
             scale = 1.0f;
         }
 
         std::string method;
         float scale;
     };
 
-    struct IFaceTracker
+    struct BaseFaceTracker
     {
-        static FaceTrackerRef create(Option option = Option());
+        static BaseFaceTrackerRef create(Option option = Option());
         virtual bool update(const ci::Surface& surface) = 0;
         virtual void reset() = 0;
         virtual int size() const = 0;

src/FaceVFXApp.cpp

@@ -21,7 +21,7 @@
 #include "cinder/qtime/QuickTimeGl.h"
 #endif
 
-#include "IFaceTracker/IFaceTracker.h"
+#include "BaseFaceTracker.h"
 
 #include "Cinder-VNM/include/TextureHelper.h"
 #include "Cinder-VNM/include/CaptureHelper.h"
@@ -121,8 +121,8 @@ class FaceOff : public App
 
     TriMesh         mFaceMesh;
 
-    ft::FaceTrackerRef   mOnlineTracker;
-    ft::FaceTrackerRef   mOfflineTracker;
+    jing::BaseFaceTrackerRef   mOnlineTracker;
+    jing::BaseFaceTrackerRef   mOfflineTracker;
     gl::TextureRef mPhotoTex;
 
 #ifdef QUICKTIME_ENABLED
@@ -186,10 +186,10 @@ void FaceOff::updateClone()
 
 void FaceOff::trackerThreadFn()
 {
-    ft::Option option;
+    jing::Option option;
     option.scale = 0.5f;
-    mOfflineTracker = ft::IFaceTracker::create();
-    mOnlineTracker = ft::IFaceTracker::create(option);
+    mOfflineTracker = jing::BaseFaceTracker::create();
+    mOnlineTracker = jing::BaseFaceTracker::create(option);
 
     bool shouldInitFaceMesh = false;