diff options
Diffstat (limited to 'gui/src/chainImageSet.cpp')
| -rw-r--r-- | gui/src/chainImageSet.cpp | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/gui/src/chainImageSet.cpp b/gui/src/chainImageSet.cpp index ce977d1..e415173 100644 --- a/gui/src/chainImageSet.cpp +++ b/gui/src/chainImageSet.cpp @@ -29,7 +29,7 @@ void chainImageSet::drawOutput(){ (*currentImage)->getTransform().x*4 ); */ - glScalef(8,8,8); //easy way to avoid camera cutoff + glScalef(8,8,8); //easy way to limit camera cutoff gluLookAt( (*currentImage)->getTransform().x, (*currentImage)->getTransform().y, // i1.linkPos.y+(xform.y*intervalpoint), @@ -44,7 +44,7 @@ void chainImageSet::drawOutput(){ - (*currentImage)->drawChain(DEFAULT_FADEIN,additive,intensity); + (*currentImage)->drawChain(DEFAULT_FADEIN,additive,intensity,zoomMultiplier); } @@ -284,7 +284,15 @@ void chainImageSet::keyPressed(ofKeyEventArgs &keyargs){ else { previous--; } + + auto next=selected; + next++; + if (next==images.end()){ + next=images.begin(); + } + (*previous)->link=(*selected)->link; + (*next)->linked=&(*(*previous)); images.erase(selected); selected=previous; selected++; @@ -339,6 +347,20 @@ void chainImageSet::keyPressed(ofKeyEventArgs &keyargs){ break; } + case 'q':{ + zoomMultiplier/=1.01; + if (zoomMultiplier==1.0f) { + printf("zoomMultiplier: %f\r\n",zoomMultiplier); + } + break; + } + case 'w':{ + zoomMultiplier*=1.01; + if (zoomMultiplier==1.0f) { + printf("zoomMultiplier: %f\r\n",zoomMultiplier); + } + break; + } } } @@ -443,6 +465,7 @@ void chainImageSet::updateOutput(){ images.push_back(std::move(*i)); (*images.rbegin())->link=&(*(*images.begin())); + (*images.begin())->linked=&(*(*images.rbegin())); (*images.rbegin())->setUseTexture(true); printf("Linked: %s to %s\n", |