1 files changed, 28 insertions, 21 deletions
diff --git a/src/testApp.h b/src/testApp.h
index 17ba87d..293b6fd 100644
--- a/src/testApp.h
+++ b/src/testApp.h
@@ -53,40 +53,47 @@ class testApp : public ofBaseApp{
 		void windowResized(int w, int h);
 		void dragEvent(ofDragInfo dragInfo);
 		void gotMessage(ofMessage msg);
+	
+		void doTransition();
+		float transTime;
+		bool transition;
 
-        string model_name;
-	    float model_x;
-	    float model_y;
-	    float model_z;
+		string model_name;
+		float model_x;
+		float model_y;
+		float model_z;
 
 		ofx3DModelLoader model;
-
+		ofVideoPlayer calibrator_label;
 		ofVideoPlayer texture;
 		string* clips;
 		int numClips;
 		int whichClip;
+		int switchClip;
 
 		viewpoint* views;
-        int activeView; //receives keypresses
+		int activeView; //receives keypresses
 		int numViews;
 
-        int mode;
+		int mode;
+
+		ofxXmlSettings XML;
+
+		bool light;
 
-        ofxXmlSettings XML;
+		float mixAmount;
 
-        bool light;
+		ofVideoGrabber 		vidGrabber;
+		unsigned char * 	videoInverted;
+		ofTexture			videoTexture;
+		int 				camWidth;
+		int 				camHeight;
+		bool grabberAvailable;
 
-        ofVideoGrabber 		vidGrabber;
-	unsigned char * 	videoInverted;
-	ofTexture			videoTexture;
-	int 				camWidth;
-	int 				camHeight;
-	bool grabberAvailable;
-		
-	void setupArduino(const int & version);
-	void updateArduino();
-	ofArduino	ard;
-	bool		bSetupArduino;			// flag variable for setting up arduino once
-	int 		bSwitchArduino;
+		void setupArduino(const int & version);
+		void updateArduino();
+		ofArduino	ard;
+		bool		bSetupArduino;			// flag variable for setting up arduino once
+		int 		bSwitchArduino;
 
 };