From 3426aeebba3ec51e6b6bf7e1f0de947c97f97a36 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Wed, 25 Oct 2017 22:25:58 +0100 Subject: an improvement --- gui/src/chainImage.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gui/src/chainImage.h') diff --git a/gui/src/chainImage.h b/gui/src/chainImage.h index 23e9338..984b0d6 100644 --- a/gui/src/chainImage.h +++ b/gui/src/chainImage.h @@ -6,8 +6,8 @@ #define THUMB_BORDER_RATIO 0.8 #define THUMB_SIZE 160 #define DEFAULT_FADEIN 1.0 -#define BEZIER_OUT 0.2 -#define BEZIER_IN 0.5 +#define BEZIER_OUT 0.25 +#define BEZIER_IN 0.25 #define ROTATION_BEZIER_FRACTION 0.1 #define SWITCH_NONE 0 @@ -51,6 +51,7 @@ class chainImage : public ofImage{ void updateRotationTimeline(); void drawChain(float fadeIn=DEFAULT_FADEIN,bool additive =false, float intensity=1.0f, float zoomMultiplier=1.0f); + void gpu_drawChain(float fadeIn=DEFAULT_FADEIN,bool additive =false, float intensity=1.0f, float zoomMultiplier=1.0f); ofImage thumbnail; void makeThumbnail(); @@ -78,6 +79,8 @@ class chainImage : public ofImage{ bool isLoaded; + ofShader shader; + //int totalframes,framecount; }; -- cgit v1.2.3