summaryrefslogtreecommitdiff
path: root/gui/src/chainImage.cpp
diff options
context:
space:
mode:
authorTim Redfern <tim@getdrop.com>2018-11-01 10:13:32 +0000
committerTim Redfern <tim@getdrop.com>2018-11-01 10:13:32 +0000
commit7e0ccebd5167da4d0bb4de1fb9b0ebb68f2bbe82 (patch)
tree1f8638258ca380470ee91d1018603d105f947738 /gui/src/chainImage.cpp
parentb552beeaa899d0ac5c7d3388bc911f16cc1dbc4c (diff)
4 layer additive for I cried video
Diffstat (limited to 'gui/src/chainImage.cpp')
-rw-r--r--gui/src/chainImage.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/gui/src/chainImage.cpp b/gui/src/chainImage.cpp
index 40e483a..41d32fc 100644
--- a/gui/src/chainImage.cpp
+++ b/gui/src/chainImage.cpp
@@ -504,12 +504,22 @@ void chainImage::drawChain(float fadeIn,bool additive,float intensity,float zoom
link->draw(0,0,link->getWidth(),link->getHeight());
if (additive){
- ofSetColor(255,255,255,255*min(1.0,transition/fadeIn)*intensity);
+
glTranslatef(link->getLinkPos().x,link->getLinkPos().y,0);
glRotatef(link->getLinkRot(),0,0,1);
glScalef(link->getLinkScale(),link->getLinkScale(),link->getLinkScale());
link->link->setAnchorPoint(link->link->getWidth()/2,link->link->getHeight()/2);
link->link->draw(0,0,link->link->getWidth(),link->link->getHeight());
+
+ ofSetColor(255,255,255,255*min(1.0,transition/fadeIn)*intensity);
+
+ glTranslatef(link->link->getLinkPos().x,link->link->getLinkPos().y,0);
+ glRotatef(link->link->getLinkRot(),0,0,1);
+ glScalef(link->link->getLinkScale(),link->link->getLinkScale(),link->link->getLinkScale());
+ link->link->link->setAnchorPoint(link->link->link->getWidth()/2,link->link->link->getHeight()/2);
+ link->link->link->draw(0,0,link->link->link->getWidth(),link->link->link->getHeight());
+
+
}