diff options
Diffstat (limited to 'liveengine/src/testApp.cpp')
| -rwxr-xr-x | liveengine/src/testApp.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/liveengine/src/testApp.cpp b/liveengine/src/testApp.cpp index d5288c1..fb531a5 100755 --- a/liveengine/src/testApp.cpp +++ b/liveengine/src/testApp.cpp @@ -143,7 +143,7 @@ void testApp::setup(){ controllers=new unsigned char[NUM_CONTROLLERS]; memset(controllers,NUM_CONTROLLERS,0); - note=0; + note=1; makeColours(); @@ -208,6 +208,7 @@ void testApp::setup(){ gui.add(transparentBlack.setup("transparent black", false)); gui.add(resetDrawscale.setup("reset draw scale")); gui.add(resetFBscale.setup("reset FB scale")); + gui.add(drawCloud.setup("draw pointCloud",false)); resetDrawscale.addListener(this,&testApp::resetDrawscalePressed); resetFBscale.addListener(this,&testApp::resetFBscalePressed); @@ -278,7 +279,7 @@ void testApp::draw(){ //vp2.draw(lambda,controllers,reversemain?-xshift:xshift,yshift,list,transparentBlack,note,mode,controller_colours,controlColours,reversemain?1.0f/scale:scale,reversemain?1.0f/fscale:fscale,noteRandomiseColours?colShift:0.0f); for (int i=0;i<viewports.size();i++) { bool even=!(i%2); - if (viewports[i]->isMapped) viewports[i]->mapdraw(lambda,controllers,even&&reversemain?-xshift:xshift,yshift,list,transparentBlack,note,mode,controller_colours,controlColours,even&&reversemain?1.0f/scale:scale,even&&reversemain?1.0f/fscale:fscale,noteRandomiseColours?colShift:0.0f); + if (viewports[i]->isMapped) viewports[i]->mapdraw(lambda,controllers,even&&reversemain?-xshift:xshift,yshift,list,transparentBlack,note,mode,controller_colours,controlColours,even&&reversemain?1.0f/scale:scale,even&&reversemain?1.0f/fscale:fscale,noteRandomiseColours?colShift:0.0f,drawCloud); else viewports[i]->draw(lambda,controllers,even&&reversemain?-xshift:xshift,yshift,list,transparentBlack,note,mode,controller_colours,controlColours,even&&reversemain?1.0f/scale:scale,even&&reversemain?1.0f/fscale:fscale,noteRandomiseColours?colShift:0.0f); } @@ -431,8 +432,8 @@ void testApp::keyPressed(int key){ else if (activeView<viewports.size()) viewports[activeView]->keyPressed(key); - if (key>='1' && key <='6'){ - activeView=min(key-'3',(int)viewports.size()); + if (key>='0' && key <='5'){ + activeView=min(key-'2',(int)viewports.size()); switch (activeView){ case -2: printf("deactivating viewport adjustment\n"); @@ -456,8 +457,8 @@ void testApp::keyPressed(int key){ if(key == 'f'){
toggleFPS();
}
- if(key >='7' && key <= '9'){
- mode=key-'7';
+ if(key >='6' && key <= '9'){
+ mode=key-'6';
}
if(key == 267){
xshift--;
|