fly/flightgear
1
0
Fork 0
Code Activity

Implement rotation offsets for cameras.

Browse source
This commit is contained in:
frohlich 2008-05-26 20:34:26 +00:00
parent 8dbfe52319
commit 61dc8df110
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Main/fg_os_osgviewer.cxx
View file

@ -208,6 +208,7 @@ void fgOSOpenWindow(bool stencil)
cameraTraits = new osg::GraphicsContext::Traits(*traits); cameraTraits = new osg::GraphicsContext::Traits(*traits);
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);
double heading = cameraNode->getDoubleValue("heading-deg", 0);
setTraitsFromProperties(cameraTraits.get(), cameraNode, wsi); setTraitsFromProperties(cameraTraits.get(), cameraNode, wsi);
// FIXME, currently this is too much of a problem to route // FIXME, currently this is too much of a problem to route
// the resize events. When we do no longer need sdl and // the resize events. When we do no longer need sdl and
@ -236,8 +237,11 @@ void fgOSOpenWindow(bool stencil)
cameraNameString); cameraNameString);
if (shearx == 0 && sheary == 0) if (shearx == 0 && sheary == 0)
cam3D->flags |= Camera3D::MASTER; cam3D->flags |= Camera3D::MASTER;
viewer->addSlave(camera, Matrix::translate(-shearx, -sheary, 0),
Matrix()); osg::Matrix pOff = osg::Matrix::translate(-shearx, -sheary, 0);
osg::Matrix vOff;
vOff.makeRotate(SGMiscd::deg2rad(heading), osg::Vec3(0, 1, 0));
viewer->addSlave(camera, pOff, vOff);
} else { } else {
SG_LOG(SG_GENERAL, SG_WARN, SG_LOG(SG_GENERAL, SG_WARN,
"Couldn't create graphics context on " "Couldn't create graphics context on "