Code formatting.

jing-interactive · Jun 2, 2016 · e0f7848 · e0f7848
1 parent 91a2bff
commit e0f7848
Show file tree

Hide file tree

Showing 5 changed files with 181 additions and 196 deletions.
diff --git a/src/FaceOffApp.cpp b/src/FaceOffApp.cpp
@@ -294,17 +294,19 @@ void FaceOff::update()
         int nPoints = mOnlineTracker->size();
         if (mFaceMesh.getBufferTexCoords0().empty())
         {
+            auto imgSize = mOfflineTracker->getImageSize();
             for (int i = 0; i < nPoints; i++)
             {
-                mFaceMesh.appendTexCoord(mOfflineTracker->getImagePoint(i) / mOfflineTracker->getImageSize());
+                vec3 point = mOfflineTracker->getImagePoint(i);
+                mFaceMesh.appendTexCoord({ point.x / imgSize.x, point.y / imgSize.y });
             }
             mOnlineTracker->addTriangleIndices(mFaceMesh);
         }
 
         mFaceMesh.getBufferPositions().clear();
         for (int i = 0; i < nPoints; i++)
         {
-            mFaceMesh.appendPosition(vec3(mOnlineTracker->getImagePoint(i), 0));
+            mFaceMesh.appendPosition(mOnlineTracker->getImagePoint(i));
         }
 
         if (FACE_VFX_VISIBLE && mRefTex)
@@ -407,7 +409,7 @@ void FaceOff::draw()
         gl::ScopedModelMatrix modelMatrix;
         gl::ScopedColor color(ColorA(0, 1.0f, 0, 1.0f));
         gl::translate(APP_W * 0.5f - adaptiveCamW * 0.5f, APP_H * 0.5f - adaptiveCamH * 0.5f);
-        gl::draw(mOnlineTracker->getImageMesh());
+        gl::draw(mFaceMesh);
 
         if (REF_VISIBLE)
         {

diff --git a/src/IFaceTracker/IFaceTracker.cpp b/src/IFaceTracker/IFaceTracker.cpp
@@ -1,5 +1,5 @@
 #include "IFaceTracker.h"
-#include "jason_saragih_tracker/ciFacetracker.h"
+#include "jason_saragih_tracker/ciFacetracker.h"
 
 namespace ft
 {

diff --git a/src/IFaceTracker/IFaceTracker.h b/src/IFaceTracker/IFaceTracker.h
@@ -27,7 +27,7 @@ namespace ft
         virtual void reset() = 0;
         virtual int size() const = 0;
         virtual bool getFound() const = 0;
-        virtual ci::vec2 getImagePoint(int i) const = 0;
+        virtual ci::vec3 getImagePoint(int i) const = 0;
         virtual ci::TriMesh getImageMesh() const = 0;
         virtual const ci::vec2 getImageSize() const = 0;
         virtual void addTriangleIndices(ci::TriMesh& mesh) const = 0;