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

Introduced the use of atan2 in place of asin/acos for reliability and simplicity

Browse Source
This commit is contained in:
Robert Osfield
2010-06-14 16:27:35 +00:00
parent f5f6821120
commit 6fe084df3b
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgSim/SphereSegment.cpp
View File

@@ -289,16 +289,15 @@ void SphereSegment::setArea(const osg::Vec3& v, float azRange, float elevRange)
vec.normalize(); // Make sure we're unit length
// Calculate the elevation range
float elev = asin(vec.z()); // Elevation angle
float xyLen = sqrtf(vec.x()*vec.x() + vec.y()*vec.y());
float elev = atan2(vec.z(), xyLen); // Elevation angle
elevRange /= 2.0f;
_elevMin = elev - elevRange;
_elevMax = elev + elevRange;
// Calculate the azimuth range, cater for trig ambiguities
float xyLen = cos(elev);
float az;
if(vec.x() != 0.0f) az = asin(vec.x()/xyLen);
else az = acos(vec.y()/xyLen);
// Calculate the azimuth range, cater for trig ambiguities
float az = atan2(vec.x(), vec.y());
azRange /= 2.0f;
_azMin = az - azRange;