summaryrefslogtreecommitdiff
path: root/gui/src
diff options
context:
space:
mode:
authorTim Redfern <tim@getdrop.com>2017-10-16 16:24:04 +0100
committerTim Redfern <tim@getdrop.com>2017-10-16 16:24:04 +0100
commita3c99df80c201e56a32eb5fe650d45e9a9ccaee2 (patch)
tree5e070309793bf11d04e05919a3fb07b1e1157f62 /gui/src
parent5116dea8815de81ddaef299fdcae15f56ae3a87b (diff)
shader compiles
Diffstat (limited to 'gui/src')
-rw-r--r--gui/src/chainImageSet.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/gui/src/chainImageSet.cpp b/gui/src/chainImageSet.cpp
index e415173..c0ecfd4 100644
--- a/gui/src/chainImageSet.cpp
+++ b/gui/src/chainImageSet.cpp
@@ -292,7 +292,7 @@ void chainImageSet::keyPressed(ofKeyEventArgs &keyargs){
}
(*previous)->link=(*selected)->link;
- (*next)->linked=&(*(*previous));
+ (*next)->linked=&(*(*previous)) ;
images.erase(selected);
selected=previous;
selected++;
@@ -462,10 +462,21 @@ void chainImageSet::updateOutput(){
(*i)->filename.c_str(),
(*i)->linkScale
);
-
+
+
images.push_back(std::move(*i));
+
+ auto previous = images.rbegin(); //?
+ if (images.size()>1) {
+ previous++; ///?
+ }
+
+
(*images.rbegin())->link=&(*(*images.begin()));
+ (*images.rbegin())->linked=&(*(*previous));
+ (*previous)->link=&(*(*images.rbegin()));
(*images.begin())->linked=&(*(*images.rbegin()));
+
(*images.rbegin())->setUseTexture(true);
printf("Linked: %s to %s\n",