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

Fixed crash in osgoccluder which was calling setUpViewer and the

Browse Source 
osgProducer/Viewer was assuming that the update was always set.
This commit is contained in:
Robert Osfield
2003-03-19 10:28:19 +00:00
parent d241ca763b
commit a7bb0126f5
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
examples/osgoccluder/osgoccluder.cpp
View File

@@ -290,10 +290,14 @@ int main( int argc, char **argv )
// initialize the viewer.
osgProducer::Viewer viewer(arguments);
// set up the value with sensible default event handlers.
viewer.setUpViewer(osgProducer::Viewer::STANDARD_SETTINGS);
bool manuallyCreateOccluders = false;
while (arguments.read("-c")) { manuallyCreateOccluders = true; }
// register trackball, flight and drive.
// get details on keyboard and mouse bindings used by the viewer.
viewer.getUsage(*arguments.getApplicationUsage());
// if user request help write it out to cout.
if (arguments.read("-h") || arguments.read("--help"))
@@ -316,7 +320,6 @@ int main( int argc, char **argv )
osg::Node* loadedmodel = osgDB::readNodeFiles(arguments);
if (!loadedmodel)
{
// write_usage(osg::notify(osg::NOTICE),argv[0]);
return 1;
}
@@ -325,7 +328,7 @@ int main( int argc, char **argv )
optimzer.optimize(loadedmodel);
// add the occluders to the loaded model.
osg::Group* rootnode = NULL;
osg::ref_ptr<osg::Group> rootnode;
if (manuallyCreateOccluders)
{
@@ -339,7 +342,7 @@ int main( int argc, char **argv )
// add a viewport to the viewer and attach the scene graph.
viewer.setSceneData( rootnode );
viewer.setSceneData( rootnode.get() );
// create the windows and run the threads.
@@ -349,7 +352,7 @@ int main( int argc, char **argv )
{
osgUtil::SceneView* sceneview = viewer.getSceneHandlerList()[0].get();
viewer.getEventHandlerList().push_front(new OccluderEventHandler(sceneview,rootnode));
viewer.getEventHandlerList().push_front(new OccluderEventHandler(sceneview,rootnode.get()));
}
while( !viewer.done() )
@@ -366,5 +369,7 @@ int main( int argc, char **argv )
}
//viewer.sync();
return 0;
}

13
src/osgProducer/Viewer.cpp
View File

@@ -231,12 +231,15 @@ void Viewer::update()
}
}
_updateVisitor->setTraversalNumber(_frameStamp->getFrameNumber());
// update the scene by traversing it with the the update visitor which will
// call all node update callbacks and animations.
getSceneData()->accept(*_updateVisitor);
if (_updateVisitor.valid())
{
_updateVisitor->setTraversalNumber(_frameStamp->getFrameNumber());
// update the scene by traversing it with the the update visitor which will
// call all node update callbacks and animations.
getSceneData()->accept(*_updateVisitor);
}
// update the main producer camera
if (_old_style_osg_camera.valid()) setView(_old_style_osg_camera->getModelViewMatrix().ptr());
}