From 5116dea8815de81ddaef299fdcae15f56ae3a87b Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Fri, 13 Oct 2017 17:20:53 +0100 Subject: heisenbug --- gui/src/chainImage.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gui/src/chainImage.h') 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; -- cgit v1.2.3