StelSphereGeometry.hpp   StelSphereGeometry.hpp 
skipping to change at line 23 skipping to change at line 23
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#ifndef _STELSPHEREGEOMETRY_HPP_ #ifndef _STELSPHEREGEOMETRY_HPP_
#define _STELSPHEREGEOMETRY_HPP_ #define _STELSPHEREGEOMETRY_HPP_
#include "config.h"
#include "OctahedronPolygon.hpp" #include "OctahedronPolygon.hpp"
#include "StelVertexArray.hpp" #include "StelVertexArray.hpp"
#include "VecMath.hpp" #include "VecMath.hpp"
#include <QVector> #include <QVector>
#include <QVariant> #include <QVariant>
#include <QDebug> #include <QDebug>
#include <QSharedPointer> #include <QSharedPointer>
#include <QVarLengthArray> #include <QVarLengthArray>
#include <QDataStream> #include <QDataStream>
skipping to change at line 286 skipping to change at line 284
//! 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) {//n.normali ze(); SphericalCap(const Vec3d& an, double ar) : n(an), d(ar) {//n.normali ze();
Q_ASSERT(d==0 || std::fabs(n.l engthSquared()-1.)<0.0000001);} Q_ASSERT(d==0 || std::fabs(n.lengthSquared()-1.)<0.0000001); }
// FIXME: GZ reports 2013-03-02: apparently the Q_ASSERT is here bec ause n should be normalized at this point, but // FIXME: GZ reports 2013-03-02: apparently the Q_ASSERT is here bec ause n should be normalized at this point, but
// for efficiency n.normalize() should not be called at this point. // 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. // However, when zooming in a bit in Hammer-Aitoff and Mercator proj ections, this Assertion fires.
// Atmosphere must be active // Atmosphere must be active
// It may have to do with DSO texture rendering. // It may have to do with DSO texture rendering.
// found at r5863. // found at r5863.
// n.normalize() prevents this for now, but may cost performance. // n.normalize() prevents this for now, but may cost performance.
// AARGH - activating n.normalize() inhibits mouse-identification/se lection of stars! // 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. // May be compiler dependent (seen on Win/MinGW), AW cannot confirm it on Linux.
 End of changes. 2 change blocks. 
3 lines changed or deleted 1 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/