diff options
| author | Tim Redfern <tim@getdrop.com> | 2017-10-25 22:25:58 +0100 |
|---|---|---|
| committer | Tim Redfern <tim@getdrop.com> | 2017-10-25 22:25:58 +0100 |
| commit | 3426aeebba3ec51e6b6bf7e1f0de947c97f97a36 (patch) | |
| tree | d1c716370177e9d1ba4ca48c6df38a33cee3215d /gui/src/chainImage.h | |
| parent | 299c565b6295eaee1248c0409a412e008ddbd836 (diff) | |
an improvement
Diffstat (limited to 'gui/src/chainImage.h')
| -rw-r--r-- | gui/src/chainImage.h | 7 |
1 files changed, 5 insertions, 2 deletions
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; }; |