StelSphereGeometry.hpp   StelSphereGeometry.hpp 
skipping to change at line 514 skipping to change at line 514
public: public:
//! Construct a SphericalCap with a 90 deg aperture and an undefined direction. //! Construct a SphericalCap with a 90 deg aperture and an undefined direction.
SphericalCap() : d(0) {;} SphericalCap() : d(0) {;}
//! Construct a SphericalCap from its direction and assumes a 90 deg aperture. //! Construct a SphericalCap from its direction and assumes a 90 deg aperture.
SphericalCap(double x, double y, double z) : n(x,y,z), d(0) {;} SphericalCap(double x, double y, double z) : n(x,y,z), d(0) {;}
//! Construct a SphericalCap from its direction and aperture. //! Construct a SphericalCap from its direction and aperture.
//! @param an a unit vector indicating the direction. //! @param an a unit vector indicating the direction.
//! @param ar cosinus of the aperture. //! @param ar cosinus of the aperture.
SphericalCap(const Vec3d& an, double ar) : n(an), d(ar) {Q_ASSERT(d= SphericalCap(const Vec3d& an, double ar) : n(an), d(ar) {//n.normali
=0 || std::fabs(n.lengthSquared()-1.)<0.0000001);} ze();
Q_ASSERT(d==0 || std::fabs(n.l
engthSquared()-1.)<0.0000001);}
// TODO:FIXME! GZ reports 2013-03-02: apparently the Q_ASSERT is her
e because n should be normalized at this point, but
// for efficiency n.normalize() should not be called at this point.
// However, when zooming in a bit in Hammer-Aitoff and Mercator proj
ections, this Assertion fires.
// Atmosphere must be active
// It may have to do with DSO texture rendering.
// found at r5863.
// n.normalize() prevents this for now, but may cost performance.
// AARGH - activating n.normalize() inhibits mouse-identification/se
lection of stars!
// May be compiler dependent (seen on Win/MinGW), AW cannot confirm
it on Linux.
//! Copy constructor. //! Copy constructor.
SphericalCap(const SphericalCap& other) : SphericalRegion(), n(other .n), d(other.d) {;} SphericalCap(const SphericalCap& other) : SphericalRegion(), n(other .n), d(other.d) {;}
virtual SphericalRegionType getType() const {return SphericalRegion: :Cap;} virtual SphericalRegionType getType() const {return SphericalRegion: :Cap;}
virtual OctahedronPolygon getOctahedronPolygon() const; virtual OctahedronPolygon getOctahedronPolygon() const;
//! Get the area of the intersection of the halfspace on the sphere in steradian. //! Get the area of the intersection of the halfspace on the sphere in steradian.
virtual double getArea() const {return 2.*M_PI*(1.-d);} virtual double getArea() const {return 2.*M_PI*(1.-d);}
 End of changes. 1 change blocks. 
2 lines changed or deleted 18 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/