added tracked marker object; removed keyPressed and mode; added track…

…er image drawing control; rewrote detect() to only run detector if tracking failed (seems faster)
ofTheo · Apr 5, 2012 · 710f171 · 710f171
1 parent db61dbd
commit 710f171
Show file tree

Hide file tree

Showing 6 changed files with 229 additions and 165 deletions.
diff --git a/ofxFernCameraDemo/ofxFernCameraDemo.xcodeproj/project.pbxproj b/ofxFernCameraDemo/ofxFernCameraDemo.xcodeproj/project.pbxproj
@@ -16,7 +16,6 @@
 		30A99808152DE20700F8DBAD /* fine_gaussian_pyramid.cc in Sources */ = {isa = PBXBuildFile; fileRef = 30A997E6152DE20700F8DBAD /* fine_gaussian_pyramid.cc */; };
 		30A99809152DE20700F8DBAD /* homography06.cc in Sources */ = {isa = PBXBuildFile; fileRef = 30A997E9152DE20700F8DBAD /* homography06.cc */; };
 		30A9980A152DE20700F8DBAD /* homography_estimator.cc in Sources */ = {isa = PBXBuildFile; fileRef = 30A997EB152DE20700F8DBAD /* homography_estimator.cc */; };
-		30A9980B152DE20700F8DBAD /* main.cc in Sources */ = {isa = PBXBuildFile; fileRef = 30A997EE152DE20700F8DBAD /* main.cc */; };
 		30A9980D152DE20700F8DBAD /* mcv.cc in Sources */ = {isa = PBXBuildFile; fileRef = 30A997F1152DE20700F8DBAD /* mcv.cc */; };
 		30A9980E152DE20700F8DBAD /* mcvGaussianSmoothing.cc in Sources */ = {isa = PBXBuildFile; fileRef = 30A997F3152DE20700F8DBAD /* mcvGaussianSmoothing.cc */; };
 		30A9980F152DE20700F8DBAD /* planar_pattern_detector.cc in Sources */ = {isa = PBXBuildFile; fileRef = 30A997F7152DE20700F8DBAD /* planar_pattern_detector.cc */; };
@@ -102,7 +101,6 @@
 		30A997EB152DE20700F8DBAD /* homography_estimator.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = homography_estimator.cc; sourceTree = "<group>"; };
 		30A997EC152DE20700F8DBAD /* homography_estimator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = homography_estimator.h; sourceTree = "<group>"; };
 		30A997ED152DE20700F8DBAD /* keypoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keypoint.h; sourceTree = "<group>"; };
-		30A997EE152DE20700F8DBAD /* main.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cc; sourceTree = "<group>"; };
 		30A997F1152DE20700F8DBAD /* mcv.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mcv.cc; sourceTree = "<group>"; };
 		30A997F2152DE20700F8DBAD /* mcv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mcv.h; sourceTree = "<group>"; };
 		30A997F3152DE20700F8DBAD /* mcvGaussianSmoothing.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mcvGaussianSmoothing.cc; sourceTree = "<group>"; };
@@ -293,7 +291,6 @@
 				30A997EB152DE20700F8DBAD /* homography_estimator.cc */,
 				30A997EC152DE20700F8DBAD /* homography_estimator.h */,
 				30A997ED152DE20700F8DBAD /* keypoint.h */,
-				30A997EE152DE20700F8DBAD /* main.cc */,
 				30A997F1152DE20700F8DBAD /* mcv.cc */,
 				30A997F2152DE20700F8DBAD /* mcv.h */,
 				30A997F3152DE20700F8DBAD /* mcvGaussianSmoothing.cc */,
@@ -744,7 +741,6 @@
 				30A99808152DE20700F8DBAD /* fine_gaussian_pyramid.cc in Sources */,
 				30A99809152DE20700F8DBAD /* homography06.cc in Sources */,
 				30A9980A152DE20700F8DBAD /* homography_estimator.cc in Sources */,
-				30A9980B152DE20700F8DBAD /* main.cc in Sources */,
 				30A9980D152DE20700F8DBAD /* mcv.cc in Sources */,
 				30A9980E152DE20700F8DBAD /* mcvGaussianSmoothing.cc in Sources */,
 				30A9980F152DE20700F8DBAD /* planar_pattern_detector.cc in Sources */,

diff --git a/ofxFernCameraDemo/src/main.cpp b/ofxFernCameraDemo/src/main.cpp
@@ -3,14 +3,14 @@
 #include "ofAppGlutWindow.h"
 
 //========================================================================
-int main( ){
+int main(){
 
     ofAppGlutWindow window;
-	ofSetupOpenGL(&window, 1024,768, OF_WINDOW);			// <-------- setup the GL context
+	ofSetupOpenGL(&window, 640, 480, OF_WINDOW); // <-------- setup the GL context
 
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp(new testApp());
 
 }
diff --git a/ofxFernCameraDemo/src/testApp.cpp b/ofxFernCameraDemo/src/testApp.cpp
@@ -3,13 +3,17 @@
 //--------------------------------------------------------------
 void testApp::setup(){
 
+	ofSetFrameRate(60);
+
 	int camW = 640;
 	int camH = 480;
 
-	fern.initTracker("model.bmp",camW, camH);
+	fern.setup("model.bmp", camW, camH);
 	grabber.initGrabber(camW, camH);
 	colorImg.allocate(camW, camH);
 	img.allocate(camW, camH);
+
+	showTracker = false;
 }
 
 //--------------------------------------------------------------
@@ -25,16 +29,47 @@ void testApp::update(){
 
 //--------------------------------------------------------------
 void testApp::draw(){
+
 	ofSetColor(255);
-	fern.draw(0, 0, 640, 480);
+	if(showTracker){
+		fern.draw(0, 0, 640, 480);
+	}
+	else{
+		grabber.draw(0, 0, 640, 480);
+	}
+
+	ofSetHexColor(0xFF0000);
+	ofNoFill();
+	if(fern.trackedMarker.tracked) {
+		fern.trackedMarker.draw();
+	}
 
-	ofDrawBitmapString("keys 1-5 do stuff\nfps: "+ofToString(ofGetFrameRate(), 2), 10, 500);
+	ofSetColor(255);
+	ofDrawBitmapString("press 'd' to toggle tracker image\nfps: "+ofToString(ofGetFrameRate(), 2), 10, 10);
 }
 
 
 //--------------------------------------------------------------
 void testApp::keyPressed  (int key){
-	fern.keyPressed(key);
+
+	switch(key){
+
+		case 'd':
+			showTracker = !showTracker;
+			break;
+
+		case 't':
+			fern.resetTracker();
+			break;
+
+		case 'k':
+			fern.showKeypoints(!fern.getShowKeypoints());
+			break;
+
+		case 'l':
+			fern.showLocations(!fern.getShowLocations());
+			break;
+	}
 }
 
 //--------------------------------------------------------------

diff --git a/ofxFernCameraDemo/src/testApp.h b/ofxFernCameraDemo/src/testApp.h
@@ -20,9 +20,11 @@ class testApp : public ofBaseApp{
 		void mouseReleased(int x, int y, int button);
 		void windowResized(int w, int h);
 
+		ofVideoGrabber grabber;
+
 		ofxCvColorImage colorImg;
 		ofxCvGrayscaleImage img;
 		ofxFern fern;
 
-		ofVideoGrabber grabber;
+		bool showTracker;
 };