From b470c73bfc271c032f4df9a3fd1b9770cf627f00 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Sun, 17 Dec 2017 16:14:27 +0000 Subject: select images --- gui/src/chainImage.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gui/src/chainImage.h') diff --git a/gui/src/chainImage.h b/gui/src/chainImage.h index 2567e3c..b318c79 100644 --- a/gui/src/chainImage.h +++ b/gui/src/chainImage.h @@ -3,12 +3,16 @@ #include "ofMain.h" #include "ofxJSON.h" +#define min(a,b) ((a) < (b) ? (a) : (b)) +#define max(a,b) ((a) > (b) ? (a) : (b)) + #define THUMB_BORDER_RATIO 0.8 #define THUMB_SIZE 160 #define DEFAULT_FADEIN 1.0 #define BEZIER_OUT 0.5 #define BEZIER_IN 0.5 -#define ROTATION_BEZIER_FRACTION 0.2 +#define ROTATION_BEZIER_FRACTION 0.0 +#define ROTATION_EASE_POWER 3.0 #define SWITCH_NONE 0 #define SWITCH_FORWARD 1 @@ -63,6 +67,9 @@ class chainImage : public ofImage{ void gpu_drawChain(float fadeIn=DEFAULT_FADEIN,bool additive =false, float intensity=1.0f, float zoomMultiplier=1.0f); void gpu_drawImage(); + void drawRecursive(float fadeIn,bool additive,float intensity,float zoomMultiplier, float fadeStart, float fadeEnd); + + ofImage thumbnail; void makeThumbnail(); void setupTextures(); -- cgit v1.2.3