1 files changed, 30 insertions, 16 deletions
diff --git a/liveengine/src/viewport.h b/liveengine/src/viewport.h
index 4c3f948..51c56c8 100755
--- a/liveengine/src/viewport.h
+++ b/liveengine/src/viewport.h
@@ -17,38 +17,52 @@
 void bindTexture(ofBaseHasTexture &t);
 void unbindTexture(ofBaseHasTexture &t);
 void bindTex(ofTexture &tex);
-void unbindTex(ofTexture &tex);
+void unbindTex(ofTexture &tex);
+
+#include "keyVar.h"
 
 class viewport
 {
     public:
-	viewport();
-	viewport(int _w,int _h,int _x,int _y,float _r,int _ox,int _oy);
+        viewport();
+        viewport(int _w,int _h,int _x,int _y,float _r,int _ox,int _oy);
         void setup(int _w,int _h,int _x,int _y,float _r,int _ox,int _oy);
-	void draw(float a,unsigned char* controllers,int xshift,int yshift,playlist &list,bool transparentBlack,int note,int mode,ofColor* controller_colours,bool controlColours,float scale,float fscale,float colShift);
+        void draw(float a,unsigned char* controllers,int xshift,int yshift,playlist &list,bool transparentBlack,int note,int mode,ofColor* controller_colours,bool controlColours,float scale,float fscale,float colShift);
         void mapdraw(float a,unsigned char* controllers,int xshift,int yshift,playlist &list,bool transparentBlack,int note,int mode,ofColor* controller_colours,bool controlColours,float scale,float fscale,float colShift);
-		
-	ofImage testtexture;
-    virtual ~viewport();
-	void setUG(ofxUserGenerator *_rUser);
-	ofFbo rb1,rb2,rb3;
-	float r;
-    bool isMapped;
+        void setcam(map<string,string>&settings);
+        double getSetting(const string& setting);
+
+        ofImage testtexture;
+        virtual ~viewport();
+        void setUG(ofxUserGenerator *_rUser);
+        ofFbo rb1,rb2,rb3;
+        float r;
+        bool isMapped;
+
+        void setDefaults();
+        void keyPressed(int key);
+        void keyReleased(int key);
+
     protected:
 	    int x, y,w,h,ox,oy;
-		
 		ofxUserGenerator *rUser;
     private:
-	
-	
+        keyVar* vars;
+
+        ofCamera camera;
+        ofNode target;
+
 };
 
 class mappedviewport: public viewport {
-	public:
+	public:
+
 		mappedviewport(int _w,int _h,int _x,int _y,float _r,int _ox,int _oy);
 		void setUG(ofxUserGenerator *_rUser);
 		void mapdraw(float a,unsigned char* controllers,int xshift,int yshift,playlist &list,bool transparentBlack,int note,int mode,ofColor* controller_colours,bool controlColours,float scale,float fscale,float colShift);
-		ofxUserGenerator *rUser;
+		ofxUserGenerator *rUser;
+    private:
+
 };
 
 #endif // VIEWPORT_H