mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-14 15:40:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in ellipsoid.

Browse Source
This commit is contained in:
Kalle Bladin
2016-04-27 12:05:28 -04:00
parent 57c8ca58bf
commit 82ab4cc3d2
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/globebrowsing/geodetics/ellipsoid.cpp
View File

@@ -41,13 +41,13 @@ namespace openspace {
(_radii.y * _radii.y),
(_radii.z * _radii.z)),
Vec3( // _oneOverRadiiSquared
1.0 / _cachedValues._radiiSquared.x,
1.0 / _cachedValues._radiiSquared.y,
1.0 / _cachedValues._radiiSquared.z),
1.0 / (_radii.x * _radii.x),
1.0 / (_radii.y * _radii.y),
1.0 / (_radii.z * _radii.z)),
Vec3( // _radiiToTheFourth
_cachedValues._radiiSquared.x * _cachedValues._radiiSquared.x,
_cachedValues._radiiSquared.y * _cachedValues._radiiSquared.y,
_cachedValues._radiiSquared.z * _cachedValues._radiiSquared.z),})
_radii.x * _radii.x * _radii.x * _radii.x,
_radii.y * _radii.y * _radii.y * _radii.y,
_radii.z * _radii.z * _radii.z * _radii.z),})
{
}

5
modules/globebrowsing/geodetics/ellipsoid.h
View File

@@ -74,8 +74,6 @@ public:
Vec3 geodetic2ToCartesian(const Geodetic2& geodetic2) const;
Vec3 geodetic3ToCartesian(const Geodetic3& geodetic3) const;
private:
struct EllipsoidCache
{
const Vec3 _radiiSquared;
@@ -85,6 +83,9 @@ private:
const Vec3 _radii;
const EllipsoidCache _cachedValues;
private:
};
} // namespace openspace