summaryrefslogtreecommitdiff
path: root/gui/src/chainImage.h
diff options
context:
space:
mode:
authorTim Redfern <tim@getdrop.com>2017-10-13 17:20:53 +0100
committerTim Redfern <tim@getdrop.com>2017-10-13 17:20:53 +0100
commit5116dea8815de81ddaef299fdcae15f56ae3a87b (patch)
tree815f04c61b88d2a7e7a612cba194ec8ae0c136ce /gui/src/chainImage.h
parent182049bfe89913be4149b3b82ec1154107438406 (diff)
heisenbug
Diffstat (limited to 'gui/src/chainImage.h')
-rw-r--r--gui/src/chainImage.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/gui/src/chainImage.h b/gui/src/chainImage.h
index 367d051..23e9338 100644
--- a/gui/src/chainImage.h
+++ b/gui/src/chainImage.h
@@ -8,6 +8,7 @@
#define DEFAULT_FADEIN 1.0
#define BEZIER_OUT 0.2
#define BEZIER_IN 0.5
+#define ROTATION_BEZIER_FRACTION 0.1
#define SWITCH_NONE 0
#define SWITCH_FORWARD 1
@@ -47,7 +48,9 @@ class chainImage : public ofImage{
float getScale();
float getRotation();
- void drawChain(float fadeIn=DEFAULT_FADEIN,bool additive =false, float intensity=1.0f);
+ void updateRotationTimeline();
+
+ void drawChain(float fadeIn=DEFAULT_FADEIN,bool additive =false, float intensity=1.0f, float zoomMultiplier=1.0f);
ofImage thumbnail;
void makeThumbnail();
@@ -57,6 +60,7 @@ class chainImage : public ofImage{
bool fromJson(Json::Value json);
chainImage *link;
+ chainImage *linked;
ofPoint linkPos;
float linkScale;
@@ -70,6 +74,7 @@ class chainImage : public ofImage{
float scale;
ofPolyline path;
+ ofPolyline rotationTimeline;
bool isLoaded;