diff options
Diffstat (limited to 'gui/src/chainImage.cpp')
| -rw-r--r-- | gui/src/chainImage.cpp | 13 |
1 files changed, 7 insertions, 6 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(); |