several fies

1 files changed, 19 insertions, 1 deletions

diff --git a/gui/src/ofApp.cpp b/gui/src/ofApp.cpp
index 3cc4878..9f29388 100644
--- a/gui/src/ofApp.cpp
+++ b/gui/src/ofApp.cpp
@@ -74,6 +74,8 @@ void ofApp::draw(){
 void ofApp::drawOutput(ofEventArgs & args){
 	ofBackground(0,0,0);
 
+
+
 	for (int i=0;i<sets.size();i++){
 		sets[i].drawOutput();
 	}
@@ -230,7 +232,7 @@ void ofApp::keyPressed(ofKeyEventArgs &args){
 	sets[selected_set].keyPressed(args);
 
 
-	if(args.key == '-'){
+	if(args.key == '\''){
     	selected_set-=1;
     	if (selected_set<0) selected_set=sets.size()-1;
     }
@@ -238,6 +240,22 @@ void ofApp::keyPressed(ofKeyEventArgs &args){
     	selected_set+=1;
     	if (selected_set==sets.size()) selected_set=0;
     }
+
+    if(args.key == '-'){
+    	sets[0].decayFactor=1.0f+(1.0f-sets[0].decayFactor);
+    	sets[1].decayFactor=sets[0].decayFactor;
+    	printf("Decayfactor: %f \n",sets[0].decayFactor);
+    }
+
+    if(args.key >='1' && args.key <= '9'){
+    	sets[0].decayFactor = 1.0f + ( 
+    		pow(4.0f,-((args.key-'1')+1.0f)) 
+    		* (sets[0].decayFactor<1.0f?-1:1)
+    		);
+    	sets[1].decayFactor=sets[0].decayFactor;
+    	printf("Keydiff: %f Decayfactor: %f \n",((args.key-'1')+1.0f),sets[0].decayFactor);
+    }
+
 }
 
 void ofApp::outputKeyPressed(ofKeyEventArgs &args){