version for rarn vid

5 files changed, 37 insertions, 12 deletions

diff --git a/gui/src/chainImage.cpp b/gui/src/chainImage.cpp
index f7bca10..369ab77 100644
--- a/gui/src/chainImage.cpp
+++ b/gui/src/chainImage.cpp
@@ -411,7 +411,6 @@ void chainImage::drawRecursive(float fadeIn,bool additive,float intensity,float
 ofImage makeLut(float gamma,float pedestal,float clamp){
 	ofImage image;
 	image.allocate(512,512,OF_IMAGE_COLOR);
-	image.setColor(ofColor(0,0,0));
 	uint8_t *pixels=&image.getPixels()[0];			
 	for (uint32_t b=0;b<64;b++){
 		uint32_t bluecolumn=b%8;
@@ -429,7 +428,7 @@ ofImage makeLut(float gamma,float pedestal,float clamp){
 	return image;
 }
 
-void chainImage::drawChain(float fadeIn,bool additive,float intensity,float zoomMultiplier){	
+void chainImage::drawChain(float fadeIn,bool additive,float intensity,float zoomMultiplier,float startGamma){	
 
 	//printf("Drawing chain transition: %f\n",transition);
 	//we are correctly geting to 1
@@ -459,7 +458,7 @@ void chainImage::drawChain(float fadeIn,bool additive,float intensity,float zoom
 		
 
 		glPushMatrix();
-			//if this is linear we see the jump from the unaccelerated phase
+			//if this is linear we see the jump from the unlessaccelerated phase
 			//float zoomFactor=((zoomMultiplier-1.0f)*transition)+1.0f;
 
 			//this is worse why?
@@ -468,13 +467,15 @@ void chainImage::drawChain(float fadeIn,bool additive,float intensity,float zoom
 			glScalef(zoomFactor,zoomFactor,zoomFactor);
 
 			//ofSetColor(colour);
-			float gamma=1.5f;
+			/*
+			float gamma=1.0f; //(startGamma*transition)+(1.0f*(1.0f-transition));
 			float pedestal=0.0f;
-			float clamp=1.0f;
+			float clamp=1.0f-transition;
 			lut.load(makeLut(gamma,pedestal,clamp));
 			lut.begin();
+			*/
 			draw(0,0,getWidth(),getHeight());
-			lut.end();
+			//lut.end();
 
 		glPopMatrix();
 
diff --git a/gui/src/chainImage.h b/gui/src/chainImage.h
index f67abf1..30ea55a 100644
--- a/gui/src/chainImage.h
+++ b/gui/src/chainImage.h
@@ -69,7 +69,7 @@ class chainImage : public ofImage{
 
 		void updateRotationTimeline();
 
-		void drawChain(float fadeIn=DEFAULT_FADEIN,bool additive =false, float intensity=1.0f, float zoomMultiplier=1.0f);
+		void drawChain(float fadeIn=DEFAULT_FADEIN,bool additive =false, float intensity=1.0f, float zoomMultiplier=1.0f,float startGamma=1.0f);
 		void gpu_drawChain(float fadeIn=DEFAULT_FADEIN,bool additive =false, float intensity=1.0f, float zoomMultiplier=1.0f);
 		void gpu_drawImage();
 
diff --git a/gui/src/chainImageSet.cpp b/gui/src/chainImageSet.cpp
index 461df7e..0462de0 100644
--- a/gui/src/chainImageSet.cpp
+++ b/gui/src/chainImageSet.cpp
@@ -66,7 +66,7 @@ void chainImageSet::drawOutput(){
 
 
 		
-		(*currentImage)->drawChain(DEFAULT_FADEIN,additive,intensity,zoomMultiplier);
+		(*currentImage)->drawChain(DEFAULT_FADEIN,additive,intensity,zoomMultiplier,startGamma);
 		
 
 	}
diff --git a/gui/src/chainImageSet.h b/gui/src/chainImageSet.h
index cc7550a..7df4767 100644
--- a/gui/src/chainImageSet.h
+++ b/gui/src/chainImageSet.h
@@ -23,6 +23,7 @@ class chainImageSet{
 			dragRotate=0.0f;
 			dragPoint=ofPoint(0,0);
 			zoomMultiplier=1.0f;
+			startGamma=1.0f;
 		}
 		chainImageSet(const chainImageSet& mom){
 			chainImageSet();
@@ -62,6 +63,7 @@ class chainImageSet{
 		float dragRotate;
 		float fitFactor;
 		float zoomMultiplier;
+		float startGamma;
 
 		std::string filename;
 
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;