From 08e3568bf2e017268652c118f403babce3c6486f Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Fri, 1 Sep 2017 19:21:07 +0100 Subject: refactor images to vector: fix gui display --- gui/src/chainImage.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gui/src/chainImage.h') 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 images; - std::list images2; + float currentDefaultImageRatio; std::list::iterator selected; -- cgit v1.2.3