building multiple views

1 files changed, 9 insertions, 20 deletions

diff --git a/src/testApp.h b/src/testApp.h
index fee5517..c8adb7f 100644
--- a/src/testApp.h
+++ b/src/testApp.h
@@ -4,15 +4,15 @@ tjr dec 2011
 
 1- ideal KB interface to move around & calibrate camera
 2- automatically save settings, key to reset
- 
-logically 
+
+logically
  -rotate cam frame of reference
  -move cam xyz WRT frame of reference
  -don't do lookat
- 
+
 speed interface detects each key on-off & applies key acceleration
 have to track how many frames each key has been pressed for
- 
+
 1- this is a case for a class
 2- can key presses overlap?
 3- class deals with keys in pairs as you can't move something simultaneously in 2 dirs
@@ -26,6 +26,8 @@ have to track how many frames each key has been pressed for
 #include "ofMain.h"
 #include "ofx3DModelLoader.h"
 
+#include "viewpoint.h"
+
 class testApp : public ofBaseApp{
 
 	public:
@@ -43,27 +45,14 @@ class testApp : public ofBaseApp{
 		void dragEvent(ofDragInfo dragInfo);
 		void gotMessage(ofMessage msg);
 
-		void bindTexture(ofBaseHasTexture &t);
-		void unbindTexture(ofBaseHasTexture &t);
-
-		ofPoint distort(ofPoint pt,float d);
-
 		ofx3DModelLoader bottle;
 		ofx3DModelLoader board;
 
 		ofVideoPlayer texture;
 
-		float distortFactor;
-
-		ofFbo renderFBO;
-
-		ofCamera camera;
-
-		double fov,aspect,near,far;
+		viewpoint* views;
+        int activeView; //receives keypresses
 
-		int mode;
+        int mode;
 
-		float cx,cy,cz,ex,ey,ez;
-	float crx,cry; //camera rotations
-	
 };