Planet.hpp   Planet.hpp 
skipping to change at line 197 skipping to change at line 197
virtual double getSatellitesFov(const StelCore* core) const; virtual double getSatellitesFov(const StelCore* core) const;
virtual double getParentSatellitesFov(const StelCore* core) const; virtual double getParentSatellitesFov(const StelCore* core) const;
virtual float getVMagnitude(const StelCore* core) const; virtual float getVMagnitude(const StelCore* core) const;
virtual float getSelectPriority(const StelCore* core) const; virtual float getSelectPriority(const StelCore* core) const;
virtual Vec3f getInfoColor(void) const; virtual Vec3f getInfoColor(void) const;
virtual QString getType(void) const {return PLANET_TYPE;} virtual QString getType(void) const {return PLANET_TYPE;}
virtual QString getID(void) const { return englishName; } virtual QString getID(void) const { return englishName; }
virtual Vec3d getJ2000EquatorialPos(const StelCore *core) const; virtual Vec3d getJ2000EquatorialPos(const StelCore *core) const;
virtual QString getEnglishName(void) const; virtual QString getEnglishName(void) const;
virtual QString getNameI18n(void) const; virtual QString getNameI18n(void) const;
QString getCommonEnglishName(void) const {return englishName;}
QString getCommonNameI18n(void) const {return nameI18;}
//! Get angular semidiameter, degrees. If planet display is artifici ally enlarged (e.g. Moon upscale), value will also be increased. //! Get angular semidiameter, degrees. If planet display is artifici ally enlarged (e.g. Moon upscale), value will also be increased.
virtual double getAngularSize(const StelCore* core) const; virtual double getAngularSize(const StelCore* core) const;
virtual bool hasAtmosphere(void) {return atmosphere;} virtual bool hasAtmosphere(void) {return atmosphere;}
virtual bool hasHalo(void) {return halo;} virtual bool hasHalo(void) {return halo;}
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods of SolarSystem object // Methods of SolarSystem object
//! Translate planet name using the passed translator //! Translate planet name using the passed translator
virtual void translateName(const StelTranslator &trans); virtual void translateName(const StelTranslator &trans);
skipping to change at line 234 skipping to change at line 236
double getMeanSolarDay(void) const; double getMeanSolarDay(void) const;
//! Get albedo //! Get albedo
double getAlbedo(void) const { return albedo; } double getAlbedo(void) const { return albedo; }
const QString& getTextMapName() const {return texMapName;} const QString& getTextMapName() const {return texMapName;}
const QString getPlanetTypeString() const {return pTypeMap.value(pTy pe);} const QString getPlanetTypeString() const {return pTypeMap.value(pTy pe);}
PlanetType getPlanetType() const {return pType;} PlanetType getPlanetType() const {return pType;}
void setNativeName(QString planet) { nativeName = planet; } void setNativeName(QString planet) { nativeName = planet; }
//! set the IAU moon number (designation of the moon), if any.
void setIAUMoonNumber(QString designation);
//! Return the absolute magnitude (read from file ssystem.ini) //! Return the absolute magnitude (read from file ssystem.ini)
float getAbsoluteMagnitude() const {return absoluteMagnitude;} float getAbsoluteMagnitude() const {return absoluteMagnitude;}
//! Return the mean opposition magnitude, defined as V(1,0)+5log10(a (a-1)) //! Return the mean opposition magnitude, defined as V(1,0)+5log10(a (a-1))
//! A return value of 100 signals invalid result. //! A return value of 100 signals invalid result.
float getMeanOppositionMagnitude() const; float getMeanOppositionMagnitude() const;
// //
static ApparentMagnitudeAlgorithm getApparentMagnitudeAlgorithm() { return vMagAlgorithm; } static ApparentMagnitudeAlgorithm getApparentMagnitudeAlgorithm() { return vMagAlgorithm; }
static const QString getApparentMagnitudeAlgorithmString() { return vMagAlgorithmMap.value(vMagAlgorithm); } static const QString getApparentMagnitudeAlgorithmString() { return vMagAlgorithmMap.value(vMagAlgorithm); }
static void setApparentMagnitudeAlgorithm(QString algorithm); static void setApparentMagnitudeAlgorithm(QString algorithm);
static void setApparentMagnitudeAlgorithm(ApparentMagnitudeAlgorithm algorithm){ vMagAlgorithm=algorithm; } static void setApparentMagnitudeAlgorithm(ApparentMagnitudeAlgorithm algorithm){ vMagAlgorithm=algorithm; }
skipping to change at line 264 skipping to change at line 269
void setRotationElements(float _period, float _offset, double _epoch , void setRotationElements(float _period, float _offset, double _epoch ,
float _obliquity, float _ascendingNode, float _obliquity, float _ascendingNode,
float _precessionRate, double _siderealPeri od); float _precessionRate, double _siderealPeri od);
double getRotAscendingNode(void) const {return re.ascendingNode;} double getRotAscendingNode(void) const {return re.ascendingNode;}
// return angle between axis and normal of ecliptic plane (or, for a moon, equatorial/reference plane defined by parent). // return angle between axis and normal of ecliptic plane (or, for a moon, equatorial/reference plane defined by parent).
// TODO: decide if this is always angle between axis and J2000 eclip tic, or should be axis//current ecliptic! // TODO: decide if this is always angle between axis and J2000 eclip tic, or should be axis//current ecliptic!
double getRotObliquity(double JDE) const; double getRotObliquity(double JDE) const;
//! Compute the position in the parent Planet coordinate system //! Compute the position in the parent Planet coordinate system
void computePositionWithoutOrbits(const double dateJDE); void computePositionWithoutOrbits(const double dateJDE);
void computePosition(const double dateJDE); virtual void computePosition(const double dateJDE);
//! Compute the transformation matrix from the local Planet coordina te to the parent Planet coordinate. //! Compute the transformation matrix from the local Planet coordina te to the parent Planet coordinate.
//! This requires both flavours of JD in cases involving Earth. //! This requires both flavours of JD in cases involving Earth.
void computeTransMatrix(double JD, double JDE); void computeTransMatrix(double JD, double JDE);
//! Get the phase angle (rad) for an observer at pos obsPos in helio centric coordinates (in AU) //! Get the phase angle (rad) for an observer at pos obsPos in helio centric coordinates (in AU)
double getPhaseAngle(const Vec3d& obsPos) const; double getPhaseAngle(const Vec3d& obsPos) const;
//! Get the elongation angle (rad) for an observer at pos obsPos in heliocentric coordinates (in AU) //! Get the elongation angle (rad) for an observer at pos obsPos in heliocentric coordinates (in AU)
double getElongation(const Vec3d& obsPos) const; double getElongation(const Vec3d& obsPos) const;
//! Get the angular size of the spheroid of the planet (i.e. without the rings) //! Get the angular size of the spheroid of the planet (i.e. without the rings)
skipping to change at line 554 skipping to change at line 559
static StelTextureSP hintCircleTex; static StelTextureSP hintCircleTex;
static QMap<PlanetType, QString> pTypeMap; // Maps fast type to engl ish name. static QMap<PlanetType, QString> pTypeMap; // Maps fast type to engl ish name.
static QMap<ApparentMagnitudeAlgorithm, QString> vMagAlgorithmMap; static QMap<ApparentMagnitudeAlgorithm, QString> vMagAlgorithmMap;
static bool flagCustomGrsSettings; // Is enabled usage of custo m settings for calculation of position of Great Red Spot? static bool flagCustomGrsSettings; // Is enabled usage of custo m settings for calculation of position of Great Red Spot?
static double customGrsJD; // Initial JD for calculatio n of position of Great Red Spot static double customGrsJD; // Initial JD for calculatio n of position of Great Red Spot
static int customGrsLongitude; // Longitude of Great Red Sp ot (System II, degrees) static int customGrsLongitude; // Longitude of Great Red Sp ot (System II, degrees)
static double customGrsDrift; // Annual drift of Great Red Spot position (degrees) static double customGrsDrift; // Annual drift of Great Red Spot position (degrees)
private: private:
QString iauMoonNumber;
// Shader-related variables // Shader-related variables
struct PlanetShaderVars { struct PlanetShaderVars {
// Vertex attributes // Vertex attributes
int texCoord; int texCoord;
int unprojectedVertex; int unprojectedVertex;
int vertex; int vertex;
int normalIn; int normalIn;
// Common uniforms // Common uniforms
int projectionMatrix; int projectionMatrix;
skipping to change at line 640 skipping to change at line 647
#else #else
static unsigned int shadowFBO; static unsigned int shadowFBO;
#endif #endif
static unsigned int shadowTex; static unsigned int shadowTex;
static void initShader(); static void initShader();
static void deinitShader(); static void deinitShader();
static bool initFBO(); static bool initFBO();
static void deinitFBO(); static void deinitFBO();
static QOpenGLShaderProgram* createShader(const QString& name, Plane static QOpenGLShaderProgram* createShader(const QString& name,
tShaderVars& vars, const QByteArray& vSrc, const QByteArray& fSrc, const QB PlanetShaderVars& vars,
yteArray& prefix=QByteArray(), const QMap<QByteArray,int>& fixedAttributeLo const QByteArray& vSrc,
cations=QMap<QByteArray,int>()); const QByteArray& fSrc,
const QByteArray& prefix=Q
ByteArray(),
const QMap<QByteArray,int>
& fixedAttributeLocations=QMap<QByteArray,int>());
}; };
#endif // _PLANET_HPP_ #endif // _PLANET_HPP_
 End of changes. 5 change blocks. 
5 lines changed or deleted 16 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/