summaryrefslogtreecommitdiff
path: root/gui/src/chainImageSet.cpp
diff options
context:
space:
mode:
authorTim Redfern <tim@getdrop.com>2017-10-25 22:25:58 +0100
committerTim Redfern <tim@getdrop.com>2017-10-25 22:25:58 +0100
commit3426aeebba3ec51e6b6bf7e1f0de947c97f97a36 (patch)
treed1c716370177e9d1ba4ca48c6df38a33cee3215d /gui/src/chainImageSet.cpp
parent299c565b6295eaee1248c0409a412e008ddbd836 (diff)
an improvement
Diffstat (limited to 'gui/src/chainImageSet.cpp')
-rw-r--r--gui/src/chainImageSet.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/gui/src/chainImageSet.cpp b/gui/src/chainImageSet.cpp
index 1fa20ad..7e6e351 100644
--- a/gui/src/chainImageSet.cpp
+++ b/gui/src/chainImageSet.cpp
@@ -2,8 +2,6 @@
void chainImageSet::drawOutput(){
- //movment and rotation are working on their own but not together.
-
float camera_throw= (float)outputSize.y/(float)outputSize.x; //the ratio of z distance to x width
camera_throw*=fitFactor; //fudge factor to allow tweening,
@@ -45,7 +43,20 @@ void chainImageSet::drawOutput(){
(*currentImage)->drawChain(DEFAULT_FADEIN,additive,intensity,zoomMultiplier);
+
+
+ }
+
+
+}
+
+void chainImageSet::drawGpu(){
+
+ ofSetColor(255);
+
+ if (images.size()){
+ (*currentImage)->gpu_drawChain(DEFAULT_FADEIN,additive,intensity,zoomMultiplier);
}
}