version for rarn vid

1 files changed, 26 insertions, 4 deletions

diff --git a/gui/src/ofApp.cpp b/gui/src/ofApp.cpp
index 706ff14..89e92c8 100644
--- a/gui/src/ofApp.cpp
+++ b/gui/src/ofApp.cpp
@@ -260,9 +260,7 @@ void ofApp::newMidiMessage(ofxMidiMessage& msg) {
 
 	if (msg.channel==1&&msg.control==1+offet){
 		//pot 1
-		for (int i=0;i<sets.size();i++){
-			//sets[i].zoomMultiplier=1.0f+(((float)msg.value-64)/64.0f); doesn't work
-		};
+\
 
 		sets[selected_set].zoomMultiplier=1.0f+(((float)msg.value-64)/64.0f);
 
@@ -277,6 +275,30 @@ void ofApp::newMidiMessage(ofxMidiMessage& msg) {
 	}
 	if (msg.channel==1&&msg.control==81+offet){
 		//fader 1
+		//sets[selected_set].zoomDecay=(((float)msg.value-64)/64.0f)
+		
+	}
+
+	//column 3 for more controls
+	offet=3;
+
+	if (msg.channel==1&&msg.control==1+offet){
+		//pot 3
+
+		for (int i=0;i<sets.size();i++){
+			sets[i].startGamma=0.5f+((float)msg.value/128.0f);
+		};
+
+	}
+	if (msg.channel==1&&msg.control==65+offet){
+		//top button 1
+		
+	}
+	if (msg.channel==1&&msg.control==73+offet){
+		//bottom button 1
+	}
+	if (msg.channel==1&&msg.control==81+offet){
+		//fader 1
 		
 	}
 
@@ -308,7 +330,7 @@ void ofApp::guiKeyPressed(ofKeyEventArgs &args){
 
     if(args.key >='1' && args.key <= '9'){
     	sets[0].decayFactor = 1.0f + ( 
-    		pow(4.0f,-((args.key-'1')+1.0f)) 
+    		pow(4.0f,-((args.key-'1')+1.7f)) 
     		* (sets[0].decayFactor<1.0f?-1:1)
     		);
     	sets[1].decayFactor=sets[0].decayFactor;