diff options
Diffstat (limited to 'gui/src/chainImage.h')
| -rw-r--r-- | gui/src/chainImage.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/gui/src/chainImage.h b/gui/src/chainImage.h index 6fa5bca..2ac3566 100644 --- a/gui/src/chainImage.h +++ b/gui/src/chainImage.h @@ -4,6 +4,8 @@ #include "ofxJSON.h" #define THUMB_BORDER_RATIO 0.8 +#define THUMB_SIZE 160 +#define DEFAULT_FADEIN 0.3 class chainImage : public ofImage{ //todo: threaded image loader @@ -22,7 +24,8 @@ class chainImage : public ofImage{ makeThumbnail(); //could there be a way to load without committing the texture - setUseTexture(false); + //setUseTexture(false); + setAnchorPoint(getWidth()/2,getHeight()/2); return true; } @@ -33,7 +36,7 @@ class chainImage : public ofImage{ ofVec3f getTransform(); float getScale(); - void drawChain(float fadeIn); + void drawChain(float fadeIn=DEFAULT_FADEIN); ofImage thumbnail; void makeThumbnail(); @@ -63,8 +66,11 @@ class chainImageSet{ chainImageSet(){ currentDefaultImageRatio=0.3; filename=""; + outputSize=ofPoint(1024,576); } void drawGui(); + void drawOutput(); + void update(); bool add(std::string filename,glm::vec2 pos); void keyPressed(ofKeyEventArgs &keyargs); void mouseDragged(int x, int y, int button); @@ -74,6 +80,8 @@ class chainImageSet{ bool saveJson(std::string filename); bool loadJson(std::string filename); + ofPoint outputSize; + std::list <chainImage> images; float currentDefaultImageRatio; @@ -84,4 +92,6 @@ class chainImageSet{ float dragRotate; std::string filename; + + chainImage *currentImage; };
\ No newline at end of file |