Upgrade xcode & xcode_ios build.

Remove bad images.
jing-interactive · Jun 9, 2016 · 996ed9f · 996ed9f
1 parent 37e4f40
commit 996ed9f
Show file tree

Hide file tree

Showing 6 changed files with 177 additions and 153 deletions.
diff --git a/assets/people/p1947382435.jpg b/assets/people/p1947382435.jpg
diff --git a/assets/people/p1947388256.jpg b/assets/people/p1947388256.jpg
diff --git a/assets/people/p1990706192.jpg b/assets/people/p1990706192.jpg
diff --git a/src/FaceOffApp.cpp b/src/FaceOffApp.cpp
@@ -17,6 +17,8 @@
 
 #include "IFaceTracker/IFaceTracker.h"
 #include "MiniConfig.h"
+#include "AssetManager.h"
+
 #include "Clone.h"
 
 #if 0 // defined (CINDER_MSW)
@@ -290,13 +292,7 @@ void FaceOff::setup()
         }
     }
 
-    // TODO: assert
-    fs::directory_iterator kEnd;
-    fs::path peopleFolder = getAssetPath("people");
-    for (fs::directory_iterator it(peopleFolder); it != kEnd; ++it)
-    {
-        mPeopleNames.push_back(it->path().filename().string());
-    }
+    mPeopleNames = am::shortPaths("people");
 
 #if !defined( CINDER_GL_ES )
     mParam = params::InterfaceGl::create("param", ivec2(300, getConfigUIHeight()));