From 3bf0663e94b6335cb748a50a8b95e8a98d2a0630 Mon Sep 17 00:00:00 2001
From: Comment <tim@gray.(none)>
Date: Thu, 24 Jan 2013 18:07:04 +0000
Subject: folded kinect into main branch

---
 liveengineUnmapped/src/testApp.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'liveengineUnmapped/src/testApp.cpp')

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
 
-- 
cgit v1.2.3