OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Clamp frameindex instead of doing nothing

Browse Source
This commit is contained in:
Magne Sjaastad
2015-08-31 11:45:30 +02:00
parent c269e57d6d
commit 854c47500b
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Fwk/AppFwk/cafViewer/cafViewer.cpp
View File

@@ -592,18 +592,28 @@ bool caf::Viewer::isAnimationActive()
//--------------------------------------------------------------------------------------------------
void caf::Viewer::slotSetCurrentFrame(int frameIndex)
{
if (frameIndex < 0 || static_cast<size_t>(frameIndex) >= m_frameScenes.size() || m_frameScenes.at(frameIndex) == NULL) return;
int clampedFrameIndex = frameIndex;
if (static_cast<size_t>(frameIndex) >= m_frameScenes.size())
{
clampedFrameIndex = static_cast<int>(m_frameScenes.size()) - 1;
}
if(m_releaseOGLResourcesEachFrame)
if (frameIndex < 0)
{
clampedFrameIndex = 0;
}
if (m_frameScenes.at(clampedFrameIndex) == NULL) return;
if (m_releaseOGLResourcesEachFrame)
{
releaseOGlResourcesForCurrentFrame();
}
m_renderingSequence->firstRendering()->setScene(m_frameScenes.at(frameIndex));
m_renderingSequence->firstRendering()->setScene(m_frameScenes.at(clampedFrameIndex));
update();
caf::OpenGLWidget::update();
}
void caf::Viewer::releaseOGlResourcesForCurrentFrame()
@@ -639,7 +649,8 @@ void caf::Viewer::slotEndAnimation()
}
m_renderingSequence->firstRendering()->setScene(m_mainScene.p());
update();
caf::OpenGLWidget::update();
}
//--------------------------------------------------------------------------------------------------