Merge pull request #91 from local-projects/feature-kinect2-fixes

Fix addon clones, fixes for blank preview image
labatrockwell · Mar 1, 2016 · 305afc1 · 305afc1
2 parents 3f3bb41 + 64e2835
commit 305afc1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/addons/ofxTSPS/libs/ofxTSPS/include/ofxTSPS/cv/CvProcessor.h b/addons/ofxTSPS/libs/ofxTSPS/include/ofxTSPS/cv/CvProcessor.h
@@ -59,7 +59,7 @@ namespace ofxTSPS {
 
         // ofxCv stuff
         ofxCv::ContourFinder        contourFinder;
-        ofxCv::CascadeClassifier    haarFinder;
+        cv::CascadeClassifier       haarFinder;
         vector<cv::Rect>            haarObjects;
 
         // opticalflow     

diff --git a/addons/ofxTSPS/libs/ofxTSPS/src/PeopleTracker.cpp b/addons/ofxTSPS/libs/ofxTSPS/src/PeopleTracker.cpp
@@ -273,7 +273,6 @@ namespace ofxTSPS {
                 } else {
                     ofxCv::convertColor( currentSource->getPixels(), cameraImage, CV_RGB2GRAY);
                 }
-                cameraImage.update();
             } else {
                 // either resize or just copy pixels
                 if ( currentSource->getPixels().getWidth() != width || currentSource->getPixels().getHeight() != height ){
@@ -284,7 +283,8 @@ namespace ofxTSPS {
                     cameraImage.setFromPixels( currentSource->getPixels() );
                 }
             }
-
+            cameraImage.update();
+
             trackPeople();
 
             if ( p_Settings->bSendScene ){
@@ -325,7 +325,6 @@ namespace ofxTSPS {
             } else {
                 ofxCv::convertColor( currentSource->getPixels(), cameraImage, CV_RGB2GRAY);
             }
-            cameraImage.update();
         } else {
             // either resize or just copy pixels
             if ( currentSource->getPixels().getWidth() != width || currentSource->getPixels().getHeight() != height ){
@@ -336,6 +335,7 @@ namespace ofxTSPS {
                 cameraImage.setFromPixels( currentSource->getPixels() );
             }
         }
+        cameraImage.update();
 
         updateSettings();
         trackPeople();

diff --git a/cloneaddons.sh b/cloneaddons.sh
@@ -16,7 +16,7 @@ ofxMSAInteractiveObject
 ${PREFIX}labatrockwell/ofxLibwebsockets.git
 ${PREFIX}memo/ofxMSAInteractiveObject.git
 ${PREFIX}labatrockwell/ofxNI2.git
-${PREFIX}labatrockwell/ofxSpacebrew.git
-${PREFIX}labatrockwell/ofxSyphon.git
+${PREFIX}Spacebrew/ofxSpacebrew.git
+${PREFIX}astellato/ofxSyphon.git
 ${PREFIX}labatrockwell/ofxTSPSReceiver.git
 ${PREFIX}arturoc/ofxTuioWrapper.git
diff --git a/standalone/basic/TSPS.xcodeproj/project.pbxproj b/standalone/basic/TSPS.xcodeproj/project.pbxproj
@@ -3045,8 +3045,8 @@
 				INSTALL_PATH = /Applications;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					/Users/brettrenfer/Dropbox/Code/OF/of_v0.X.X_github/addons/ofxNI2/libs/NiTE2/lib/osx,
-					/Users/brettrenfer/Dropbox/Code/OF/of_v0.X.X_github/addons/ofxNI2/libs/OpenNI2/lib/osx,
+					../../../addons/ofxNI2/libs/NiTE2/lib/osx,
+					../../../addons/ofxNI2/libs/OpenNI2/lib/osx,
 				);
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
@@ -3215,8 +3215,8 @@
 				INSTALL_PATH = /Applications;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					/Users/brettrenfer/Dropbox/Code/OF/of_v0.X.X_github/addons/ofxNI2/libs/NiTE2/lib/osx,
-					/Users/brettrenfer/Dropbox/Code/OF/of_v0.X.X_github/addons/ofxNI2/libs/OpenNI2/lib/osx,
+					../../../addons/ofxNI2/libs/NiTE2/lib/osx,
+					../../../addons/ofxNI2/libs/OpenNI2/lib/osx,
 				);
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (