Merge lp:~georg-zotti/stellarium/gz-planet-type-enum into lp:stellarium

[gzotti]

Changed Planet's pType from string to enum. Give a slight speed gain in case of many (thousands) asteroids, and makes the code somewhat cleaner.

[Alexander Wolf (alexwolf)]

Need cleanup the code and extend the comments

review: Needs Fixing

[lp:~georg-zotti/stellarium/gz-planet-type-enum]

6973. By gzotti on 2014-08-31

pre-merge cleanup

[gzotti (georg-zotti)]

Don't know which level of commenting should be added? QMaps are used in many classes already, usually sparsely documented.

review: Needs Resubmitting

[Alexander Wolf (alexwolf)]

It's OK now.

About tStar, tPlanet, etc.... Maybe better use isStar, isPlanet, etc.?

review: Approve

[lp:~georg-zotti/stellarium/gz-planet-type-enum]

6974. By gzotti on 2014-08-31

renamed Planet::PlanetType enums

=== modified file 'src/core/modules/Comet.cpp'
--- src/core/modules/Comet.cpp	2014-08-17 09:28:31 +0000
+++ src/core/modules/Comet.cpp	2014-08-31 09:14:13 +0000
@@ -52,7 +52,7 @@
 		 OsculatingFunctType *osculatingFunc,
 		 bool acloseOrbit,
 		 bool hidden,
-		 const QString& pType,
+		 const QString& pTypeStr,
 		 float dustTailWidthFact, float dustTailLengthFact, float dustTailBrightnessFact)
 	: Planet (englishName,
 		  flagLighting,
@@ -69,7 +69,7 @@
 		  hidden,
 		  false, //No atmosphere
 		  true, //halo
-		  pType),
+		  pTypeStr),
 	  dustTailWidthFactor(dustTailWidthFact),
 	  dustTailLengthFactor(dustTailLengthFact),
 	  dustTailBrightnessFactor(dustTailBrightnessFact)
@@ -142,8 +142,7 @@
 
 	if (flags&ObjectType)
 	{
-		if (pType.length()>0)
-			oss << q_("Type: <b>%1</b>").arg(q_(pType)) << "<br />";
+		oss << q_("Type: <b>%1</b>").arg(q_(Planet::pTypeMap.value(pType))) << "<br />";
 	}
 
 	if (flags&Magnitude)
 
=== modified file 'src/core/modules/Comet.hpp'
--- src/core/modules/Comet.hpp	2014-08-17 09:28:31 +0000
+++ src/core/modules/Comet.hpp	2014-08-31 09:14:13 +0000
@@ -38,22 +38,22 @@
 public:
 	friend class SolarSystem;               // Solar System initializes static constants.
 	Comet(const QString& englishName,
-	       int flagLighting,
-	       double radius,
-	       double oblateness,
-	       Vec3f color,
-	       float albedo,
-	       const QString& texMapName,
-	       posFuncType _coordFunc,
-	       void* userDataPtr,
-	       OsculatingFunctType *osculatingFunc,
-	       bool closeOrbit,
-	       bool hidden,
-		   const QString &pType,
-		   float dustTailWidthFact=1.5f,
-		   float dustTailLengthFact=0.4f,
-		   float dustTailBrightnessFact=1.5f
-		  );
+	      int flagLighting,
+	      double radius,
+	      double oblateness,
+	      Vec3f color,
+	      float albedo,
+	      const QString& texMapName,
+	      posFuncType _coordFunc,
+	      void* userDataPtr,
+	      OsculatingFunctType *osculatingFunc,
+	      bool closeOrbit,
+	      bool hidden,
+	      const QString &pTypeStr,
+	      float dustTailWidthFact=1.5f,
+	      float dustTailLengthFact=0.4f,
+	      float dustTailBrightnessFact=1.5f
+	);
 
 	virtual ~Comet();
 
 
=== modified file 'src/core/modules/MinorPlanet.cpp'
--- src/core/modules/MinorPlanet.cpp	2014-08-16 17:40:45 +0000
+++ src/core/modules/MinorPlanet.cpp	2014-08-31 09:14:13 +0000
@@ -45,7 +45,7 @@
 			 OsculatingFunctType *osculatingFunc,
 			 bool acloseOrbit,
 			 bool hidden,
-			 const QString &pType)
+			 const QString &pTypeStr)
 	: Planet (englishName,
 		  flagLighting,
 		  radius,
@@ -61,7 +61,7 @@
 		  hidden,
 		  false, //No atmosphere
 		  true,  //Halo
-		  pType)
+		  pTypeStr)
 {
 	texMapName = atexMapName;
 	lastOrbitJD =0;
@@ -205,8 +205,7 @@
 
 	if (flags&ObjectType)
 	{
-		if (pType.length()>0)
-			oss << q_("Type: <b>%1</b>").arg(q_(pType)) << "<br />";
+		oss << q_("Type: <b>%1</b>").arg(q_(Planet::pTypeMap.value(pType))) << "<br />";
 	}
 
 	if (flags&Magnitude)
 
=== modified file 'src/core/modules/MinorPlanet.hpp'
--- src/core/modules/MinorPlanet.hpp	2014-08-16 17:40:45 +0000
+++ src/core/modules/MinorPlanet.hpp	2014-08-31 09:14:13 +0000
@@ -50,7 +50,7 @@
 		    OsculatingFunctType *osculatingFunc,
 		    bool closeOrbit,
 		    bool hidden,
-		    const QString &pType);
+		    const QString &pTypeStr);
 
 	~MinorPlanet();
 
 
