diff options
Diffstat (limited to 'gui/src/chainImage.cpp')
| -rw-r--r-- | gui/src/chainImage.cpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/gui/src/chainImage.cpp b/gui/src/chainImage.cpp index 369ab77..3c6680f 100644 --- a/gui/src/chainImage.cpp +++ b/gui/src/chainImage.cpp @@ -467,15 +467,16 @@ void chainImage::drawChain(float fadeIn,bool additive,float intensity,float zoom glScalef(zoomFactor,zoomFactor,zoomFactor); //ofSetColor(colour); - /* + float gamma=1.0f; //(startGamma*transition)+(1.0f*(1.0f-transition)); float pedestal=0.0f; - float clamp=1.0f-transition; + float clamp=1.0f; //-transition; lut.load(makeLut(gamma,pedestal,clamp)); + lut.setBlend(1.0f); lut.begin(); - */ + //setAlpha(1.0f); draw(0,0,getWidth(),getHeight()); - //lut.end(); + lut.end(); glPopMatrix(); @@ -488,13 +489,25 @@ void chainImage::drawChain(float fadeIn,bool additive,float intensity,float zoom //ofEnableAlphaBlending(); glEnable(GL_BLEND); - ofSetColor(255,255,255,255*min(1.0,transition/fadeIn)*intensity); + //ofSetColor(255,255,255,255*min(1.0,transition/fadeIn)*intensity); + //setting alpha here doesn't work with shader? + //possibly if you could set the alpha when drawing? link->setAnchorPoint(link->getWidth()/2,link->getHeight()/2); + gamma=1.0f; //(startGamma*transition)+(1.0f*(1.0f-transition)); + pedestal=0.0f; + clamp=1.0f; //-transition; + lut.load(makeLut(gamma,pedestal,clamp)); + lut.setBlend(transition); + lut.begin(); + //ofSetColor(link->colour); + //link->setAlpha(transition); link->draw(0,0,link->getWidth(),link->getHeight()); + lut.end(); + glDisable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); |