summaryrefslogtreecommitdiff
path: root/gui/src/chainImage.h
diff options
context:
space:
mode:
authorTim Redfern <tim@getdrop.com>2017-09-01 19:21:07 +0100
committerTim Redfern <tim@getdrop.com>2017-09-01 19:21:07 +0100
commit08e3568bf2e017268652c118f403babce3c6486f (patch)
treebae4a10ea3d786b489d2fd17e6f52b6acc6380a2 /gui/src/chainImage.h
parent5ebbcf534eb74469f09d5822f4d99478efe84794 (diff)
refactor images to vector: fix gui display
Diffstat (limited to 'gui/src/chainImage.h')
-rw-r--r--gui/src/chainImage.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/gui/src/chainImage.h b/gui/src/chainImage.h
index a4f4367..aa7301d 100644
--- a/gui/src/chainImage.h
+++ b/gui/src/chainImage.h
@@ -80,8 +80,11 @@ class chainImageSet{
additive=false;
intensity=1.0f;
fitFactor=0.9f;
+ dragScale=0.0f;
+ dragRotate=0.0f;
+ dragPoint=ofPoint(0,0);
}
- void drawGui(int x,int y);
+ void drawGui(int x,int y,bool is_selected);
void drawOutput();
void update();
bool add(std::string filename,glm::vec2 pos);
@@ -96,7 +99,7 @@ class chainImageSet{
ofPoint outputSize;
std::list <chainImage> images;
- std::list <chainImage> images2;
+
float currentDefaultImageRatio;
std::list<chainImage>::iterator selected;