Nebula.hpp   Nebula.hpp 
skipping to change at line 77 skipping to change at line 77
//! Get the printable nebula Type. //! Get the printable nebula Type.
//! @return the nebula type code. //! @return the nebula type code.
QString getTypeString() const; QString getTypeString() const;
private: private:
friend struct DrawNebulaFuncObject; friend struct DrawNebulaFuncObject;
//! Textures used to draw nebula hints. //! Textures used to draw nebula hints.
struct NebulaHintTextures struct NebulaHintTextures
{ {
//! The symbolic circle texture. //! The symbolic circle texture. (default)
class StelTextureNew* texCircle; class StelTextureNew* texCircle;
//! The open cluster marker texture. //! The symbolic galaxy texture. (Type 0)
class StelTextureNew* texGalaxy;
//! The open cluster marker texture. (Type 1)
class StelTextureNew* texOpenCluster; class StelTextureNew* texOpenCluster;
//! The globular cluster marker texture. //! The globular cluster marker texture. (Type 2)
class StelTextureNew* texGlobularCluster; class StelTextureNew* texGlobularCluster;
//! The planetary nebula marker texture. //! The diffuse nebula marker texture. (Type 3)
class StelTextureNew* texDiffuseNebula;
//! The planetary nebula marker texture. (type 4)
class StelTextureNew* texPlanetaryNebula; class StelTextureNew* texPlanetaryNebula;
//! The "Open cluster with Nebulosity" nebula marker texture
. (Type 7)
class StelTextureNew* texOpenClusterWithNebulosity;
//! Are we initialized yet? //! Are we initialized yet?
bool initialized; bool initialized;
//! Default constructor - construct uninitialized NebulaHint Textures. //! Default constructor - construct uninitialized NebulaHint Textures.
NebulaHintTextures(): initialized(false){} NebulaHintTextures(): initialized(false){}
//! Destructor - frees resources if initialized. //! Destructor - frees resources if initialized.
~NebulaHintTextures(); ~NebulaHintTextures();
//! Lazily initialize the data, using given renderer to crea te textures/shader. //! Lazily initialize the data, using given renderer to crea te textures/shader.
void lazyInit(class StelRenderer* renderer); void lazyInit(class StelRenderer* renderer);
}; };
//! @enum NebulaType Nebula types //! @enum NebulaType Nebula types
enum NebulaType enum NebulaType
{ {
NebGx=0, //!< Galaxy NebGx=0, //!< Galaxy
NebOc=1, //!< Open star cluster NebOc=1, //!< Open star cluster
NebGc=2, //!< Globular star cluster, usually in the Milk y Way Galaxy NebGc=2, //!< Globular star cluster, usually in the Milk y Way Galaxy
NebN=3, //!< Bright emission or reflection nebula NebN=3, //!< Bright emission or reflection nebula
NebPn=4, //!< Planetary nebula NebPn=4, //!< Planetary nebula
NebDn=5, //!< ??? NebDn=5, //!< ??? Dark Nebula? Does not exist in cu
NebIg=6, //!< ??? rrent catalog
NebIg=6, //!< ??? Irregular Galaxy? Does not exist in cu
rrent catalog
NebCn=7, //!< Cluster associated with nebulosity NebCn=7, //!< Cluster associated with nebulosity
NebUnknown=8 //!< Unknown type NebUnknown=8 //!< Unknown type, catalog errors, "Unidentifie d Southern Objects" etc.
}; };
//! Translate nebula name using the passed translator //! Translate nebula name using the passed translator
void translateName(StelTranslator& trans) {nameI18 = trans.qtranslat e(englishName);} void translateName(StelTranslator& trans) {nameI18 = trans.qtranslat e(englishName);}
bool readNGC(char *record); bool readNGC(char *record);
void readNGC(QDataStream& in); void readNGC(QDataStream& in);
void drawHints(StelRenderer* renderer, float maxMagHints, NebulaHint Textures& hintTextures); void drawHints(StelRenderer* renderer, float maxMagHints, NebulaHint Textures& hintTextures);
void drawLabel(StelRenderer* renderer, StelProjectorP projector, flo at maxMagLabel); void drawLabel(StelRenderer* renderer, StelProjectorP projector, flo at maxMagLabel);
unsigned int M_nb; // Messier Catalog number unsigned int M_nb; // Messier Catalog number
unsigned int NGC_nb; // New General Catalog number unsigned int NGC_nb; // New General Catalog number
unsigned int IC_nb; // Index Catalog number unsigned int IC_nb; // Index Catalog number
unsigned int C_nb; // Caldwell Catalog number
QString englishName; // English name QString englishName; // English name
QString nameI18; // Nebula name QString nameI18; // Nebula name
float mag; // Apparent magnitude float mag; // Apparent magnitude
float angularSize; // Angular size in degree float angularSize; // Angular size in degree
Vec3d XYZ; // Cartesian equatorial position Vec3d XYZ; // Cartesian equatorial position
Vec3d XY; // Store temporary 2D position Vec3d XY; // Store temporary 2D position
NebulaType nType; NebulaType nType;
SphericalRegionP pointRegion; SphericalRegionP pointRegion;
 End of changes. 8 change blocks. 
7 lines changed or deleted 17 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/