=== modified file 'src/core/modules/Planet.cpp'
--- src/core/modules/Planet.cpp	2014-08-17 19:41:04 +0000
+++ src/core/modules/Planet.cpp	2014-08-31 09:14:13 +0000
@@ -71,7 +71,7 @@
 	       bool hidden,
 	       bool hasAtmosphere,
 	       bool hasHalo,
-	       const QString& pType)
+	       const QString& pTypeStr)
 	: englishName(englishName),
 	  flagLighting(flagLighting),
 	  radius(radius),
@@ -88,8 +88,7 @@
 	  parent(NULL),
 	  hidden(hidden),
 	  atmosphere(hasAtmosphere),
-	  halo(hasHalo),
-	  pType(pType)
+	  halo(hasHalo)
 {
 	texMapName = atexMapName;
 	normalMapName = anormalMapName;
@@ -100,6 +99,10 @@
 	deltaOrbitJD = 0;
 	distance = 0;
 
+	// Initialize pType with the key found in pTypeMap, or mark planet type as undefined.
+	// The latter condition should obviously never happen.
+	pType=pTypeMap.key(pTypeStr, Planet::isUNDEFINED);
+
 	eclipticPos=Vec3d(0.,0.,0.);
 	rotLocalToParent = Mat4d::identity();
 	texMap = StelApp::getInstance().getTextureManager().createTextureThread(StelFileMgr::getInstallationDir()+"/textures/"+texMapName, StelTexture::StelTextureParams(true, GL_LINEAR, GL_REPEAT));
@@ -113,6 +116,26 @@
 	flagLabels = true;
 }
 
