summaryrefslogtreecommitdiff
path: root/liveengineUnmapped/src/testApp.cpp
diff options
context:
space:
mode:
authorComment <tim@gray.(none)>2013-01-24 18:07:04 +0000
committerComment <tim@gray.(none)>2013-01-24 18:07:04 +0000
commit3bf0663e94b6335cb748a50a8b95e8a98d2a0630 (patch)
treea82627776c3bdeedbc99e2b6dcf97b78328a5047 /liveengineUnmapped/src/testApp.cpp
parente54790009e0d7b6ae5cc4d3e54880ff0bdc63f86 (diff)
folded kinect into main branch
Diffstat (limited to 'liveengineUnmapped/src/testApp.cpp')
-rwxr-xr-xliveengineUnmapped/src/testApp.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/liveengineUnmapped/src/testApp.cpp b/liveengineUnmapped/src/testApp.cpp
index 1885bb2..bd9d911 100755
--- a/liveengineUnmapped/src/testApp.cpp
+++ b/liveengineUnmapped/src/testApp.cpp
@@ -146,6 +146,8 @@ void testApp::setup(){
gui.add(resetFBscale.setup("reset FB scale"));
fadeScale=128;
gui.add(fS.setup("fade scale",fadeScale,0,255,255));
+ decayTime=1.0f;
+ gui.add(dT.setup("decay time",decayTime,0,10.0,255));
gui.add(oscScale.setup("scale size LFO", false));
gui.add(breakOsc.setup("break oscillators", false));
@@ -194,7 +196,7 @@ void testApp::draw(){
float lambda=max(0.0f,1.0f-((ofGetElapsedTimef()-lastnoteTime)/decayTime));
- int ft=255-(fadetime*((float)fadeScale)*0.1);
+ int ft=255-(fadetime*((float)fadeScale)*0.1f);
//if(ofGetFrameNum()%25==0) printf("fadeScale %i\n",(int)fadeScale);
ofSetColor(ft,ft,ft); //for feedback