beginning gui

1 files changed, 3 insertions, 3 deletions

diff --git a/liveengine/src/viewport.cpp b/liveengine/src/viewport.cpp
index 74333b0..ce67b37 100755
--- a/liveengine/src/viewport.cpp
+++ b/liveengine/src/viewport.cpp
@@ -21,7 +21,7 @@ void viewport::setup(int _w,int _h,int _x,int _y,float _r,int _ox,int _oy) {
 	printf("%ix%i, vp offset: %f,%f\n",w,h,-(sin(ofDegToRad(r))*h/2)-(cos(ofDegToRad(r))*w/2),-(sin(ofDegToRad(r))*w/2)-(cos(ofDegToRad(r))*h/2));

 }

 

-void viewport::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){

+void viewport::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){

 	

 	

 		

@@ -70,8 +70,8 @@ void viewport::draw(float a,unsigned char* controllers,int xshift,int yshift,pla
 					ofTranslate(w/2,h/2);

 					ofScale(scale,scale,scale);

 					ofTranslate(-w/2,-h/2);

-					if (controlColours) list.layers[note]->draw(a,controllers,w,h,transparentBlack);

-					else list.layers[note]->draw(a,w,h);

+					if (controlColours) list.layers[note]->draw(a,controllers,w,h,transparentBlack,colShift);

+					else list.layers[note]->draw(a,w,h,colShift);

 					ofPopMatrix();

 				    }

 				    list.unlock();