Reverted erronous check-in (which was r10454)

This commit is contained in:
Robert Osfield 2009-07-12 15:44:57 +00:00
parent 6e6a7c960e
commit 554a6da56d

View File

@ -1,12 +1,12 @@
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
* *
* This application is open source and may be redistributed and/or modified * This application is open source and may be redistributed and/or modified
* freely and without restriction, both in commericial and non commericial applications, * freely and without restriction, both in commericial and non commericial applications,
* as long as this copyright notice is maintained. * as long as this copyright notice is maintained.
* *
* This application is distributed in the hope that it will be useful, * This application is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/ */
#include <osgDB/ReadFile> #include <osgDB/ReadFile>
@ -15,7 +15,6 @@
#include <osg/Switch> #include <osg/Switch>
#include <osgText/Text> #include <osgText/Text>
#include <osg/Group>
#include <osgViewer/Viewer> #include <osgViewer/Viewer>
#include <osgViewer/ViewerEventHandlers> #include <osgViewer/ViewerEventHandlers>
@ -27,167 +26,135 @@
#include <osgGA/StateSetManipulator> #include <osgGA/StateSetManipulator>
#include <osgGA/AnimationPathManipulator> #include <osgGA/AnimationPathManipulator>
#include <osgGA/TerrainManipulator> #include <osgGA/TerrainManipulator>
#include <osgGA/SphericalManipulator>
#include <iostream> #include <iostream>
#ifdef _WINDOWS
#include <Windows.h>
#include <GL/glext.h>
#include <GL/wglext.h>
#include "vsynctoggle_custom.h"
#endif
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
// use an ArgumentParser object to manage the program arguments. // use an ArgumentParser object to manage the program arguments.
osg::ArgumentParser arguments(&argc,argv); osg::ArgumentParser arguments(&argc,argv);
arguments.getApplicationUsage()->setApplicationName(arguments.getApplicationName()); arguments.getApplicationUsage()->setApplicationName(arguments.getApplicationName());
arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the standard OpenSceneGraph example which loads and visualises 3d models."); arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the standard OpenSceneGraph example which loads and visualises 3d models.");
arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] filename ..."); arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] filename ...");
arguments.getApplicationUsage()->addCommandLineOption("--image <filename>","Load an image and render it on a quad"); arguments.getApplicationUsage()->addCommandLineOption("--image <filename>","Load an image and render it on a quad");
arguments.getApplicationUsage()->addCommandLineOption("--dem <filename>","Load an image/DEM and render it on a HeightField"); arguments.getApplicationUsage()->addCommandLineOption("--dem <filename>","Load an image/DEM and render it on a HeightField");
arguments.getApplicationUsage()->addCommandLineOption("--login <url> <username> <password>","Provide authentication information for http file access."); arguments.getApplicationUsage()->addCommandLineOption("--login <url> <username> <password>","Provide authentication information for http file access.");
osgViewer::Viewer viewer(arguments); osgViewer::Viewer viewer(arguments);
unsigned int helpType = 0; unsigned int helpType = 0;
if ((helpType = arguments.readHelpType())) if ((helpType = arguments.readHelpType()))
{
arguments.getApplicationUsage()->write(std::cout, helpType);
return 1;
}
// report any errors if they have occurred when parsing the program arguments.
if (arguments.errors())
{
arguments.writeErrorMessages(std::cout);
return 1;
}
if (arguments.argc()<=1)
{
arguments.getApplicationUsage()->write(std::cout,osg::ApplicationUsage::COMMAND_LINE_OPTION);
return 1;
}
std::string url, username, password;
while(arguments.read("--login",url, username, password))
{
if (!osgDB::Registry::instance()->getAuthenticationMap())
{ {
osgDB::Registry::instance()->setAuthenticationMap(new osgDB::AuthenticationMap); arguments.getApplicationUsage()->write(std::cout, helpType);
osgDB::Registry::instance()->getAuthenticationMap()->addAuthenticationDetails( return 1;
url,
new osgDB::AuthenticationDetails(username, password)
);
}
}
// set up the camera manipulators.
{
osg::ref_ptr<osgGA::KeySwitchMatrixManipulator> keyswitchManipulator = new osgGA::KeySwitchMatrixManipulator;
keyswitchManipulator->addMatrixManipulator( '1', "Trackball", new osgGA::TrackballManipulator() );
keyswitchManipulator->addMatrixManipulator( '2', "Flight", new osgGA::FlightManipulator() );
keyswitchManipulator->addMatrixManipulator( '3', "Drive", new osgGA::DriveManipulator() );
keyswitchManipulator->addMatrixManipulator( '4', "Terrain", new osgGA::TerrainManipulator() );
std::string pathfile;
char keyForAnimationPath = '5';
while (arguments.read("-p",pathfile))
{
osgGA::AnimationPathManipulator* apm = new osgGA::AnimationPathManipulator(pathfile);
if (apm || !apm->valid())
{
unsigned int num = keyswitchManipulator->getNumMatrixManipulators();
keyswitchManipulator->addMatrixManipulator( keyForAnimationPath, "Path", apm );
keyswitchManipulator->selectMatrixManipulator(num);
++keyForAnimationPath;
}
} }
viewer.setCameraManipulator( keyswitchManipulator.get() ); // report any errors if they have occurred when parsing the program arguments.
} if (arguments.errors())
{
arguments.writeErrorMessages(std::cout);
return 1;
}
// add the state manipulator if (arguments.argc()<=1)
viewer.addEventHandler( new osgGA::StateSetManipulator(viewer.getCamera()->getOrCreateStateSet()) ); {
arguments.getApplicationUsage()->write(std::cout,osg::ApplicationUsage::COMMAND_LINE_OPTION);
return 1;
}
// add the thread model handler std::string url, username, password;
viewer.addEventHandler(new osgViewer::ThreadingHandler); while(arguments.read("--login",url, username, password))
{
if (!osgDB::Registry::instance()->getAuthenticationMap())
{
osgDB::Registry::instance()->setAuthenticationMap(new osgDB::AuthenticationMap);
osgDB::Registry::instance()->getAuthenticationMap()->addAuthenticationDetails(
url,
new osgDB::AuthenticationDetails(username, password)
);
}
}
// add the window size toggle handler // set up the camera manipulators.
viewer.addEventHandler(new osgViewer::WindowSizeHandler); {
osg::ref_ptr<osgGA::KeySwitchMatrixManipulator> keyswitchManipulator = new osgGA::KeySwitchMatrixManipulator;
// add the stats handler keyswitchManipulator->addMatrixManipulator( '1', "Trackball", new osgGA::TrackballManipulator() );
viewer.addEventHandler(new osgViewer::StatsHandler); keyswitchManipulator->addMatrixManipulator( '2', "Flight", new osgGA::FlightManipulator() );
keyswitchManipulator->addMatrixManipulator( '3', "Drive", new osgGA::DriveManipulator() );
keyswitchManipulator->addMatrixManipulator( '4', "Terrain", new osgGA::TerrainManipulator() );
keyswitchManipulator->addMatrixManipulator( '5', "Spherical", new osgGA::SphericalManipulator() );
// add the help handler std::string pathfile;
viewer.addEventHandler(new osgViewer::HelpHandler(arguments.getApplicationUsage())); char keyForAnimationPath = '6';
while (arguments.read("-p",pathfile))
{
osgGA::AnimationPathManipulator* apm = new osgGA::AnimationPathManipulator(pathfile);
if (apm || !apm->valid())
{
unsigned int num = keyswitchManipulator->getNumMatrixManipulators();
keyswitchManipulator->addMatrixManipulator( keyForAnimationPath, "Path", apm );
keyswitchManipulator->selectMatrixManipulator(num);
++keyForAnimationPath;
}
}
// add the record camera path handler viewer.setCameraManipulator( keyswitchManipulator.get() );
viewer.addEventHandler(new osgViewer::RecordCameraPathHandler); }
// add the LOD Scale handler // add the state manipulator
viewer.addEventHandler(new osgViewer::LODScaleHandler); viewer.addEventHandler( new osgGA::StateSetManipulator(viewer.getCamera()->getOrCreateStateSet()) );
// add the screen capture handler // add the thread model handler
viewer.addEventHandler(new osgViewer::ScreenCaptureHandler); viewer.addEventHandler(new osgViewer::ThreadingHandler);
// load the data // add the window size toggle handler
osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments); viewer.addEventHandler(new osgViewer::WindowSizeHandler);
if (!loadedModel)
{
std::cout << arguments.getApplicationName() <<": No data loaded" << std::endl;
return 1;
}
// any option left unread are converted into errors to write out later. // add the stats handler
arguments.reportRemainingOptionsAsUnrecognized(); viewer.addEventHandler(new osgViewer::StatsHandler);
// report any errors if they have occurred when parsing the program arguments. // add the help handler
if (arguments.errors()) viewer.addEventHandler(new osgViewer::HelpHandler(arguments.getApplicationUsage()));
{
arguments.writeErrorMessages(std::cout); // add the record camera path handler
return 1; viewer.addEventHandler(new osgViewer::RecordCameraPathHandler);
}
// add the LOD Scale handler
viewer.addEventHandler(new osgViewer::LODScaleHandler);
// add the screen capture handler
viewer.addEventHandler(new osgViewer::ScreenCaptureHandler);
// load the data
osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments);
if (!loadedModel)
{
std::cout << arguments.getApplicationName() <<": No data loaded" << std::endl;
return 1;
}
// any option left unread are converted into errors to write out later.
arguments.reportRemainingOptionsAsUnrecognized();
// report any errors if they have occurred when parsing the program arguments.
if (arguments.errors())
{
arguments.writeErrorMessages(std::cout);
return 1;
}
// optimize the scene graph, remove redundant nodes and state etc. // optimize the scene graph, remove redundant nodes and state etc.
osgUtil::Optimizer optimizer; osgUtil::Optimizer optimizer;
optimizer.optimize(loadedModel.get()); optimizer.optimize(loadedModel.get());
osg::ref_ptr<osg::Group> group = new osg::Group(); viewer.setSceneData( loadedModel.get() );
group->addChild(loadedModel.get());
viewer.setSceneData( group.get() ); viewer.realize();
{ return viewer.run();
char tmp[256];
tmp[sizeof(tmp) - 1] = 0;
getcwd(tmp, sizeof(tmp) - 1);
std::string path(tmp);
path += "\\system\\cache\\planet";
tmp[sizeof(tmp) - 1] = 0;
snprintf(tmp, sizeof(tmp) - 1, "%s", path.c_str());
//_putenv(tmp);
// osgDB::Registry::instance()->setFileCache(new osgDB::FileCache( tmp ) );
viewer.getDatabasePager()->setTargetMaximumNumberOfPageLOD(500);
#ifdef _WINDOWS
osg::ref_ptr<baronvsync::CVsyncDrawable> vsync = new baronvsync::CVsyncDrawable();
osg::ref_ptr<osg::Geode> vsyncGeode = new osg::Geode();
vsyncGeode->addDrawable(vsync.get());
vsync->SetVSync(false);
group->addChild(vsyncGeode.get());
#endif
}
viewer.realize();
return viewer.run();
} }