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

Changed setTransformation(eye, center, up) paramter ordering to match gluLookAt conventions.

Browse Source
This commit is contained in:
Robert Osfield
2010-08-16 11:03:24 +00:00
parent 2d291234c6
commit fe6d590fc5
7 changed files with 30 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/osgGA/StandardManipulator.cpp
View File

@@ -23,24 +23,8 @@ using namespace osg;
using namespace osgGA;
using namespace osgUtil;
/** \fn void StandardManipulator::setTransformation( const osg::Vec3d& eye, const osg::Quat& rotation )
Sets manipulator by eye position and eye orientation.*/
/** \fn void StandardManipulator::setTransformation( const osg::Vec3d& center, const osg::Vec3d& eye, const osg::Vec3d& up )
Sets manipulator by focal center, eye position, and up vector.*/
/** \fn void StandardManipulator::getTransformation( osg::Vec3d& eye, osg::Quat& rotation )
Gets manipulator's eye position and eye orientation.*/
/** \fn void StandardManipulator::getTransformation( osg::Vec3d& center, osg::Vec3d& eye, osg::Vec3d& up )
Gets manipulator's focal center, eye position, and up vector.*/
int StandardManipulator::numRelativeFlagsAllocated = 0;
int StandardManipulator::allocateRelativeFlag()
{
return numRelativeFlagsAllocated++;
@@ -191,7 +175,7 @@ void StandardManipulator::home( double /*currentTime*/ )
computeHomePosition( NULL, ( _flags & COMPUTE_HOME_USING_BBOX ) != 0 );
_thrown = false;
setTransformation( _homeCenter, _homeEye, _homeUp );
setTransformation( _homeEye, _homeCenter, _homeUp );
flushMouseEventStack();
}
@@ -214,7 +198,7 @@ void StandardManipulator::home( const GUIEventAdapter& ea, GUIActionAdapter& us
}
_thrown = false;
setTransformation( _homeCenter, _homeEye, _homeUp );
setTransformation( _homeEye, _homeCenter, _homeUp );
us.requestRedraw();
us.requestContinuousUpdate( false );
@@ -799,7 +783,7 @@ bool StandardManipulator::setCenterByMousePointerIntersection( const GUIEventAda
// get current transformation
osg::Vec3d eye, oldCenter, up;
getTransformation( oldCenter, eye, up );
getTransformation( eye, oldCenter, up );
// new center
osg::Vec3d newCenter = (*intersections.begin()).getWorldIntersectPoint();
@@ -816,7 +800,7 @@ bool StandardManipulator::setCenterByMousePointerIntersection( const GUIEventAda
}
// set the new center
setTransformation( newCenter, eye, up );
setTransformation( eye, newCenter, up );
// warp pointer