starting to implement bird

1 files changed, 10 insertions, 7 deletions

diff --git a/gaunt01/src/testApp.h b/gaunt01/src/testApp.h
index e829630..9ee79db 100644
--- a/gaunt01/src/testApp.h
+++ b/gaunt01/src/testApp.h
@@ -9,6 +9,7 @@
 #include "ofxBlobsManager.h"
 
 #include "trapdoor.h"
+#include "bird.h"
 
 //#define _USE_LIVE_VIDEO		// uncomment this to use a live camera
 								// otherwise, we'll use a movie file
@@ -33,15 +34,15 @@ class testApp : public ofBaseApp{
 		void windowResized(int w, int h);
 		void dragEvent(ofDragInfo dragInfo);
 		void gotMessage(ofMessage msg);
-	
+
 		int mode;
-	
+
 		//utility functions
 		ofVec2f screen2plane(ofVec2f screenpos);
 		ofVec3f plane2world(ofVec2f planepos);
 		void updatePlane();
 		bool rectsCross(ofRectangle rect1,ofRectangle rect2);
-	
+
 		ofxXmlSettings XML;
 		void loadSettings(string filename);
 		void saveSettings(string filename);
@@ -58,7 +59,7 @@ class testApp : public ofBaseApp{
 		ofxCvGrayscaleImage 	grayDiff;
 
 		ofxCvContourFinder 	contourFinder;
-		
+
 		ofxBlobsManager		blobsManager;
 
 		int 				threshold;
@@ -73,16 +74,18 @@ class testApp : public ofBaseApp{
 		ofProjector projector;
 
 		ofVec2f pos;
-		
+
 		vector<ofVec3f> players;
 		trapdoor trapDoor;
 		ofMesh ground;
-		
+
 		ofVec3f* testpts;
-		
+
 		ofTessellator tesselator;
 		ofMesh player;
 		ofPolyline playeroutline;
 
+		bird Bird;
+
 };