folded kinect into main branch

1 files changed, 4 insertions, 4 deletions

diff --git a/liveengine/src/viewport.h b/liveengine/src/viewport.h
index 4e439b1..c401c17 100755
--- a/liveengine/src/viewport.h
+++ b/liveengine/src/viewport.h
@@ -7,19 +7,19 @@
 

 #define NUM_NOTES 64

 #define START_NOTE 36

-#define NUM_CONTROLLERS 6

+#define NUM_CONTROLLERS 26

 #define START_CONTROLLER 102

 

 #define NOTHING 0

 #define BLOCKS 1

-#define LIST 2
+#define LIST 2

 #define SOLID 3

 

 void bindTexture(ofBaseHasTexture &t);

 void unbindTexture(ofBaseHasTexture &t);

 void bindTex(ofTexture &tex);

 void unbindTex(ofTexture &tex);
-
+

 #include "keyVar.h"

 

 class viewport

@@ -63,7 +63,7 @@ class mappedviewport: public 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);

 		ofxUserGenerator *rUser;
     private:
-
+

 };

 

 #endif // VIEWPORT_H