changing around data folders

.gitignore

@@ -32,4 +32,9 @@ build/
 # data
 datasets/animals
 datasets/vgg16_weights.h5
-*.sqlite3
+*.sqlite3
+
+# models
+models/image-net-2012.words
+models/image-net-2012.sqlite3
+models/shape_predictor_68_face_landmarks.dat

apps/ConvnetClassifier/src/ofApp.cpp

@@ -30,7 +30,7 @@ void ofApp::setup() {
     setClassifier( SVM_LINEAR );
 
 
-    ccv.setup("image-net-2012.sqlite3");
+    ccv.setup("../../../../models/image-net-2012.sqlite3");
     if (!ccv.isLoaded()) return;
 
 }

apps/ConvnetOSC/src/ofApp.cpp

@@ -6,7 +6,7 @@ void ofApp::setup() {
     ofSetWindowTitle("ConvnetOSC");
     cam.initGrabber(320, 240);
 
-    ccv.setup("image-net-2012.sqlite3");
+    ccv.setup("../../../../models/image-net-2012.sqlite3");
     if (!ccv.isLoaded()) return;
 
     // default settings

apps/ConvnetViewer/src/ofApp.cpp

@@ -4,7 +4,7 @@
 void ofApp::setup(){
     ofSetWindowShape(1280, 800);
     grab.initGrabber(640, 480);
-    ccv.setup("image-net-2012.sqlite3");
+    ccv.setup("../../../../models/image-net-2012.sqlite3");
     ccv.setEncode(true);
     ccv.start();
 }

apps/FaceClassifier/src/ofApp.cpp

@@ -53,17 +53,13 @@ void ofApp::setup(){
     drawPose = false;
     drawVideo = false;
 
-
-    //FaceTracker2 setup
-    ofSetDataPathRoot(ofFile(__BASE_FILE__).getEnclosingDirectory()+"../../model/");
-
     // Setup grabber
     grabber.setup(1280,720);
     //grabber.setup(960,540);
 
     // Setup tracker
-    tracker.setup();
-    
+    tracker.setup("../../../../models/shape_predictor_68_face_landmarks.dat");
+
 }
 
 //--------------------------------------------------------------

apps/FaceDTW/src/ofApp.cpp

@@ -64,15 +64,12 @@ pipeline.addPostProcessingModule( ClassLabelTimeoutFilter(timeOutFilter,ClassLab
     drawVideo = false;
 
 
-    //FaceTracker2 setup
-    ofSetDataPathRoot(ofFile(__BASE_FILE__).getEnclosingDirectory()+"../../model/");
-
     // Setup grabber
     grabber.setup(1280,720);
     //grabber.setup(960,540);
 
     // Setup tracker
-    tracker.setup();
+    tracker.setup("../../../../models/shape_predictor_68_face_landmarks.dat");
 
 }
 

apps/FaceRegressor/src/ofApp.cpp

@@ -65,16 +65,12 @@ void ofApp::setup(){
     drawVideo = true;
 
 
-    //FaceTracker2 setup
-    ofSetDataPathRoot(ofFile(__BASE_FILE__).getEnclosingDirectory()+"../../model/");
-
     // Setup grabber
     grabber.setup(1280,720);
     //grabber.setup(960,540);
 
     // Setup tracker
-    tracker.setup();
-
+    tracker.setup("../../../../models/shape_predictor_68_face_landmarks.dat");
 
 }
 

models/README.md

@@ -0,0 +1,5 @@
+This folder needs to contain the landmark predictor data file for the examples using ofxFaceTracker2 to work, and it needs to contain the image-net-2012 weights and class names for examples with ofxCcv to work.
+
+Run `sh setup.sh` from the root folder to download the `shape_predictor_68_face_landmarks.dat` data file automatically from [sourceforge.net/projects/dclib/files/dlib/v18.10/shape_predictor_68_face_landmarks.dat.bz2](https://sourceforge.net/projects/dclib/files/dlib/v18.10/shape_predictor_68_face_landmarks.dat.bz2), as well as [image-net-2012.sqlite3](https://raw.githubusercontent.com/liuliu/ccv/unstable/samples/image-net-2012.sqlite3) and [image-net-2012.words](https://raw.githubusercontent.com/liuliu/ccv/unstable/samples/image-net-2012.words).
+
+Alternatively, download those files manually and unzip the landmarks file. 

setup.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+echo "Downloading shape_predictor_68_face_landmarks.dat"
+curl -L -o models/shape_predictor_68_face_landmarks.dat.bz2 --progress-bar https://sourceforge.net/projects/dclib/files/dlib/v18.10/shape_predictor_68_face_landmarks.dat.bz2
+
+echo "Extracting shape_predictor_68_face_landmarks.dat"
+bzip2 -d models/shape_predictor_68_face_landmarks.dat.bz2
+
+echo "Downloading image-net-2012.sqlite3 and image-net-2012.words"
+curl -L -o models/image-net-2012.sqlite3 --progress-bar https://raw.githubusercontent.com/liuliu/ccv/unstable/samples/image-net-2012.sqlite3
+curl -L -o models/image-net-2012.words --progress-bar https://raw.githubusercontent.com/liuliu/ccv/unstable/samples/image-net-2012.words
+
+echo "Done"