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

Added support for handling a user define CoordinateFrame in the flight

Browse Source 
and trackball manipulators with API access via the MatrixManipulator
base class
This commit is contained in:
Robert Osfield 2004-04-29 22:18:54 +00:00
parent 36cd372847
commit f81447e839
5 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osgGA/KeySwitchMatrixManipulator
View File

@ -64,6 +64,8 @@ public:
// Overrides from MatrixManipulator...
/** set the coordinate frame which tells the manipulator which way is up, east and north.*/
virtual void setCoordinateFrame(const osg::CoordinateFrame& cf) { _coordinateFrame = cf; _current->setCoordinateFrame(cf); }
/** set the position of the matrix manipulator using a 4x4 Matrix.*/
virtual void setByMatrix(const osg::Matrixd& matrix) { _current->setByMatrix(matrix); }

12
include/osgGA/MatrixManipulator
View File

@ -16,6 +16,7 @@
#include <osg/Node>
#include <osg/Matrixd>
#include <osg/CoordinateSystemNode>
#include <osgUtil/SceneView>
@ -40,6 +41,16 @@ public:
virtual const char* className() const { return "MatrixManipulator"; }
/** set the coordinate frame which tells the manipulator which way is up, east and north.*/
virtual void setCoordinateFrame(const osg::CoordinateFrame& cf) { _coordinateFrame = cf; }
/** get the coordinate frame.*/
const osg::CoordinateFrame& getCoordinateFrame() const { return _coordinateFrame; }
osg::Vec3 getSideVector() const { return osg::Vec3(_coordinateFrame(0,0),_coordinateFrame(1,0),_coordinateFrame(2,0)); }
osg::Vec3 getFromVector() const { return osg::Vec3(_coordinateFrame(0,1),_coordinateFrame(1,1),_coordinateFrame(2,1)); }
osg::Vec3 getUpVector() const { return osg::Vec3(_coordinateFrame(0,2),_coordinateFrame(1,2),_coordinateFrame(2,2)); }
/** set the position of the matrix manipulator using a 4x4 Matrix.*/
virtual void setByMatrix(const osg::Matrixd& matrix) = 0;
@ -95,6 +106,7 @@ protected:
MatrixManipulator();
virtual ~MatrixManipulator();
osg::CoordinateFrame _coordinateFrame;
};
}

24
src/osgGA/DriveManipulator.cpp
View File

@ -75,8 +75,8 @@ void DriveManipulator::home(const GUIEventAdapter& ea,GUIActionAdapter& us)
osg::Vec3 ep = boundingSphere._center;
osg::Vec3 bp = ep;
ep.z() -= _modelScale*0.0001f;
bp.z() -= _modelScale;
ep -= getUpVector()* _modelScale*0.0001f;
bp -= getUpVector()* _modelScale;
// check to see if any obstruction in front.
osgUtil::IntersectVisitor iv;
@ -99,11 +99,11 @@ void DriveManipulator::home(const GUIEventAdapter& ea,GUIActionAdapter& us)
osg::Vec3 np = hitList.front().getWorldIntersectNormal();
osg::Vec3 uv;
if (np.z()>0.0f) uv = np;
if (np * getUpVector()>0.0f) uv = np;
else uv = -np;
ep = ip;
ep.z() += _height;
ep += getUpVector()*_height;
osg::Vec3 lv = uv^osg::Vec3(1.0f,0.0f,0.0f);
computePosition(ep,lv,uv);
@ -117,7 +117,7 @@ void DriveManipulator::home(const GUIEventAdapter& ea,GUIActionAdapter& us)
if (!positionSet)
{
bp = ep;
bp.z() += _modelScale;
bp += getUpVector()*_modelScale;
osg::ref_ptr<osg::LineSegment> segUp = new osg::LineSegment;
segUp->set(ep,bp);
@ -135,11 +135,11 @@ void DriveManipulator::home(const GUIEventAdapter& ea,GUIActionAdapter& us)
osg::Vec3 np = hitList.front().getWorldIntersectNormal();
osg::Vec3 uv;
if (np.z()>0.0f) uv = np;
if (np*getUpVector()>0.0f) uv = np;
else uv = -np;
ep = ip;
ep.z() += _height;
ep += getUpVector()*_height;
osg::Vec3 lv = uv^osg::Vec3(1.0f,0.0f,0.0f);
computePosition(ep,lv,uv);
@ -183,7 +183,7 @@ void DriveManipulator::init(const GUIEventAdapter& ea,GUIActionAdapter& us)
rotation_matrix.set(_rotation);
osg::Vec3 sv = osg::Vec3(1.0f,0.0f,0.0f) * rotation_matrix;
osg::Vec3 bp = ep;
bp.z() -= _modelScale;
bp -= getUpVector()*_modelScale;
// check to see if any obstruction in front.
osgUtil::IntersectVisitor iv;
@ -206,7 +206,7 @@ void DriveManipulator::init(const GUIEventAdapter& ea,GUIActionAdapter& us)
osg::Vec3 np = hitList.front().getWorldIntersectNormal();
osg::Vec3 uv;
if (np.z()>0.0f) uv = np;
if (np*getUpVector()>0.0f) uv = np;
else uv = -np;
ep = ip+uv*_height;
@ -222,7 +222,7 @@ void DriveManipulator::init(const GUIEventAdapter& ea,GUIActionAdapter& us)
if (!positionSet)
{
bp = ep;
bp.z() += _modelScale;
bp += getUpVector()*_modelScale;
osg::ref_ptr<osg::LineSegment> segUp = new osg::LineSegment;
segUp->set(ep,bp);
@ -240,7 +240,7 @@ void DriveManipulator::init(const GUIEventAdapter& ea,GUIActionAdapter& us)
osg::Vec3 np = hitList.front().getWorldIntersectNormal();
osg::Vec3 uv;
if (np.z()>0.0f) uv = np;
if (np*getUpVector()>0.0f) uv = np;
else uv = -np;
ep = ip+uv*_height;
@ -535,7 +535,7 @@ bool DriveManipulator::calcMovement()
// no hit on the terrain found therefore resort to a fall under
// under the influence of gravity.
osg::Vec3 dp = lfp;
dp.z() -= 2*_modelScale;
dp -= getUpVector()* (2*_modelScale);
iv.reset();

8
src/osgGA/FlightManipulator.cpp
View File

@ -282,11 +282,15 @@ bool FlightManipulator::calcMovement()
if (_yawMode==YAW_AUTOMATICALLY_WHEN_BANKED)
{
float bank = asinf(sv.z());
//float bank = asinf(sv.z());
float bank = asinf(sv *getUpVector());
float yaw = inRadians(bank)*dt;
osg::Quat yaw_rotate;
yaw_rotate.makeRotate(yaw,0.0f,0.0f,1.0f);
//yaw_rotate.makeRotate(yaw,0.0f,0.0f,1.0f);
yaw_rotate.makeRotate(yaw,getUpVector());
delta_rotate = delta_rotate*yaw_rotate;
}

1
src/osgGA/TrackballManipulator.cpp
View File

@ -230,7 +230,6 @@ void TrackballManipulator::computePosition(const osg::Vec3& eye,const osg::Vec3&
bool TrackballManipulator::calcMovement()
{
// return if less then two events have been added.
if (_ga_t0.get()==NULL || _ga_t1.get()==NULL) return false;