From a3c99df80c201e56a32eb5fe650d45e9a9ccaee2 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Mon, 16 Oct 2017 16:24:04 +0100 Subject: shader compiles --- gui/src/chainImageSet.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'gui/src') 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", -- cgit v1.2.3