fly/flightgear
1
0
Fork 0
Code Activity

Modified Files:

Browse source 
fg_os_osgviewer.cxx: Use the DISPLAY environment variable
	if not set otherwise.
This commit is contained in:
frohlich 2007-12-26 12:19:20 +00:00
parent d5ba35dddb
commit b69ec6fceb
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Main/fg_os_osgviewer.cxx
View file

@ -82,6 +82,7 @@ void fgOSOpenWindow(int w, int h, int bpp,
viewer->setThreadingModel(osgViewer::Viewer::SingleThreaded); viewer->setThreadingModel(osgViewer::Viewer::SingleThreaded);
osg::ref_ptr<osg::GraphicsContext::Traits> traits; osg::ref_ptr<osg::GraphicsContext::Traits> traits;
traits = new osg::GraphicsContext::Traits; traits = new osg::GraphicsContext::Traits;
traits->readDISPLAY();
int cbits = (bpp <= 16) ? 5 : 8; int cbits = (bpp <= 16) ? 5 : 8;
int zbits = (bpp <= 16) ? 16 : 24; int zbits = (bpp <= 16) ? 16 : 24;
traits->red = traits->green = traits->blue = cbits; traits->red = traits->green = traits->blue = cbits;
@ -139,9 +140,12 @@ void fgOSOpenWindow(int w, int h, int bpp,
double shearx = cameraNode->getDoubleValue("shear-x", 0); double shearx = cameraNode->getDoubleValue("shear-x", 0);
double sheary = cameraNode->getDoubleValue("shear-y", 0); double sheary = cameraNode->getDoubleValue("shear-y", 0);
cameraTraits->hostName = cameraNode->getStringValue("host-name", ""); cameraTraits->hostName
cameraTraits->displayNum = cameraNode->getIntValue("display", 0); = cameraNode->getStringValue("host-name", traits->hostName.c_str());
cameraTraits->screenNum = cameraNode->getIntValue("screen", 0); cameraTraits->displayNum
= cameraNode->getIntValue("display", traits->displayNum);
cameraTraits->screenNum
= cameraNode->getIntValue("screen", traits->screenNum);
if (cameraNode->getBoolValue("fullscreen", fullscreen)) { if (cameraNode->getBoolValue("fullscreen", fullscreen)) {
unsigned width = 0; unsigned width = 0;
unsigned height = 0; unsigned height = 0;