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

Added to Viewer::realize() automatic setup using Keystone when available and enabled, and when no other window setup has been selected.

Browse Source
This commit is contained in:
Robert Osfield
2013-05-13 09:18:37 +00:00
parent 9402efe38e
commit 4e34cadee2
4 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/osgViewer/Viewer.cpp
View File

@@ -464,13 +464,29 @@ void Viewer::realize()
if (screenNum>=0) setUpViewInWindow(x, y, width, height, screenNum);
else setUpViewInWindow(x,y,width,height);
}
else if (screenNum>=0)
{
setUpViewOnSingleScreen(screenNum);
}
else
{
setUpViewAcrossAllScreens();
osg::DisplaySettings* ds = _displaySettings.valid() ? _displaySettings.get() : osg::DisplaySettings::instance().get();
if (ds->getKeystoneHint() && !ds->getKeystoneFileNames().empty()) osgViewer::Keystone::loadKeystoneFiles(ds);
bool useKeystones = ds->getKeystoneHint() && !ds->getKeystones().empty();
if (ds->getStereo() && (!ds->getUseSceneViewForStereoHint() || useKeystones))
{
setUpViewForStereo();
}
else if (useKeystones)
{
osgViewer::Keystone* keystone = dynamic_cast<osgViewer::Keystone*>(ds->getKeystones().front().get());
setUpViewForKeystone(keystone);
}
else if (screenNum>=0)
{
setUpViewOnSingleScreen(screenNum);
}
else
{
setUpViewAcrossAllScreens();
}
}
}