From 2b3eaa8dd74c373e7c82a414014c469fe415b66e Mon Sep 17 00:00:00 2001 From: Comment Date: Sat, 1 Dec 2012 07:59:46 +0000 Subject: whelans the 2nd --- liveengine/src/testApp.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'liveengine/src/testApp.cpp') diff --git a/liveengine/src/testApp.cpp b/liveengine/src/testApp.cpp index 238c6e7..cdff1af 100755 --- a/liveengine/src/testApp.cpp +++ b/liveengine/src/testApp.cpp @@ -50,7 +50,7 @@ void kinectWindow::setParent(testApp *p){ } void kinectWindow::draw(){ //parent->NIinstance.drawpreview(); - parent->NIinstance.recordDepth.draw(0,0,ofGetWidth(),ofGetHeight()); + //parent->NIinstance.recordDepth.draw(0,0,ofGetWidth(),ofGetHeight()); parent->NIinstance.recordUser.draw(ofGetWidth(),ofGetHeight()); } @@ -126,13 +126,13 @@ void testApp::setup(){ midiIn.openPort(midiPort); midiIn.addListener(this); - // to register only to one controller pass the id as first argument + //to register only to one controller pass the id as first argument // midiIn.addListener(84,this); // to debug // midiIn.setVerbose(true); controllers=new unsigned char[NUM_CONTROLLERS]; - memset(controllers,NUM_CONTROLLERS,0); + memset(controllers,127,NUM_CONTROLLERS); note=0; makeColours(); @@ -158,7 +158,7 @@ void testApp::setup(){ fadetime=0; - mode=SOLID; + mode=BLOCKS; lastnoteTime=ofGetElapsedTimef(); decayTime=1.0f; @@ -199,6 +199,7 @@ void testApp::setup(){ gui.add(resetDrawscale.setup("reset draw scale")); gui.add(resetFBscale.setup("reset FB scale")); gui.add(drawCloud.setup("draw pointCloud",false)); + //gui.add(drawSkel.setup("draw Skeleton",false)); resetDrawscale.addListener(this,&testApp::resetDrawscalePressed); resetFBscale.addListener(this,&testApp::resetFBscalePressed); @@ -263,7 +264,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;iisMapped) 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); + 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,drawSkel); 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); } -- cgit v1.2.3