diff options
Diffstat (limited to 'gui/src/chainImage.cpp')
| -rw-r--r-- | gui/src/chainImage.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gui/src/chainImage.cpp b/gui/src/chainImage.cpp index 3c5f408..f712e71 100644 --- a/gui/src/chainImage.cpp +++ b/gui/src/chainImage.cpp @@ -8,8 +8,10 @@ float distance(ofPoint p1,ofPoint p2){ } void chainImage::init(ofPoint _linkPos,float _linkScale,float _linkRot){ +#ifdef GPU_ALGORITHM shader.load("shader"); - +#endif //GPU_ALGORITHM + linkPos=_linkPos; linkScale=_linkScale; linkRot=_linkRot; @@ -233,6 +235,7 @@ void chainImage::drawChain(float fadeIn,bool additive,float intensity,float zoom //add a scale factor to the outgoing image that builds up over the transition + glPushMatrix(); //if this is linear we see the jump from the unaccelerated phase //float zoomFactor=((zoomMultiplier-1.0f)*transition)+1.0f; @@ -242,6 +245,7 @@ void chainImage::drawChain(float fadeIn,bool additive,float intensity,float zoom glScalef(zoomFactor,zoomFactor,zoomFactor); + //ofSetColor(colour); draw(0,0,getWidth(),getHeight()); glPopMatrix(); @@ -259,6 +263,7 @@ void chainImage::drawChain(float fadeIn,bool additive,float intensity,float zoom link->setAnchorPoint(link->getWidth()/2,link->getHeight()/2); + //ofSetColor(link->colour); link->draw(0,0,link->getWidth(),link->getHeight()); glDisable(GL_BLEND); |