Nebula.hpp   Nebula.hpp 
skipping to change at line 218 skipping to change at line 218
float redshift; float redshift;
float redshiftErr; float redshiftErr;
float parallax; float parallax;
float parallaxErr; float parallaxErr;
Vec3d XYZ; // Cartesian equatorial position (J2 000.0) Vec3d XYZ; // Cartesian equatorial position (J2 000.0)
Vec3d XY; // Store temporary 2D position Vec3d XY; // Store temporary 2D position
NebulaType nType; NebulaType nType;
SphericalRegionP pointRegion; SphericalRegionP pointRegion;
static StelTextureSP texCircle; // The symbolic circle texture static StelTextureSP texCircle; // The symbolic c
static StelTextureSP texGalaxy; // Type 0 ircle texture
static StelTextureSP texGalaxy; // Type 0
static StelTextureSP texOpenCluster; // Type 1 static StelTextureSP texOpenCluster; // Type 1
static StelTextureSP texGlobularCluster; // Type 2 static StelTextureSP texGlobularCluster; // Type 2
static StelTextureSP texPlanetaryNebula; // Type 3 static StelTextureSP texPlanetaryNebula; // Type 3
static StelTextureSP texDiffuseNebula; // Type 4 static StelTextureSP texDiffuseNebula; // Type 4
static StelTextureSP texDarkNebula; // Type 5 static StelTextureSP texDarkNebula; // Type 5
static StelTextureSP texOpenClusterWithNebulosity; // Type 7 static StelTextureSP texOpenClusterWithNebulosity; // Type 7
static float hintsBrightness; static float hintsBrightness;
static Vec3f labelColor, circleColor, galaxyColor, radioGalaxyColor, static Vec3f labelColor; // The color of labe
activeGalaxyColor, interactingGalaxyColor, ls
brightNebulaColor, darkNebulaColor, hydrogenRegionColor static Vec3f circleColor; // The color of the
, supernovaRemnantColor, clusterColor; symbolic circle texture (default marker; NebUnknown)
static float circleScale; // Define the scaling of the hints c static Vec3f galaxyColor; // The color of gala
ircle xy marker texture (NebGx)
static bool drawHintProportional; // scale hint with nebula size? static Vec3f radioGalaxyColor; // The color of radi
o galaxy marker texture (NebRGx)
static Vec3f activeGalaxyColor; // The color of acti
ve galaxy marker texture (NebAGx)
static Vec3f interactingGalaxyColor; // The color of inte
racting galaxy marker texture (NebIGx)
static Vec3f quasarColor; // The color of quas
ar marker texture (NebQSO)
static Vec3f nebulaColor; // The color of nebu
la marker texture (NebN)
static Vec3f planetaryNebulaColor; // The color of plan
etary nebula marker texture (NebPn)
static Vec3f reflectionNebulaColor; // The color of refl
ection nebula marker texture (NebRn)
static Vec3f bipolarNebulaColor; // The color of bipo
lar nebula marker texture (NebBn)
static Vec3f emissionNebulaColor; // The color of emis
sion nebula marker texture (NebEn)
static Vec3f darkNebulaColor; // The color of dark
nebula marker texture (NebDn)
static Vec3f hydrogenRegionColor; // The color of hydr
ogen region marker texture (NebHII)
static Vec3f supernovaRemnantColor; // The color of supe
rnova remnant marker texture (NebSNR)
static Vec3f interstellarMatterColor; // The color of inte
rstellar matter marker texture (NebISM)
static Vec3f clusterWithNebulosityColor; // The color of clus
ter associated with nebulosity marker texture (NebCn)
static Vec3f clusterColor; // The color of star
cluster marker texture (NebCl)
static Vec3f openClusterColor; // The color of open
star cluster marker texture (NebOc)
static Vec3f globularClusterColor; // The color of glob
ular star cluster marker texture (NebGc)
static Vec3f stellarAssociationColor; // The color of stel
lar association marker texture (NebSA)
static Vec3f starCloudColor; // The color of star
cloud marker texture (NebSC)
static Vec3f emissionObjectColor; // The color of emis
sion object marker texture (NebEMO)
static Vec3f blLacObjectColor; // The color of BL L
ac object marker texture (NebBLL)
static Vec3f blazarColor; // The color of blaz
ar marker texture (NebBLA)
static Vec3f molecularCloudColor; // The color of mole
cular cloud marker texture (NebMolCld)
static Vec3f youngStellarObjectColor; // The color of Youn
g Stellar Object marker texture (NebYSO)
static Vec3f possibleQuasarColor; // The color of poss
ible quasar marker texture (NebPossQSO)
static Vec3f possiblePlanetaryNebulaColor; // The color of poss
ible planetary nebula marker texture (NebPossPN)
static Vec3f protoplanetaryNebulaColor; // The color of prot
oplanetary nebula marker texture (NebPPN)
static Vec3f starColor; // The color of star
marker texture (NebStar)
static float circleScale; // Define the scaling of the h
ints circle
static bool drawHintProportional; // scale hint with nebula size
?
static bool surfaceBrightnessUsage; static bool surfaceBrightnessUsage;
static bool flagUsageTypeFilter; static bool flagUsageTypeFilter;
static CatalogGroup catalogFilters; static CatalogGroup catalogFilters;
static TypeGroup typeFilters; static TypeGroup typeFilters;
}; };
Q_DECLARE_OPERATORS_FOR_FLAGS(Nebula::CatalogGroup) Q_DECLARE_OPERATORS_FOR_FLAGS(Nebula::CatalogGroup)
Q_DECLARE_OPERATORS_FOR_FLAGS(Nebula::TypeGroup) Q_DECLARE_OPERATORS_FOR_FLAGS(Nebula::TypeGroup)
 End of changes. 2 change blocks. 
9 lines changed or deleted 70 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/