Reverted back to changes before experiements with ViewConfig
This commit is contained in:
parent
79ec0e863d
commit
6cb26321a9
@ -38,20 +38,6 @@ int main( int argc, char **argv )
|
||||
{
|
||||
osg::ArgumentParser arguments(&argc,argv);
|
||||
|
||||
|
||||
osg::ref_ptr<osgViewer::ViewConfig> config;
|
||||
std::string configFile;
|
||||
if (arguments.read("-c",configFile))
|
||||
{
|
||||
config = osgDB::readFile<osgViewer::ViewConfig>(configFile);
|
||||
}
|
||||
if (!config)
|
||||
{
|
||||
config = new osgViewer::WoWVxDisplay(); // new osgViewer::SingleWindow(100,100,800,600,0);
|
||||
}
|
||||
|
||||
OSG_NOTICE<<"Config "<<config.get()<<std::endl;
|
||||
|
||||
// initialize the viewer.
|
||||
osgViewer::Viewer viewer(arguments);
|
||||
|
||||
@ -72,13 +58,6 @@ int main( int argc, char **argv )
|
||||
|
||||
viewer.setSceneData(model.get());
|
||||
|
||||
if (config.valid())
|
||||
{
|
||||
viewer.apply(config.get());
|
||||
|
||||
osgDB::writeObjectFile(*config,"myconfig.osgx");
|
||||
}
|
||||
|
||||
// add the state manipulator
|
||||
viewer.addEventHandler( new osgGA::StateSetManipulator(viewer.getCamera()->getOrCreateStateSet()) );
|
||||
|
||||
@ -88,9 +67,6 @@ int main( int argc, char **argv )
|
||||
// add camera manipulator
|
||||
viewer.setCameraManipulator(new osgGA::TrackballManipulator());
|
||||
|
||||
#if 0
|
||||
|
||||
|
||||
OSG_NOTICE<<"KeystoneFileNames.size()="<<ds->getKeystoneFileNames().size()<<std::endl;
|
||||
for(osg::DisplaySettings::FileNames::iterator itr = ds->getKeystoneFileNames().begin();
|
||||
itr != ds->getKeystoneFileNames().end();
|
||||
@ -135,7 +111,7 @@ int main( int argc, char **argv )
|
||||
|
||||
viewer.setUpViewForKeystone(keystone.get());
|
||||
}
|
||||
#endif
|
||||
|
||||
viewer.realize();
|
||||
|
||||
while(!viewer.done())
|
||||
|
Loading…
Reference in New Issue
Block a user