folded kinect into main branch

3 files changed, 10 insertions, 6 deletions

diff --git a/liveengineUnmapped/src/layers.cpp b/liveengineUnmapped/src/layers.cpp
index a62f2e6..a0fb213 100755
--- a/liveengineUnmapped/src/layers.cpp
+++ b/liveengineUnmapped/src/layers.cpp
@@ -67,12 +67,13 @@ void svglayer::draw(float a,unsigned char* controllers,int cx,int cy,bool transp
 	for (int i=0;i<6;i++) {

 		//for (int j=(int)((i+1)*layerspercontroller)-1;j>(int)(i*layerspercontroller);j--) {
 		for (int j=(int)(i*layerspercontroller);j<(int)((i+1)*layerspercontroller);j++) {

-			    svg.getPathAt(j).setFillColor(fills[i]*a*controllers[i]); //try to reverse order of these

-			    if (!transparentBlack||((a*controllers[i])/127.0)>0.1) {

-			    svg.getPathAt(j-1).draw(xo,yo);

+			    svg.getPathAt(j).setFillColor(fills[j]*a*(((float)controllers[5-i])/127.0f)); //try to reverse order of these

+			    if (!transparentBlack||((a*controllers[5-i])/127.0f)>0.1) {

+			    svg.getPathAt(j).draw(xo,yo);

 			}

 		}

-	}

+	}
+	//printf("counted %i layers of %i\n",(int)(6*layerspercontroller),svg.getNumPath());

 }
 

 

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

 
diff --git a/liveengineUnmapped/src/testApp.h b/liveengineUnmapped/src/testApp.h
index e3ca574..3c9dfc1 100755
--- a/liveengineUnmapped/src/testApp.h
+++ b/liveengineUnmapped/src/testApp.h
@@ -140,7 +140,6 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		bool fullscreenoutput;
 
 		float lastnoteTime;
-		float decayTime;
 
 		int fadetime;
 		int rotate;
@@ -178,6 +177,8 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		ofxButton resetFBscale;
 		ofxIntSlider fS;
 		ofxParameter<int> fadeScale;
+		ofxFloatSlider dT;
+		ofxParameter<float> decayTime;
 		ofxToggle oscScale;
 		ofxToggle breakOsc;
 		ofxToggle randomOsc;