Added near/far for Kinect2

labatrockwell · Apr 30, 2015 · facd421 · facd421
1 parent eceb4c3
commit facd421
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/addons/ofxTSPS/libs/ofxTSPS/include/ofxTSPS/source/Kinect2.h b/addons/ofxTSPS/libs/ofxTSPS/include/ofxTSPS/source/Kinect2.h
@@ -46,6 +46,10 @@ namespace ofxTSPS {
 			// https://github.com/rickbarraza/KinectV2_Lessons/blob/master/3_MakeRawDepthBrigther/src/testApp.cpp
 			static vector<unsigned char> depthLookupTable;
 
+			if ( nearCached != nearClipping || farCached != farClipping){
+				depthLookupTable.clear();
+			}
+
 			if ( depthLookupTable.size() == 0){
 
 				// IF YOU WANT NEAR TO BE BLACK AND FAR TO BE WHITE, SWITCH THESE
@@ -85,6 +89,8 @@ namespace ofxTSPS {
 					}
 				}
 			}
+			nearCached = nearClipping;
+			farCached = farClipping;
         }
 
         ofPixelsRef getPixelsRef(){
@@ -117,6 +123,7 @@ namespace ofxTSPS {
 		float nearClipping, farClipping;
 
 	protected:
+		float nearCached, farCached;
 		ofPixels outputPixels;
 		bool bDepthInited;
     };

diff --git a/addons/ofxTSPS/libs/ofxTSPS/src/GuiManager.cpp b/addons/ofxTSPS/libs/ofxTSPS/src/GuiManager.cpp
@@ -264,6 +264,17 @@ namespace ofxTSPS {
         panel.addToggle("use amplification (video gain)", "USE_AMPLIFICATION", false);
         panel.addSlider("amplification amount:", "AMPLIFICATION_AMOUNT", 1, 1, 100, true);
 
+#ifdef TSPS_KINECT2
+        guiTypeGroup * k2Group = panel.addGroup("kinect settings");
+        k2Group->setBackgroundColor(148,129,85);
+        k2Group->setBackgroundSelectColor(148,129,85);
+        k2Group->seBaseColor(244,136,136);
+        k2Group->setShowText(false);
+
+        panel.addSlider("near threshold:", "K2_NEAR", 30., 0., 5000., false);
+        panel.addSlider("far threshold:", "K2_FAR", 1000., 0., 5000., false);
+#endif
+
         // end setup source panel
 
         // setup sensing panel

diff --git a/addons/ofxTSPS/libs/ofxTSPS/src/PeopleTracker.cpp b/addons/ofxTSPS/libs/ofxTSPS/src/PeopleTracker.cpp
@@ -212,6 +212,14 @@ namespace ofxTSPS {
         // update source
         bool bNewFrame = false;
         if ( currentSource != NULL && currentSource->isOpen() ){
+#ifdef TSPS_KINECT2
+			if ( currentSource->getType() == CAMERA_KINECT ){
+				Kinect2 * kRef = dynamic_cast<Kinect2*>(currentSource);
+				kRef->nearClipping = gui.getValueF("K2_NEAR");
+				kRef->farClipping = gui.getValueF("K2_FAR");
+			}
+#endif
+
             currentSource->update();
             bNewFrame = currentSource->doProcessFrame();
         }