FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up main loop, so it's more readable, seperating out the paging and non paging implementations

Browse Source
This commit is contained in:
Robert Osfield 2010-10-22 12:28:50 +00:00
parent f91944fbbf
commit 89d09d7712
1 changed files with 60 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
examples/osganalysis/osganalysis.cpp
View File

@ -232,17 +232,17 @@ int main(int argc, char** argv)
return 1; return 1;
} }
typedef std::vector< osg::ref_ptr<osg::Node> > Models;
unsigned int modelIndex = 0;
Models models;
osg::ref_ptr<osg::Group> group = new osg::Group; if (readDatabasesInPagingThread)
viewer.setSceneData(group); {
// load the models using a paging thread and use the incremental compile operation to
// manage the compilation of GL objects without breaking frame.
unsigned int modelIndex = 0;
osg::ref_ptr<osg::OperationThread> databasePagingThread; osg::ref_ptr<osg::OperationThread> databasePagingThread;
osg::ref_ptr<DatabasePagingOperation> databasePagingOperation; osg::ref_ptr<DatabasePagingOperation> databasePagingOperation;
if (readDatabasesInPagingThread)
{
databasePagingThread = new osg::OperationThread; databasePagingThread = new osg::OperationThread;
databasePagingThread->startThread(); databasePagingThread->startThread();
@ -253,43 +253,19 @@ int main(int argc, char** argv)
databasePagingThread->add(databasePagingOperation.get()); databasePagingThread->add(databasePagingOperation.get());
} osg::ref_ptr<osg::Group> group = new osg::Group;
else viewer.setSceneData(group);
{
for(FileNames::iterator itr = fileNames.begin();
itr != fileNames.end();
++itr)
{
// not an option so assume string is a filename.
osg::ref_ptr<osg::Node> node = osgDB::readNodeFile( *itr );
if(node.valid())
{
if (node->getName().empty()) node->setName( *itr );
node = sceneGraphProcessor->process(node.get());
models.push_back(node.get());
}
}
group->addChild(models[modelIndex++].get());
}
viewer.realize(); viewer.realize();
double timeOfLastMerge = viewer.getFrameStamp()->getReferenceTime(); double timeOfLastMerge = viewer.getFrameStamp()->getReferenceTime();
osg::ref_ptr<CustomCompileCompletedCallback> compileCompletedCallback;
while(!viewer.done()) while(!viewer.done())
{ {
viewer.frame(); viewer.frame();
double currentTime = viewer.getFrameStamp()->getReferenceTime(); double currentTime = viewer.getFrameStamp()->getReferenceTime();
if (readDatabasesInPagingThread)
{
if (!databasePagingOperation && if (!databasePagingOperation &&
modelIndex<fileNames.size() && modelIndex<fileNames.size() &&
(currentTime-timeOfLastMerge)>timeBetweenMerges) (currentTime-timeOfLastMerge)>timeBetweenMerges)
@ -318,8 +294,49 @@ int main(int argc, char** argv)
viewer.home(); viewer.home();
} }
} }
}
else else
{ {
// load the models directly and then just use the IncrementalCompileOperation to
// compile the GL objects for us.
typedef std::vector< osg::ref_ptr<osg::Node> > Models;
Models models;
unsigned int modelIndex = 0;
for(FileNames::iterator itr = fileNames.begin();
itr != fileNames.end();
++itr)
{
// not an option so assume string is a filename.
osg::ref_ptr<osg::Node> node = osgDB::readNodeFile( *itr );
if(node.valid())
{
if (node->getName().empty()) node->setName( *itr );
node = sceneGraphProcessor->process(node.get());
models.push_back(node.get());
}
}
osg::ref_ptr<osg::Group> group = new osg::Group;
group->addChild(models[modelIndex++].get());
viewer.setSceneData(group);
viewer.realize();
double timeOfLastMerge = viewer.getFrameStamp()->getReferenceTime();
osg::ref_ptr<CustomCompileCompletedCallback> compileCompletedCallback;
while(!viewer.done())
{
viewer.frame();
double currentTime = viewer.getFrameStamp()->getReferenceTime();
if (!compileCompletedCallback && if (!compileCompletedCallback &&
modelIndex<fileNames.size() && modelIndex<fileNames.size() &&
(currentTime-timeOfLastMerge)>timeBetweenMerges) (currentTime-timeOfLastMerge)>timeBetweenMerges)