From 796d647fd38f7cf01cb70bbb0700b75427e42d55 Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@gray.(none)>
Date: Sun, 28 Oct 2012 17:40:19 +0000
Subject: starting to build kinect addition

---
 liveengine/src/viewport.h | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

(limited to 'liveengine/src/viewport.h')

diff --git a/liveengine/src/viewport.h b/liveengine/src/viewport.h
index 4f29a5b..350ea5d 100755
--- a/liveengine/src/viewport.h
+++ b/liveengine/src/viewport.h
@@ -1,6 +1,7 @@
 #ifndef VIEWPORT_H
 #define VIEWPORT_H
 
+#include "ofxOpenNI.h"
 #include "ofMain.h"
 #include "playlist.h"
 
@@ -13,21 +14,40 @@
 #define BLOCKS 1
 #define LIST 2
 
-
+void bindTexture(ofBaseHasTexture &t);
+void unbindTexture(ofBaseHasTexture &t);
+void bindTex(ofTexture &tex);
+void unbindTex(ofTexture &tex);
 
 class viewport
 {
     public:
 	viewport();
-        void setup(int w,int h,int x, int y,float r,int _ox,int _oy);
+	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);
-        virtual ~viewport();
+        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);
+		
+    virtual ~viewport();
+	void setUG(ofxUserGenerator *_rUser);
 	ofFbo rb1,rb2;
 	float r;
+    bool isMapped;
     protected:
+	    int x, y,w,h,ox,oy;
+		
+		ofxUserGenerator *rUser;
     private:
-	int x, y,w,h,ox,oy;
 	
+	
+};
+
+class mappedviewport: public viewport {
+	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;
 };
 
 #endif // VIEWPORT_H
-- 
cgit v1.2.3