diff options
Diffstat (limited to 'gui/src/chainImage.h')
| -rw-r--r-- | gui/src/chainImage.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/gui/src/chainImage.h b/gui/src/chainImage.h index 891afdd..a4f4367 100644 --- a/gui/src/chainImage.h +++ b/gui/src/chainImage.h @@ -9,6 +9,10 @@ #define BEZIER_OUT 0.2 #define BEZIER_IN 0.5 +#define SWITCH_NONE 0 +#define SWITCH_FORWARD 1 +#define SWITCH_REVERSE 2 + class chainImage : public ofImage{ //todo: threaded image loader @@ -19,7 +23,7 @@ class chainImage : public ofImage{ } void init(ofPoint _linkPos,float _linkScale,float _linkRot); - void start(); + void start(bool reverse); bool load(std::string _filename){ filename=_filename; if (ofImage::load(filename)){ @@ -34,7 +38,7 @@ class chainImage : public ofImage{ return false; } - bool update(float decayRatio); + int update(float decayRatio); ofVec3f getTransform(); float getScale(); float getRotation(); @@ -75,8 +79,9 @@ class chainImageSet{ decayFactor=.999; additive=false; intensity=1.0f; + fitFactor=0.9f; } - void drawGui(); + void drawGui(int x,int y); void drawOutput(); void update(); bool add(std::string filename,glm::vec2 pos); @@ -91,6 +96,7 @@ class chainImageSet{ ofPoint outputSize; std::list <chainImage> images; + std::list <chainImage> images2; float currentDefaultImageRatio; std::list<chainImage>::iterator selected; @@ -98,6 +104,7 @@ class chainImageSet{ ofPoint dragPoint; float dragScale; float dragRotate; + float fitFactor; std::string filename; |