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

Improved the use of the Keystone's defined in the DisplaySettings object.

Browse Source
This commit is contained in:
Robert Osfield
2013-05-13 09:49:54 +00:00
parent 4e34cadee2
commit e9388d5ad8
2 changed files with 58 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/osgViewer/Keystone.cpp
View File

@@ -422,13 +422,25 @@ bool KeystoneHandler::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionA
if (!viewport) return false;
if (ea.getEventType()==osgGA::GUIEventAdapter::KEYDOWN)
if (ea.getEventType()==osgGA::GUIEventAdapter::KEYDOWN && ((ea.getModKeyMask()==osgGA::GUIEventAdapter::MODKEY_LEFT_CTRL || ea.getModKeyMask()==osgGA::GUIEventAdapter::MODKEY_RIGHT_CTRL)))
{
if (ea.getUnmodifiedKey()=='g' && (ea.getModKeyMask()==osgGA::GUIEventAdapter::MODKEY_LEFT_CTRL || ea.getModKeyMask()==osgGA::GUIEventAdapter::MODKEY_RIGHT_CTRL))
if (ea.getUnmodifiedKey()=='g')
{
setKeystoneEditingEnabled(!getKeystoneEditingEnabled());
return true;
}
if (ea.getUnmodifiedKey()=='r')
{
_selectedRegion = NONE_SELECTED;
_startControlPoints->reset();
_currentControlPoints->reset();
return true;
}
else if (ea.getUnmodifiedKey()=='s')
{
_keystone->writeToFile();
return true;
}
}
bool haveCameraMatch = false;
@@ -485,17 +497,7 @@ bool KeystoneHandler::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionA
}
case(osgGA::GUIEventAdapter::KEYDOWN):
{
if (ea.getUnmodifiedKey()=='r' && (ea.getModKeyMask()==osgGA::GUIEventAdapter::MODKEY_LEFT_CTRL || ea.getModKeyMask()==osgGA::GUIEventAdapter::MODKEY_RIGHT_CTRL))
{
_selectedRegion = NONE_SELECTED;
_startControlPoints->reset();
_currentControlPoints->reset();
}
else if (ea.getUnmodifiedKey()=='s' && (ea.getModKeyMask()==osgGA::GUIEventAdapter::MODKEY_LEFT_CTRL || ea.getModKeyMask()==osgGA::GUIEventAdapter::MODKEY_RIGHT_CTRL))
{
_keystone->writeToFile();
}
else if (ea.getKey()==osgGA::GUIEventAdapter::KEY_Up)
if (ea.getKey()==osgGA::GUIEventAdapter::KEY_Up)
{
move(computeRegion(ea), osg::Vec2d(0.0, _keyIncrement.y()*incrementScale(ea).y()) );
}

72
src/osgViewer/View.cpp
View File

@@ -2497,14 +2497,23 @@ void View::setUpViewForStereo()
ds->setUseSceneViewForStereoHint(false);
std::string filename("keystone.osgt");
osg::ref_ptr<Keystone> keystone = osgDB::readFile<Keystone>(filename);
if (keystone.valid()) keystone->setUserValue("filename",filename);
typedef std::vector< osg::ref_ptr<Keystone> > Keystones;
Keystones keystones;
if (ds->getKeystoneHint() && !ds->getKeystones().empty())
{
for(osg::DisplaySettings::Objects::iterator itr = ds->getKeystones().begin();
itr != ds->getKeystones().end();
++itr)
{
Keystone* keystone = dynamic_cast<Keystone*>(itr->get());
if (keystone) keystones.push_back(keystone);
}
}
OSG_NOTICE<<"Keystone "<<keystone.get()<<std::endl;
if (!keystone) keystone = new Keystone;
if (ds->getKeystoneHint())
{
while(keystones.size()<2) keystones.push_back(new Keystone);
}
// set up view's main camera
@@ -2585,7 +2594,7 @@ void View::setUpViewForStereo()
// left keystone camera to render to right buffer
// one keystone and editing for the one window
if (keystone.valid())
if (!keystones.empty())
{
// for keystone:
// left camera to render to left texture using whole viewport of left texture
@@ -2593,6 +2602,8 @@ void View::setUpViewForStereo()
// left keystone camera to render to left viewport/window
// right keystone camera to render to right viewport/window
// two keystone, one for each of the left and right viewports/windows
osg::ref_ptr<Keystone> keystone = keystones.front();
// create distortion texture
osg::ref_ptr<osg::Texture> left_texture = createDistortionTexture(traits->width, traits->height);
@@ -2662,7 +2673,7 @@ void View::setUpViewForStereo()
right_camera->getOrCreateStateSet()->setAttribute(new osg::ColorMask(false, true, true, true));
right_camera->setRenderOrder(osg::Camera::NESTED_RENDER, 1);
if (keystone.valid())
if (!keystones.empty())
{
// for keystone:
// left camera to render to texture using red colour mask
@@ -2670,6 +2681,8 @@ void View::setUpViewForStereo()
// keystone camera to render to whole screen without colour masks
// one keystone and editing for the one window
osg::ref_ptr<Keystone> keystone = keystones.front();
// create distortion texture
osg::ref_ptr<osg::Texture> texture = createDistortionTexture(traits->width, traits->height);
@@ -2723,7 +2736,7 @@ void View::setUpViewForStereo()
right_start, 0, traits->width/2, traits->height, traits->doubleBuffer ? GL_BACK : GL_FRONT,
1.0);
if (keystone.valid())
if (!keystones.empty())
{
// for keystone:
// left camera to render to left texture using whole viewport of left texture
@@ -2732,7 +2745,8 @@ void View::setUpViewForStereo()
// right keystone camera to render to right viewport/window
// two keystone, one for each of the left and right viewports/windows
keystone->setName("left");
osg::ref_ptr<Keystone> left_keystone = keystones[0];
osg::ref_ptr<Keystone> right_keystone = keystones[1];
// create distortion texture
osg::ref_ptr<osg::Texture> left_texture = createDistortionTexture(traits->width/2, traits->height);
@@ -2763,24 +2777,20 @@ void View::setUpViewForStereo()
// create Keystone left distortion camera
keystone->setGridColor(osg::Vec4(1.0f,0.0f,0.0,1.0));
left_keystone->setGridColor(osg::Vec4(1.0f,0.0f,0.0,1.0));
osg::ref_ptr<osg::Camera> left_keystone_camera = assignKeystoneDistortionCamera(ds, gc.get(),
left_start, 0, traits->width/2, traits->height,
traits->doubleBuffer ? GL_BACK : GL_FRONT,
left_texture, keystone.get());
left_texture, left_keystone.get());
left_keystone_camera->setRenderOrder(osg::Camera::NESTED_RENDER, 2);
// attach Keystone editing event handler.
left_keystone_camera->addEventCallback(new KeystoneHandler(keystone.get()));
left_keystone_camera->addEventCallback(new KeystoneHandler(left_keystone.get()));
osg::ref_ptr<Keystone> right_keystone = new Keystone;
right_keystone->setGridColor(osg::Vec4(0.0f,1.0f,0.0,1.0));
right_keystone->setName("right");
// create Keystone right distortion camera
right_keystone->setGridColor(osg::Vec4(0.0f,1.0f,0.0,1.0));
osg::ref_ptr<osg::Camera> right_keystone_camera = assignKeystoneDistortionCamera(ds, gc.get(),
right_start, 0, traits->width/2, traits->height,
traits->doubleBuffer ? GL_BACK : GL_FRONT,
@@ -2820,7 +2830,7 @@ void View::setUpViewForStereo()
// right keystone camera to render to right viewport/window
// two keystone, one for each of the left and right viewports/windows
if (keystone.valid())
if (!keystones.empty())
{
// for keystone:
// left camera to render to left texture using whole viewport of left texture
@@ -2829,6 +2839,9 @@ void View::setUpViewForStereo()
// right keystone camera to render to right viewport/window
// two keystone, one for each of the left and right viewports/windows
osg::ref_ptr<Keystone> left_keystone = keystones[0];
osg::ref_ptr<Keystone> right_keystone = keystones[1];
// create distortion texture
osg::ref_ptr<osg::Texture> left_texture = createDistortionTexture(traits->width, traits->height/2);
@@ -2858,22 +2871,20 @@ void View::setUpViewForStereo()
// create Keystone left distortion camera
keystone->setGridColor(osg::Vec4(1.0f,0.0f,0.0,1.0));
left_keystone->setGridColor(osg::Vec4(1.0f,0.0f,0.0,1.0));
osg::ref_ptr<osg::Camera> left_keystone_camera = assignKeystoneDistortionCamera(ds, gc.get(),
0, left_start, traits->width, traits->height/2,
traits->doubleBuffer ? GL_BACK : GL_FRONT,
left_texture, keystone.get());
left_texture, left_keystone.get());
left_keystone_camera->setRenderOrder(osg::Camera::NESTED_RENDER, 2);
// attach Keystone editing event handler.
left_keystone_camera->addEventCallback(new KeystoneHandler(keystone.get()));
left_keystone_camera->addEventCallback(new KeystoneHandler(left_keystone.get()));
osg::ref_ptr<Keystone> right_keystone = new Keystone;
right_keystone->setGridColor(osg::Vec4(0.0f,1.0f,0.0,1.0));
// create Keystone right distortion camera
right_keystone->setGridColor(osg::Vec4(0.0f,1.0f,0.0,1.0));
osg::ref_ptr<osg::Camera> right_keystone_camera = assignKeystoneDistortionCamera(ds, gc.get(),
0, right_start, traits->width, traits->height/2,
traits->doubleBuffer ? GL_BACK : GL_FRONT,
@@ -2901,7 +2912,7 @@ void View::setUpViewForStereo()
// keystone camera then render to window
// one keystone and editing for window
if (keystone.valid())
if (!keystones.empty())
{
// for keystone:
// left camera to render to texture using red colour mask
@@ -2909,6 +2920,8 @@ void View::setUpViewForStereo()
// keystone camera to render to whole screen without colour masks
// one keystone and editing for the one window
osg::ref_ptr<Keystone> keystone = keystones.front();
// create distortion texture
osg::ref_ptr<osg::Texture> texture = createDistortionTexture(traits->width, traits->height);
@@ -2946,7 +2959,7 @@ void View::setUpViewForStereo()
// keystone camera then render to window
// one keystone and editing for window
if (keystone.valid())
if (!keystones.empty())
{
// for keystone:
// left camera to render to texture using red colour mask
@@ -2954,6 +2967,8 @@ void View::setUpViewForStereo()
// keystone camera to render to whole screen without colour masks
// one keystone and editing for the one window
osg::ref_ptr<Keystone> keystone = keystones.front();
// create distortion texture
osg::ref_ptr<osg::Texture> texture = createDistortionTexture(traits->width, traits->height);
@@ -3031,7 +3046,6 @@ void View::setUpViewForStereo()
}
OSG_NOTICE<<"getNumSlaves()="<<getNumSlaves()<<std::endl;
// left Camera
{
osg::ref_ptr<osg::Camera> camera = assignStereoCamera(ds, gc, 0, 0, traits->width, traits->height, traits->doubleBuffer ? GL_BACK : GL_FRONT, -1.0);