From ef5d82a13d1154ccdf4de91d869178dab6b76b7f Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@gray.(none)>
Date: Fri, 23 Nov 2012 16:24:03 +0000
Subject: ready for gig

---
 src/viewport.h | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'src/viewport.h')

diff --git a/src/viewport.h b/src/viewport.h
index 1ffda0a..f635e51 100755
--- a/src/viewport.h
+++ b/src/viewport.h
@@ -6,6 +6,12 @@
 #include "ofMain.h"
 #include "keyVar.h"
 
+#define POINTS 1
+#define LINES 2
+#define POLYS 3
+
+#include "ofxMayaCam.h"
+
 
 class viewport
 {
@@ -22,26 +28,31 @@ class viewport
     
 	void mousePressedEvent(int xs,int ys,float sc,float fs);
         
-	void draw(int fade,int decimate);
+	void draw(int mode,int fade,float decimate, float feat, float xr, float yr, float zr, int range, bool dologo);
 	void drawgui();
 	ofFbo rb1,rb2; //can do 2d buffer effects with feedback, can pass out rb2 for preview
     
 	void keyPressed(int key);
         void keyReleased(int key);
     
+    ofxMayaCam camera;
+    float xrot,yrot,zrot;
+    
     protected:
 		int x, y,w,h,ox,oy,r;
 		int xshift, yshift;
 		float scale,fscale;
+    
+		ofImage logo;
 		
+    
 		ofxKinect *kinect; //passes in kinect data
 		//passes in a playing move that can be used to generate 3D points in teh same way
     private:
 		map<string,keyVar> vars; //change to midimappedkeyvars
 
-		//has its own own camera
-		ofCamera camera;
-		ofNode target;
+
+		
         
         
 };
-- 
cgit v1.2.3