fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'next' of git://gitorious.org/fg/flightgear into next

Browse source
This commit is contained in:
Torsten Dreyer 2011-06-04 21:30:46 +02:00
commit a2ddcb8050
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Main/WindowBuilder.cxx
View file

@ -53,12 +53,8 @@ WindowBuilder::makeDefaultTraits(bool stencil)
GraphicsContext::WindowingSystemInterface* wsi GraphicsContext::WindowingSystemInterface* wsi
= osg::GraphicsContext::getWindowingSystemInterface(); = osg::GraphicsContext::getWindowingSystemInterface();
GraphicsContext::Traits* traits = new osg::GraphicsContext::Traits; GraphicsContext::Traits* traits = new osg::GraphicsContext::Traits;
traits->readDISPLAY(); traits->readDISPLAY();
unsigned screenwidth = 0;
unsigned screenheight = 0;
wsi->getScreenResolution(*traits, screenwidth, screenheight);
if (traits->displayNum < 0) if (traits->displayNum < 0)
traits->displayNum = 0; traits->displayNum = 0;
if (traits->screenNum < 0) if (traits->screenNum < 0)
@ -76,6 +72,10 @@ WindowBuilder::makeDefaultTraits(bool stencil)
if (stencil) if (stencil)
traits->stencil = 8; traits->stencil = 8;
unsigned screenwidth = 0;
unsigned screenheight = 0;
wsi->getScreenResolution(*traits, screenwidth, screenheight);
traits->doubleBuffer = true; traits->doubleBuffer = true;
traits->mipMapGeneration = true; traits->mipMapGeneration = true;
traits->windowName = "FlightGear"; traits->windowName = "FlightGear";

9
src/Main/main.cxx
View file

@ -618,10 +618,11 @@ int fgMainInit( int argc, char **argv ) {
// tell the operator how to use this application // tell the operator how to use this application
SG_LOG( SG_GENERAL, SG_ALERT, "" ); // To popup the console on windows SG_LOG( SG_GENERAL, SG_ALERT, "" ); // To popup the console on windows
cerr << endl << "Base package check failed ... " \ cerr << endl << "Base package check failed:" << endl \
<< "Found version " << base_version << " at: " \ << " Version " << base_version << " found at: " \
<< globals->get_fg_root() << endl; << globals->get_fg_root() << endl \
cerr << "Please upgrade to version: " << required_version << endl; << " Version " << required_version << " is required." << endl \
<< "Please upgrade/downgrade base package." << endl;
#ifdef _MSC_VER #ifdef _MSC_VER
cerr << "Hit a key to continue..." << endl; cerr << "Hit a key to continue..." << endl;
cin.get(); cin.get();