1 files changed, 16 insertions, 6 deletions
diff --git a/gaunt01/src/testApp.h b/gaunt01/src/testApp.h
index b08682c..2870008 100644
--- a/gaunt01/src/testApp.h
+++ b/gaunt01/src/testApp.h
@@ -12,6 +12,10 @@
 //#define _USE_LIVE_VIDEO		// uncomment this to use a live camera
 								// otherwise, we'll use a movie file
 
+#define PLAY 0
+#define CALIBRATE 1
+
+
 class testApp : public ofBaseApp{
 
 	public:
@@ -29,15 +33,20 @@ class testApp : public ofBaseApp{
 		void dragEvent(ofDragInfo dragInfo);
 		void gotMessage(ofMessage msg);
 	
+		int mode;
+	
+		ofVec2f screen2plane(ofVec2f screenpos);
+		ofVec3f plane2world(ofVec2f planepos);
+		void updatePlane();
+	
 		ofxXmlSettings XML;
 		void loadSettings(string filename);
 		void saveSettings(string filename);
 
-		#ifdef _USE_LIVE_VIDEO
-		  ofVideoGrabber 		vidGrabber;
-		#else
-		  ofVideoPlayer 		vidPlayer;
-		#endif
+		bool useCamera;
+		bool hasCamera;
+		ofVideoGrabber 		vidGrabber;
+		ofVideoPlayer 		vidPlayer;
 
 		ofxCvColorImage		colorImg;
 
@@ -58,10 +67,11 @@ class testApp : public ofBaseApp{
 		ofPlane plane;
 		ofProjector projector;
 
-		ofVec3f pos;
+		ofVec2f pos;
 		
 		vector<ofVec3f> players;
 		trapdoor trapDoor;
+		ofMesh ground;
 
 };