+QMap<Planet::PlanetType, QString> Planet::pTypeMap;
+
+// called in SolarSystem::init() before first planet is created. Loads pTypeMap.
+void Planet::init()
+{
+	if (pTypeMap.count() > 0 )
+	{
+		// This should never happen. But it's uncritical.
+		qDebug() << "Planet::init(): Non-empty static map. This is a programming error, but we can fix that.";
+		pTypeMap.clear();
+	}
+	pTypeMap.insert(Planet::isStar,     "star");
+	pTypeMap.insert(Planet::isPlanet,   "planet");
+	pTypeMap.insert(Planet::isMoon,     "moon");
+	pTypeMap.insert(Planet::isAsteroid, "asteroid");
+	pTypeMap.insert(Planet::isPlutoid,  "plutoid");
+	pTypeMap.insert(Planet::isComet,    "comet");
+	pTypeMap.insert(Planet::isUNDEFINED, "UNDEFINED"); // something must be broken before we ever see this!
+}
+
 Planet::~Planet()
 {
 	if (rings)
@@ -142,8 +165,7 @@
 
 	if (flags&ObjectType)
 	{
-		if (pType.length()>0)
-			oss << q_("Type: <b>%1</b>").arg(q_(pType)) << "<br />";
+		oss << q_("Type: <b>%1</b>").arg(q_(Planet::pTypeMap.value(pType))) << "<br />";
 	}
 
 	if (flags&Magnitude)
@@ -574,7 +596,7 @@
 	if (englishName=="Venus" || englishName=="Uranus" || englishName=="Pluto")
 		sign = -1;
 
-	if (pType.contains("moon"))
+	if (pType==Planet::isMoon)
 	{
 		// duration of mean solar day on moon are same as synodic month on this moon
 		double a = parent->getSiderealPeriod()/sday;
@@ -646,7 +668,7 @@
 {
 	distance = (obsHelioPos-getHeliocentricEclipticPos()).length();
 	// GZ: improve fps by juggling updates for asteroids. They must be fast if close to observer, but can be slow if further away.
-	if (pType == "asteroid")
+	if (pType == Planet::isAsteroid)
 			deltaJD=distance*StelCore::JD_SECOND;
 	return distance;
 }
@@ -870,7 +892,8 @@
 	// GZ: Try to improve speed for minor planets: test if visible at all.
 	// For a full catalog of NEAs (11000 objects), with this and resetting deltaJD according to distance, rendering time went 4.5fps->12fps.	
 	// AW: Apply this rule to asteroids only
-	if (((getVMagnitude(core)-1.0f) > core->getSkyDrawer()->getLimitMagnitude()) && pType=="asteroid")
+	// Note that taking away the asteroids at this stage breaks dim-asteroid occultation of stars!
+	if (((getVMagnitude(core)-1.0f) > core->getSkyDrawer()->getLimitMagnitude()) && pType==Planet::isAsteroid)
 	{
 		return;
 	}
 
=== added file 'src/core/modules/Planet.hpp'
--- src/core/modules/Planet.hpp	1970-01-01 00:00:00 +0000
+++ src/core/modules/Planet.hpp	2014-08-31 09:14:13 +0000
@@ -0,0 +1,370 @@
+/*
+ * Stellarium
+ * Copyright (C) 2002 Fabien Chereau
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
+ */
+
+#ifndef _PLANET_HPP_
+#define _PLANET_HPP_
+
+#include "StelObject.hpp"
+#include "StelProjector.hpp"
+#include "VecMath.hpp"
+#include "StelFader.hpp"
+#include "StelTextureTypes.hpp"
+#include "StelProjectorType.hpp"
+
+#include <QString>
+
+// The callback type for the external position computation function
+// The last variable is the userData pointer.
+typedef void (*posFuncType)(double, double*, void*);
+
+typedef void (OsculatingFunctType)(double jd0,double jd,double xyz[3]);
+
+// epoch J2000: 12 UT on 1 Jan 2000
+#define J2000 2451545.0
+#define ORBIT_SEGMENTS 360
+
+class StelFont;
+class StelPainter;
+class StelTranslator;
+class QOpenGLShaderProgram;
+
+// Class used to store orbital elements
+class RotationElements
+{
+public:
+	RotationElements(void) : period(1.), offset(0.), epoch(J2000), obliquity(0.), ascendingNode(0.), precessionRate(0.), siderealPeriod(0.) {}
+	float period;          // rotation period
+	float offset;          // rotation at epoch
+	double epoch;
+	float obliquity;       // tilt of rotation axis w.r.t. ecliptic
+	float ascendingNode;   // long. of ascending node of equator on the ecliptic
+	float precessionRate;  // rate of precession of rotation axis in rads/day
+	double siderealPeriod; // sidereal period (Planet year in earth days)
+};
+
+// Class to manage rings for planets like saturn
+class Ring
+{
+public:
+	Ring(float radiusMin, float radiusMax,const QString &texname);
+	double getSize(void) const {return radiusMax;}
+	const float radiusMin;
+	const float radiusMax;
+	StelTextureSP tex;
+};
+
+
+class Planet : public StelObject
+{
+public:
+	friend class SolarSystem;
+
+	Q_ENUMS(PlanetType)
+	//! numeric typecodes for the type descriptions in ssystem.ini
+	// GZ: Until 0.13 QStrings were used for types.
+	// GZ: Enums are slightly faster than string comparisons in time-critical comparisons.
+	// GZ: If other types are introduced, add here and the string in init().
+	enum PlanetType
+	{
+		isStar,                   // ssystem.ini: type="star"
+		isPlanet,                 // ssystem.ini: type="planet"
+		isMoon,                   // ssystem.ini: type="moon"
+		isAsteroid,               // ssystem.ini: type="asteroid"
+		isPlutoid,                // ssystem.ini: type="plutoid"
+		isComet,                  // ssystem.ini: type="comet"
+		isUNDEFINED               // ssystem.ini: type=<anything else>
+	};
+
+	Planet(const QString& englishName,
+	       int flagLighting,
+	       double radius,
+	       double oblateness,
+	       Vec3f color,
+	       float albedo,
+	       const QString& texMapName,
+	       const QString& normalMapName,
+	       posFuncType _coordFunc,
+	       void* userDataPtr,
+	       OsculatingFunctType *osculatingFunc,
+	       bool closeOrbit,
+	       bool hidden,
+	       bool hasAtmosphere,
+	       bool hasHalo,
+	       const QString &pTypeStr);
+
+	virtual ~Planet();
+
+	//! Initializes static vars. Must be called before creating first planet.
+	// Currently ensured by SolarSystem::init()
+	static void init();
+
+	///////////////////////////////////////////////////////////////////////////
+	// Methods inherited from StelObject
+	//! Get a string with data about the Planet.
+	//! Planets support the following InfoStringGroup flags:
+	//! - Name
+	//! - Magnitude
+	//! - RaDec
+	//! - AltAzi
+	//! - Distance
+	//! - Size
+	//! - PlainText
+	//! - Extra: Heliocentric Ecliptical Coordinates & Observer-planetocentric Ecliptical Coordinates, Phase, illumination, phase angle & elongation from the Sun
+	//! @param core the StelCore object
+	//! @param flags a set of InfoStringGroup items to include in the return value.
+	//! @return a QString containing an HMTL encoded description of the Planet.
+	virtual QString getInfoString(const StelCore *core, const InfoStringGroup& flags) const;
+	virtual double getCloseViewFov(const StelCore* core) const;
+	virtual double getSatellitesFov(const StelCore* core) const;
+	virtual double getParentSatellitesFov(const StelCore* core) const;
+	virtual float getVMagnitude(const StelCore* core) const;
+	virtual float getSelectPriority(const StelCore* core) const;
+	virtual Vec3f getInfoColor(void) const;
+	virtual QString getType(void) const {return "Planet";}
+	virtual Vec3d getJ2000EquatorialPos(const StelCore *core) const;
+	virtual QString getEnglishName(void) const {return englishName;}
+	virtual QString getNameI18n(void) const {return nameI18;}
+	virtual double getAngularSize(const StelCore* core) const;
+	virtual bool hasAtmosphere(void) {return atmosphere;}
+	virtual bool hasHalo(void) {return halo;}
+
+	///////////////////////////////////////////////////////////////////////////
+	// Methods of SolarSystem object
+	//! Translate planet name using the passed translator
+	virtual void translateName(const StelTranslator &trans);
+
+	// Draw the Planet
+	// GZ Made that virtual to allow comets having their own draw().
+	virtual void draw(StelCore* core, float maxMagLabels, const QFont& planetNameFont);
+
+	///////////////////////////////////////////////////////////////////////////
+	// Methods specific to Planet
+	//! Get the radius of the planet in AU.
+	//! @return the radius of the planet in astronomical units.
+	double getRadius(void) const {return radius;}
+	//! Get duration of sidereal day
+	double getSiderealDay(void) const {return re.period;}
+	//! Get duration of sidereal year
+	// GZ: made that virtual for Comets.
+	virtual double getSiderealPeriod(void) const { return re.siderealPeriod; }
+	//! Get duration of mean solar day
+	double getMeanSolarDay(void) const;
+
+	const QString& getTextMapName() const {return texMapName;}	
+	//const QString getPlanetType() const {return pTypeStr;}
+	const PlanetType getPlanetType() const {return pType;}
+
+	// Compute the z rotation to use from equatorial to geographic coordinates
+	double getSiderealTime(double jd) const;
+	Mat4d getRotEquatorialToVsop87(void) const;
+	void setRotEquatorialToVsop87(const Mat4d &m);
+
+	const RotationElements &getRotationElements(void) const {return re;}
+
+	// Compute the position in the parent Planet coordinate system
+	void computePositionWithoutOrbits(const double dateJD);
+	virtual void computePosition(const double dateJD);// GZ: gets overridden in Comet!
+
+	// Compute the transformation matrix from the local Planet coordinate to the parent Planet coordinate
+	void computeTransMatrix(double date);
+
+	// Get the phase angle (rad) for an observer at pos obsPos in heliocentric coordinates (in AU)
+	double getPhaseAngle(const Vec3d& obsPos) const;
+	// Get the elongation angle (rad) for an observer at pos obsPos in heliocentric coordinates (in AU)
+	double getElongation(const Vec3d& obsPos) const;
+	// Get the angular size of the spheroid of the planet (i.e. without the rings)
+	double getSpheroidAngularSize(const StelCore* core) const;
+	// Get the planet phase for an observer at pos obsPos in heliocentric coordinates (in AU)
+	float getPhase(const Vec3d& obsPos) const;
+
+	// Set the orbital elements
+	void setRotationElements(float _period, float _offset, double _epoch,
+				 float _obliquity, float _ascendingNode,
+				 float _precessionRate, double _siderealPeriod);
+	double getRotAscendingnode(void) const {return re.ascendingNode;}
+	double getRotObliquity(double JDay) const;
+
+	//! Get the Planet position in the parent Planet ecliptic coordinate in AU
+	Vec3d getEclipticPos() const;
+
+	// Return the heliocentric ecliptical position
+	Vec3d getHeliocentricEclipticPos() const;
+
+	// Return the heliocentric transformation for local coordinate
+	Vec3d getHeliocentricPos(Vec3d) const;
+	void setHeliocentricEclipticPos(const Vec3d &pos);
+
+	// Compute the distance to the given position in heliocentric coordinate (in AU)
+	double computeDistance(const Vec3d& obsHelioPos);
+	double getDistance(void) const {return distance;}
+
+	void setRings(Ring* r) {rings = r;}
+
+	void setSphereScale(float s) {sphereScale = s;}
+	float getSphereScale(void) const {return sphereScale;}
+
+	const QSharedPointer<Planet> getParent(void) const {return parent;}
+
+	static void setLabelColor(const Vec3f& lc) {labelColor = lc;}
+	static const Vec3f& getLabelColor(void) {return labelColor;}
+
+	// update displayed elements. @param deltaTime: ms (?)
+	void update(int deltaTime);
+
+	void setFlagHints(bool b){hintFader = b;}
+	bool getFlagHints(void) const {return hintFader;}
+
+	void setFlagLabels(bool b){flagLabels = b;}
+	bool getFlagLabels(void) const {return flagLabels;}
+
+	///////////////////////////////////////////////////////////////////////////
+	// DEPRECATED
+	///// Orbit related code
+	// Should move to an OrbitPath class which works on a SolarSystemObject, not a Planet
+	void setFlagOrbits(bool b){orbitFader = b;}
+	bool getFlagOrbits(void) const {return orbitFader;}
+	LinearFader orbitFader;
+	// draw orbital path of Planet
+	void drawOrbit(const StelCore*);
+	Vec3d orbit[ORBIT_SEGMENTS+1];   // store heliocentric coordinates for drawing the orbit
+	Vec3d orbitP[ORBIT_SEGMENTS+1];  // store local coordinate for orbit
+	double lastOrbitJD;
+	double deltaJD;                  // time difference between positional updates.
+	double deltaOrbitJD;
+	bool orbitCached;                // whether orbit calculations are cached for drawing orbit yet
+	bool closeOrbit;                 // whether to connect the beginning of the orbit line to
+					 // the end: good for elliptical orbits, bad for parabolic
+					 // and hyperbolic orbits
+
+	static Vec3f orbitColor;
+	static void setOrbitColor(const Vec3f& oc) {orbitColor = oc;}
+	static const Vec3f& getOrbitColor() {return orbitColor;}
+
+	//! Return the list of planets which project some shadow on this planet
+	QVector<const Planet*> getCandidatesForShadow() const;
+	
+protected:
+	static StelTextureSP texEarthShadow;     // for lunar eclipses
+
+	void computeModelMatrix(Mat4d &result) const;
+	
+	// Return the information string "ready to print" :)
+	QString getSkyLabel(const StelCore* core) const;
+
+	// Draw the 3d model. Call the proper functions if there are rings etc..
+	void draw3dModel(StelCore* core, StelProjector::ModelViewTranformP transfo, float screenSz, bool drawOnlyRing=false);
+
+	// Draw the 3D sphere
+	void drawSphere(StelPainter* painter, float screenSz, bool drawOnlyRing=false);
+
+	// Draw the circle and name of the Planet
+	void drawHints(const StelCore* core, const QFont& planetNameFont);
+
+	QString englishName;             // english planet name
+	QString nameI18;                 // International translated name
+	QString texMapName;              // Texture file path	
+	QString normalMapName;              // Texture file path
+	int flagLighting;                // Set whether light computation has to be proceed
+	RotationElements re;             // Rotation param
+	double radius;                   // Planet radius in AU
+	double oneMinusOblateness;       // (polar radius)/(equatorial radius)
+	Vec3d eclipticPos;               // Position in AU in the rectangular ecliptic coordinate system
+					 // centered on the parent Planet
+	Vec3d screenPos;                 // Used to store temporarily the 2D position on screen
+	Vec3d previousScreenPos;         // The position of this planet in the previous frame.
+	Vec3f color;                     // exclusively used for drawing the planet halo
+
+	float albedo;                    // Planet albedo. Used for magnitude computation (but formula dubious!)
+	Mat4d rotLocalToParent;
+	float axisRotation;              // Rotation angle of the Planet on it's axis
+	StelTextureSP texMap;            // Planet map texture
+	StelTextureSP normalMap;         // Planet normal map texture
+
+	Ring* rings;                     // Planet rings
+	double distance;                 // Temporary variable used to store the distance to a given point
+					 // it is used for sorting while drawing
+	float sphereScale;               // Artificial scaling for better viewing
+	double lastJD;                   // caches JD of last positional computation
+	// The callback for the calculation of the equatorial rect heliocentric position at time JD.
+	posFuncType coordFunc;
+	void* userDataPtr;
+
+	OsculatingFunctType *const osculatingFunc;
+	QSharedPointer<Planet> parent;           // Planet parent i.e. sun for earth
+	QList<QSharedPointer<Planet> > satellites;      // satellites of the Planet
+	LinearFader hintFader;
+	LinearFader labelsFader;         // Store the current state of the label for this planet
+	bool flagLabels;                 // Define whether labels should be displayed
+	bool hidden;                     // useful for fake planets used as observation positions - not drawn or labeled
+	bool atmosphere;                 // Does the planet have an atmosphere?
+	bool halo;                       // Does the planet have a halo?
+	// QString pTypeStr;			 // Type of body, old version just had a string here.
+	PlanetType pType;                // GZ this is now a proper type...
+
+	static Vec3f labelColor;
+	static StelTextureSP hintCircleTex;
+	static QMap<PlanetType, QString> pTypeMap; // GZ: maps fast type to english name.
+	
+	// Shader-related variables
+	struct PlanetShaderVars {
+		int projectionMatrix;
+		int texCoord;
+		int unprojectedVertex;
+		int vertex;
+		int texture;
+		int lightDirection;
+		int eyeDirection;
+		int diffuseLight;
+		int ambientLight;
+		int shadowCount;
+		int shadowData;
+		int sunInfo;
+		
+		void initLocations(QOpenGLShaderProgram*);
+	};
+	static PlanetShaderVars planetShaderVars;
+	static QOpenGLShaderProgram* planetShaderProgram;
+
+	// Shader-related variables
+	struct RingPlanetShaderVars : public PlanetShaderVars {
+		// Rings-specific variables
+		int isRing;
+		int ring;
+		int outerRadius;
+		int innerRadius;
+		int ringS;
+	};
+	static RingPlanetShaderVars ringPlanetShaderVars;
+	static QOpenGLShaderProgram* ringPlanetShaderProgram;
+	
+	struct MoonShaderVars : public PlanetShaderVars {
+		// Moon-specific variables
+		int earthShadow;
+		int normalMap;
+	};
+	static MoonShaderVars moonShaderVars;
+	static QOpenGLShaderProgram* moonShaderProgram;
+	
+	static void initShader();
+	static void deinitShader();
+
+};
+
+#endif // _PLANET_HPP_
+
 
=== removed file 'src/core/modules/Planet.hpp'
--- src/core/modules/Planet.hpp	2014-08-02 17:34:13 +0000
+++ src/core/modules/Planet.hpp	1970-01-01 00:00:00 +0000
@@ -1,346 +0,0 @@
-/*
- * Stellarium
- * Copyright (C) 2002 Fabien Chereau
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
- */
-
-#ifndef _PLANET_HPP_
-#define _PLANET_HPP_
-
-#include "StelObject.hpp"
-#include "StelProjector.hpp"
-#include "VecMath.hpp"
-#include "StelFader.hpp"
-#include "StelTextureTypes.hpp"
-#include "StelProjectorType.hpp"
-
-#include <QString>
-
-// The callback type for the external position computation function
-// The last variable is the userData pointer.
-typedef void (*posFuncType)(double, double*, void*);
-
-typedef void (OsculatingFunctType)(double jd0,double jd,double xyz[3]);
-
-// epoch J2000: 12 UT on 1 Jan 2000
-#define J2000 2451545.0
-#define ORBIT_SEGMENTS 360
-
-class StelFont;
-class StelPainter;
-class StelTranslator;
-class QOpenGLShaderProgram;
-
-// Class used to store orbital elements
-class RotationElements
-{
-public:
-	RotationElements(void) : period(1.), offset(0.), epoch(J2000), obliquity(0.), ascendingNode(0.), precessionRate(0.), siderealPeriod(0.) {}
-	float period;          // rotation period
-	float offset;          // rotation at epoch
-	double epoch;
-	float obliquity;       // tilt of rotation axis w.r.t. ecliptic
-	float ascendingNode;   // long. of ascending node of equator on the ecliptic
-	float precessionRate;  // rate of precession of rotation axis in rads/day
-	double siderealPeriod; // sidereal period (Planet year in earth days)
-};
-
-// Class to manage rings for planets like saturn
-class Ring
-{
-public:
-	Ring(float radiusMin, float radiusMax,const QString &texname);
-	double getSize(void) const {return radiusMax;}
-	const float radiusMin;
-	const float radiusMax;
-	StelTextureSP tex;
-};
-
-
-class Planet : public StelObject
-{
-public:
-	friend class SolarSystem;
-	Planet(const QString& englishName,
-	       int flagLighting,
-	       double radius,
-	       double oblateness,
-	       Vec3f color,
-	       float albedo,
-	       const QString& texMapName,
-		   const QString& normalMapName,
-	       posFuncType _coordFunc,
-	       void* userDataPtr,
-	       OsculatingFunctType *osculatingFunc,
-	       bool closeOrbit,
-	       bool hidden,
-	       bool hasAtmosphere,
-	       bool hasHalo,
-	       const QString &pType);
-
-	virtual ~Planet();
-
-	///////////////////////////////////////////////////////////////////////////
-	// Methods inherited from StelObject
-	//! Get a string with data about the Planet.
-	//! Planets support the following InfoStringGroup flags:
-	//! - Name
-	//! - Magnitude
-	//! - RaDec
-	//! - AltAzi
-	//! - Distance
-	//! - Size
-	//! - PlainText
-	//! - Extra: Heliocentric Ecliptical Coordinates & Observer-planetocentric Ecliptical Coordinates, Phase, illumination, phase angle & elongation from the Sun
-	//! @param core the StelCore object
-	//! @param flags a set of InfoStringGroup items to include in the return value.
-	//! @return a QString containing an HMTL encoded description of the Planet.
-	virtual QString getInfoString(const StelCore *core, const InfoStringGroup& flags) const;
-	virtual double getCloseViewFov(const StelCore* core) const;
-	virtual double getSatellitesFov(const StelCore* core) const;
-	virtual double getParentSatellitesFov(const StelCore* core) const;
-	virtual float getVMagnitude(const StelCore* core) const;
-	virtual float getSelectPriority(const StelCore* core) const;
-	virtual Vec3f getInfoColor(void) const;
-	virtual QString getType(void) const {return "Planet";}
-	virtual Vec3d getJ2000EquatorialPos(const StelCore *core) const;
-	virtual QString getEnglishName(void) const {return englishName;}
-	virtual QString getNameI18n(void) const {return nameI18;}
-	virtual double getAngularSize(const StelCore* core) const;
-	virtual bool hasAtmosphere(void) {return atmosphere;}
-	virtual bool hasHalo(void) {return halo;}
-
-	///////////////////////////////////////////////////////////////////////////
-	// Methods of SolarSystem object
-	//! Translate planet name using the passed translator
-	virtual void translateName(const StelTranslator &trans);
-
-	// Draw the Planet
-	// GZ Made that virtual to allow comets having their own draw().
-	virtual void draw(StelCore* core, float maxMagLabels, const QFont& planetNameFont);
-
-	///////////////////////////////////////////////////////////////////////////
-	// Methods specific to Planet
-	//! Get the radius of the planet in AU.
-	//! @return the radius of the planet in astronomical units.
-	double getRadius(void) const {return radius;}
-	//! Get duration of sidereal day
-	double getSiderealDay(void) const {return re.period;}
-	//! Get duration of sidereal year
-	// GZ: made that virtual for Comets.
-	virtual double getSiderealPeriod(void) const { return re.siderealPeriod; }
-	//! Get duration of mean solar day
-	double getMeanSolarDay(void) const;
-
-	const QString& getTextMapName() const {return texMapName;}	
-	const QString getPlanetType() const {return pType;}
-
-	// Compute the z rotation to use from equatorial to geographic coordinates
-	double getSiderealTime(double jd) const;
-	Mat4d getRotEquatorialToVsop87(void) const;
-	void setRotEquatorialToVsop87(const Mat4d &m);
-
-	const RotationElements &getRotationElements(void) const {return re;}
-
-	// Compute the position in the parent Planet coordinate system
-	void computePositionWithoutOrbits(const double dateJD);
-	virtual void computePosition(const double dateJD);// GZ: gets overridden in Comet!
-
-	// Compute the transformation matrix from the local Planet coordinate to the parent Planet coordinate
-	void computeTransMatrix(double date);
-
-	// Get the phase angle (rad) for an observer at pos obsPos in heliocentric coordinates (in AU)
-	double getPhaseAngle(const Vec3d& obsPos) const;
-	// Get the elongation angle (rad) for an observer at pos obsPos in heliocentric coordinates (in AU)
-	double getElongation(const Vec3d& obsPos) const;
-	// Get the angular size of the spheroid of the planet (i.e. without the rings)
-	double getSpheroidAngularSize(const StelCore* core) const;
-	// Get the planet phase for an observer at pos obsPos in heliocentric coordinates (in AU)
-	float getPhase(const Vec3d& obsPos) const;
-
-	// Set the orbital elements
-	void setRotationElements(float _period, float _offset, double _epoch,
-				 float _obliquity, float _ascendingNode,
-				 float _precessionRate, double _siderealPeriod);
-	double getRotAscendingnode(void) const {return re.ascendingNode;}
-	double getRotObliquity(double JDay) const;
-
-	//! Get the Planet position in the parent Planet ecliptic coordinate in AU
-	Vec3d getEclipticPos() const;
-
-	// Return the heliocentric ecliptical position
-	Vec3d getHeliocentricEclipticPos() const;
-
-	// Return the heliocentric transformation for local coordinate
-	Vec3d getHeliocentricPos(Vec3d) const;
-	void setHeliocentricEclipticPos(const Vec3d &pos);
-
-	// Compute the distance to the given position in heliocentric coordinate (in AU)
-	double computeDistance(const Vec3d& obsHelioPos);
-	double getDistance(void) const {return distance;}
-
-	void setRings(Ring* r) {rings = r;}
-
-	void setSphereScale(float s) {sphereScale = s;}
-	float getSphereScale(void) const {return sphereScale;}
-
-	const QSharedPointer<Planet> getParent(void) const {return parent;}
-
-	static void setLabelColor(const Vec3f& lc) {labelColor = lc;}
-	static const Vec3f& getLabelColor(void) {return labelColor;}
-
-	// update displayed elements. @param deltaTime: ms (?)
-	void update(int deltaTime);
-
-	void setFlagHints(bool b){hintFader = b;}
-	bool getFlagHints(void) const {return hintFader;}
-
-	void setFlagLabels(bool b){flagLabels = b;}
-	bool getFlagLabels(void) const {return flagLabels;}
-
-	///////////////////////////////////////////////////////////////////////////
-	// DEPRECATED
-	///// Orbit related code
-	// Should move to an OrbitPath class which works on a SolarSystemObject, not a Planet
-	void setFlagOrbits(bool b){orbitFader = b;}
-	bool getFlagOrbits(void) const {return orbitFader;}
-	LinearFader orbitFader;
-	// draw orbital path of Planet
-	void drawOrbit(const StelCore*);
-	Vec3d orbit[ORBIT_SEGMENTS+1];   // store heliocentric coordinates for drawing the orbit
-	Vec3d orbitP[ORBIT_SEGMENTS+1];  // store local coordinate for orbit
-	double lastOrbitJD;
-	double deltaJD;                  // time difference between positional updates.
-	double deltaOrbitJD;
-	bool orbitCached;                // whether orbit calculations are cached for drawing orbit yet
-	bool closeOrbit;                 // whether to connect the beginning of the orbit line to
-					 // the end: good for elliptical orbits, bad for parabolic
-					 // and hyperbolic orbits
-
-	static Vec3f orbitColor;
-	static void setOrbitColor(const Vec3f& oc) {orbitColor = oc;}
-	static const Vec3f& getOrbitColor() {return orbitColor;}
-
-	//! Return the list of planets which project some shadow on this planet
-	QVector<const Planet*> getCandidatesForShadow() const;
-	
-protected:
-	static StelTextureSP texEarthShadow;     // for lunar eclipses
-
-	void computeModelMatrix(Mat4d &result) const;
-	
-	// Return the information string "ready to print" :)
-	QString getSkyLabel(const StelCore* core) const;
-
-	// Draw the 3d model. Call the proper functions if there are rings etc..
-	void draw3dModel(StelCore* core, StelProjector::ModelViewTranformP transfo, float screenSz, bool drawOnlyRing=false);
-
-	// Draw the 3D sphere
-	void drawSphere(StelPainter* painter, float screenSz, bool drawOnlyRing=false);
-
-	// Draw the circle and name of the Planet
-	void drawHints(const StelCore* core, const QFont& planetNameFont);
-
-	QString englishName;             // english planet name
-	QString nameI18;                 // International translated name
-	QString texMapName;              // Texture file path	
-	QString normalMapName;              // Texture file path
-	int flagLighting;                // Set whether light computation has to be proceed
-	RotationElements re;             // Rotation param
-	double radius;                   // Planet radius in AU
-	double oneMinusOblateness;       // (polar radius)/(equatorial radius)
-	Vec3d eclipticPos;               // Position in AU in the rectangular ecliptic coordinate system
-					 // centered on the parent Planet
-	Vec3d screenPos;                 // Used to store temporarily the 2D position on screen
-	Vec3d previousScreenPos;         // The position of this planet in the previous frame.
-	Vec3f color;                     // exclusively used for drawing the planet halo
-
-	float albedo;                    // Planet albedo. Used for magnitude computation (but formula dubious!)
-	Mat4d rotLocalToParent;
-	float axisRotation;              // Rotation angle of the Planet on it's axis
-	StelTextureSP texMap;            // Planet map texture
-	StelTextureSP normalMap;         // Planet normal map texture
-
-	Ring* rings;                     // Planet rings
-	double distance;                 // Temporary variable used to store the distance to a given point
-					 // it is used for sorting while drawing
-	float sphereScale;               // Artificial scaling for better viewing
-	double lastJD;                   // caches JD of last positional computation
-	// The callback for the calculation of the equatorial rect heliocentric position at time JD.
-	posFuncType coordFunc;
-	void* userDataPtr;
-
-	OsculatingFunctType *const osculatingFunc;
-	QSharedPointer<Planet> parent;           // Planet parent i.e. sun for earth
-	QList<QSharedPointer<Planet> > satellites;      // satellites of the Planet
-	LinearFader hintFader;
-	LinearFader labelsFader;         // Store the current state of the label for this planet
-	bool flagLabels;                 // Define whether labels should be displayed
-	bool hidden;                     // useful for fake planets used as observation positions - not drawn or labeled
-	bool atmosphere;                 // Does the planet have an atmosphere?
-	bool halo;                       // Does the planet have a halo?
-	QString pType;			 // Type of body
-
-	static Vec3f labelColor;
-	static StelTextureSP hintCircleTex;
-	
-	// Shader-related variables
-	struct PlanetShaderVars {
-		int projectionMatrix;
-		int texCoord;
-		int unprojectedVertex;
-		int vertex;
-		int texture;
-		int lightDirection;
-		int eyeDirection;
-		int diffuseLight;
-		int ambientLight;
-		int shadowCount;
-		int shadowData;
-		int sunInfo;
-		
-		void initLocations(QOpenGLShaderProgram*);
-	};
-	static PlanetShaderVars planetShaderVars;
-	static QOpenGLShaderProgram* planetShaderProgram;
-
-	// Shader-related variables
-	struct RingPlanetShaderVars : public PlanetShaderVars {
-		// Rings-specific variables
-		int isRing;
-		int ring;
-		int outerRadius;
-		int innerRadius;
-		int ringS;
-	};
-	static RingPlanetShaderVars ringPlanetShaderVars;
-	static QOpenGLShaderProgram* ringPlanetShaderProgram;
-	
-	struct MoonShaderVars : public PlanetShaderVars {
-		// Moon-specific variables
-		int earthShadow;
-		int normalMap;
-	};
-	static MoonShaderVars moonShaderVars;
-	static QOpenGLShaderProgram* moonShaderProgram;
-	
-	static void initShader();
-	static void deinitShader();
-
-};
-
-#endif // _PLANET_HPP_
-
 
=== modified file 'src/core/modules/SolarSystem.cpp'
--- src/core/modules/SolarSystem.cpp	2014-08-30 16:58:25 +0000
+++ src/core/modules/SolarSystem.cpp	2014-08-31 09:14:13 +0000
@@ -119,6 +119,7 @@
 	QSettings* conf = StelApp::getInstance().getSettings();
 	Q_ASSERT(conf);
 
+	Planet::init();
 	loadPlanets();	// Load planets data
 
 	// Compute position and matrix of sun and all the satellites (ie planets)
@@ -1069,7 +1070,7 @@
 QString SolarSystem::getPlanetType(QString planetName) const
 {
 	PlanetP p = searchByEnglishName(planetName);
-	return p->getPlanetType();
+	return Planet::pTypeMap.value(p->getPlanetType());
 }
 
 double SolarSystem::getDistanceToPlanet(QString planetName) const
@@ -1382,7 +1383,7 @@
 	{
 		foreach(const PlanetP& p, systemPlanets)
 		{
-			if (p->getPlanetType()==objType)
+			if (Planet::pTypeMap.value(p->getPlanetType())==objType)
 				result << p->getEnglishName();
 		}
 	}
@@ -1390,7 +1391,7 @@
 	{
 		foreach(const PlanetP& p, systemPlanets)
 		{
-			if (p->getPlanetType()==objType)
+			if (Planet::pTypeMap.value(p->getPlanetType())==objType)
 				result << p->getNameI18n();
 		}
 	}