diff options
Diffstat (limited to 'gui/src/chainImageSet.h')
| -rw-r--r-- | gui/src/chainImageSet.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/gui/src/chainImageSet.h b/gui/src/chainImageSet.h index 87b1d11..b7bf868 100644 --- a/gui/src/chainImageSet.h +++ b/gui/src/chainImageSet.h @@ -7,6 +7,8 @@ class chainImageSet{ public: chainImageSet(){ + } + void init(){ currentDefaultImageRatio=0.3; filename=""; outputSize=ofPoint(1024,576); @@ -35,11 +37,19 @@ class chainImageSet{ ofPoint outputSize; - std::list <chainImage> images; + std::list <std::unique_ptr<chainImage> > images; float currentDefaultImageRatio; - std::list<chainImage>::iterator selected; + //how to make selected and currentimage work if images is a list of unique_ptr? + //req: + //A: a container for images + //B: a temporary container for images that are loading + //be able to transfer images from B to A + //C: an iterator to A + //be able to loop through C and identify an element which is pointed to by C + + std::list <std::unique_ptr<chainImage> >::iterator selected; ofPoint clickPoint; ofPoint dragPoint; float dragScale; @@ -48,14 +58,14 @@ class chainImageSet{ std::string filename; - chainImage *currentImage; + std::list <std::unique_ptr<chainImage> >::iterator currentImage; float decayFactor; bool additive; float intensity; - std::vector < std::unique_ptr<chainImage> > loadingImages; + std::vector <std::unique_ptr<chainImage> > loadingImages; threadedChainImageLoader loader; };
\ No newline at end of file |