backwards gamma

2 files changed, 11 insertions, 3 deletions

diff --git a/gui/src/chainImage.cpp b/gui/src/chainImage.cpp
index 3c6680f..f30677c 100644
--- a/gui/src/chainImage.cpp
+++ b/gui/src/chainImage.cpp
@@ -468,7 +468,7 @@ void chainImage::drawChain(float fadeIn,bool additive,float intensity,float zoom
 
 			//ofSetColor(colour);
 			
-			float gamma=1.0f; //(startGamma*transition)+(1.0f*(1.0f-transition));
+			float gamma=1.0f; //transition; //(startGamma*transition)+(1.0f*(1.0f-transition));
 			float pedestal=0.0f;
 			float clamp=1.0f; //-transition;
 			lut.load(makeLut(gamma,pedestal,clamp));
@@ -495,9 +495,9 @@ void chainImage::drawChain(float fadeIn,bool additive,float intensity,float zoom
 
 		link->setAnchorPoint(link->getWidth()/2,link->getHeight()/2);
 
-			gamma=1.0f; //(startGamma*transition)+(1.0f*(1.0f-transition));
+			gamma=((1.0f-transition)*10.0f)+1.0f; //(startGamma*transition)+(1.0f*(1.0f-transition));
 			pedestal=0.0f;
-			clamp=1.0f; //-transition;
+			clamp=1.0f; //transition;
 			lut.load(makeLut(gamma,pedestal,clamp));
 			lut.setBlend(transition);
 			lut.begin();
diff --git a/gui/src/ofApp.cpp b/gui/src/ofApp.cpp
index 059b498..4dda518 100644
--- a/gui/src/ofApp.cpp
+++ b/gui/src/ofApp.cpp
@@ -354,6 +354,14 @@ void ofApp::keyPressed(ofKeyEventArgs &args){
     	outputFS=!outputFS;
         ofSetFullscreen(outputFS);
     }
+    if(args.key >='1' && args.key <= '9'){
+    	sets[0].decayFactor = 1.0f + ( 
+    		pow(4.0f,-((args.key-'1')+1.7f)) 
+    		* (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);
+    }
 }
 
 //--------------------------------------------------------------