Simplified the nameing of updateTraversal etc methods

This commit is contained in:
Robert Osfield
2007-01-05 16:48:04 +00:00
parent 9dc369eec2
commit 9a4209c61b
4 changed files with 26 additions and 31 deletions

View File

@@ -126,14 +126,13 @@ void SimpleViewer::frame()
_firstFrame = false;
}
frameAdvance();
frameEventTraversal();
frameUpdateTraversal();
frameCullTraversal();
frameDrawTraversal();
advance();
eventTraversal();
updateTraversal();
renderingTraversal();
}
void SimpleViewer::frameAdvance()
void SimpleViewer::advance()
{
_frameStamp->setReferenceTime(osg::Timer::instance()->time_s());
_frameStamp->setFrameNumber(_frameStamp->getFrameNumber()+1);
@@ -141,7 +140,7 @@ void SimpleViewer::frameAdvance()
_sceneView->setFrameStamp(_frameStamp.get());
}
void SimpleViewer::frameEventTraversal()
void SimpleViewer::eventTraversal()
{
_eventQueue->frame( _frameStamp->getReferenceTime() );
@@ -185,7 +184,7 @@ void SimpleViewer::frameEventTraversal()
}
}
void SimpleViewer::frameUpdateTraversal()
void SimpleViewer::updateTraversal()
{
double previousAspectRatio = ( static_cast<double>(_sceneView->getViewport()->width())/
static_cast<double>(_sceneView->getViewport()->height()) );
@@ -245,13 +244,9 @@ void SimpleViewer::frameUpdateTraversal()
_sceneView->update();
}
void SimpleViewer::frameCullTraversal()
void SimpleViewer::renderingTraversal()
{
_sceneView->cull();
}
void SimpleViewer::frameDrawTraversal()
{
_sceneView->draw();
if (_databasePager.valid())

View File

@@ -529,14 +529,14 @@ void Viewer::frame()
_firstFrame = false;
}
frameAdvance();
advance();
frameEventTraversal();
frameUpdateTraversal();
frameRenderingTraversals();
eventTraversal();
updateTraversal();
renderingTraversals();
}
void Viewer::frameAdvance()
void Viewer::advance()
{
if (_done) return;
@@ -545,7 +545,7 @@ void Viewer::frameAdvance()
_scene->frameAdvance();
}
void Viewer::frameEventTraversal()
void Viewer::eventTraversal()
{
if (_done) return;
@@ -802,7 +802,7 @@ void Viewer::frameEventTraversal()
}
void Viewer::frameUpdateTraversal()
void Viewer::updateTraversal()
{
if (_done) return;
@@ -816,7 +816,7 @@ void Viewer::frameUpdateTraversal()
updateSlaves();
}
void Viewer::frameRenderingTraversals()
void Viewer::renderingTraversals()
{
// check to see if windows are still valid
checkWindowStatus();