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

Converted SphericalManipulator to use Elevation and Heading rather than Zenith and Azimuth.

Browse Source
This commit is contained in:
Robert Osfield
2009-05-20 10:58:29 +00:00
parent d0992179d0
commit cd18dc01da
2 changed files with 58 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/osgGA/SphericalManipulator
View File

@@ -72,11 +72,11 @@ class OSGGA_EXPORT SphericalManipulator : public MatrixManipulator
double getHomeDistance() const { return _homeDistance; }
void setAzimuth(double azimuth) { _azimuth = azimuth; }
double getAzimuth() const {return _azimuth;}
void setHeading(double azimuth) { _heading = azimuth; }
double getHeading() const {return _heading;}
void setZenith(double zenith) { _zenith = zenith; }
double getZenith() const {return _zenith;}
void setElevation(double elevation) { _elevation = elevation; }
double getElevtion() const {return _elevation;}
/** get the minimum distance (as ratio) the eye point can be zoomed in */
@@ -100,17 +100,15 @@ class OSGGA_EXPORT SphericalManipulator : public MatrixManipulator
enum RotationMode
{
MODE_3D=0,
MODE_3D_HORIZONTAL,
MODE_3D_VERTICAL,
MODE_2D
ELEVATION_HEADING=0,
HEADING,
ELEVATION,
MAP
};
RotationMode getRotationMode() const {return _rotationMode;}
void setRotationMode(RotationMode mode);
static double computeAngles(const osg::Vec3d &vec,double& azimuth,double& zenith);
protected:
virtual ~SphericalManipulator();
@@ -142,8 +140,8 @@ class OSGGA_EXPORT SphericalManipulator : public MatrixManipulator
RotationMode _rotationMode;
osg::Vec3d _center;
double _distance;
double _azimuth; // angle from x axis in xy plane
double _zenith; // angle from z axis
double _heading; // angle from x axis in xy plane
double _elevation; // angle from xy plane, positive upwards towards the z axis
double _homeDistance;
double _zoomDelta;
};