summaryrefslogtreecommitdiff
path: root/gui/src/chainImage.cpp
diff options
context:
space:
mode:
authorTim Redfern <tim@getdrop.com>2017-10-29 11:01:41 +0000
committerTim Redfern <tim@getdrop.com>2017-10-29 11:01:41 +0000
commitbcc4abca24d04b29a929ed063f18a080041fe0be (patch)
tree5e51a5a24d1f53901ebf1abdd67ff32299aa1b6a /gui/src/chainImage.cpp
parent4d3ec3d2ef37102e5b233704deb4cd7af727e1a3 (diff)
loading fixed
Diffstat (limited to 'gui/src/chainImage.cpp')
-rw-r--r--gui/src/chainImage.cpp7
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);