demo v0.9HEADmaster

1 files changed, 15 insertions, 15 deletions

diff --git a/src/viewport.h b/src/viewport.h
index f635e51..23f840e 100755
--- a/src/viewport.h
+++ b/src/viewport.h
@@ -22,39 +22,39 @@ class viewport
         virtual ~viewport();

         void setKinect(ofxKinect *k);

 	void setFade(int f);

-    

+

 	void setcam(map<string,float>&settings);

         double getSetting(const string& setting);

-    

+

 	void mousePressedEvent(int xs,int ys,float sc,float fs);

-        

-	void draw(int mode,int fade,float decimate, float feat, float xr, float yr, float zr, int range, bool dologo);

+

+	void draw(int mode,int fade,float decimate, float feat, float xr, float yr, float zr, int range, bool add, bool dologo, bool col);

 	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;

-    

+int xshift, yshift;

+		float scale,fscale;

     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

 

 

-		

-        

-        

+

+

+

 };