MilkyWay.hpp   MilkyWay.hpp 
skipping to change at line 36 skipping to change at line 36
//! @class MilkyWay //! @class MilkyWay
//! Manages the displaying of the Milky Way. //! Manages the displaying of the Milky Way.
class MilkyWay : public StelModule class MilkyWay : public StelModule
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool flagMilkyWayDisplayed Q_PROPERTY(bool flagMilkyWayDisplayed
READ getFlagShow READ getFlagShow
WRITE setFlagShow WRITE setFlagShow
NOTIFY milkyWayDisplayedChanged) NOTIFY milkyWayDisplayedChanged)
Q_PROPERTY(double intensity
READ getIntensity
WRITE setIntensity
NOTIFY intensityChanged
)
public: public:
MilkyWay(); MilkyWay();
virtual ~MilkyWay(); virtual ~MilkyWay();
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods defined in the StelModule class // Methods defined in the StelModule class
//! Initialize the class. Here we load the texture for the Milky Wa y and //! Initialize the class. Here we load the texture for the Milky Wa y and
//! get the display settings from application settings, namely the f lag which //! get the display settings from application settings, namely the f lag which
//! determines if the Milky Way is displayed or not, and the intensi ty setting. //! determines if the Milky Way is displayed or not, and the intensi ty setting.
skipping to change at line 64 skipping to change at line 69
//! Used to determine the order in which the various modules are dra wn. //! Used to determine the order in which the various modules are dra wn.
virtual double getCallOrder(StelModuleActionName actionName) const { Q_UNUSED(actionName); return 1.;} virtual double getCallOrder(StelModuleActionName actionName) const { Q_UNUSED(actionName); return 1.;}
//////////////////////////////////////////////////////////////////// /////////////////// //////////////////////////////////////////////////////////////////// ///////////////////
// Setter and getters // Setter and getters
public slots: public slots:
//! Get Milky Way intensity. //! Get Milky Way intensity.
double getIntensity() const {return intensity;} double getIntensity() const {return intensity;}
//! Set Milky Way intensity. //! Set Milky Way intensity.
void setIntensity(double aintensity) {intensity = aintensity;} void setIntensity(double aintensity) {if(aintensity!=intensity){ int ensity = aintensity; emit intensityChanged(intensity); }}
//! Get the color used for rendering the milky way //! Get the color used for rendering the milky way
Vec3f getColor() const {return color;} Vec3f getColor() const {return color;}
//! Sets the color to use for rendering the milky way //! Sets the color to use for rendering the milky way
void setColor(const Vec3f& c) {color=c;} void setColor(const Vec3f& c) {color=c;}
//! Sets whether to show the Milky Way //! Sets whether to show the Milky Way
void setFlagShow(bool b); void setFlagShow(bool b);
//! Gets whether the Milky Way is displayed //! Gets whether the Milky Way is displayed
bool getFlagShow(void) const; bool getFlagShow(void) const;
signals: signals:
void milkyWayDisplayedChanged(const bool displayed); void milkyWayDisplayedChanged(const bool displayed);
void intensityChanged(double intensity);
private: private:
StelTextureSP tex; StelTextureSP tex;
Vec3f color; // global color Vec3f color; // global color
float intensity; double intensity;
class LinearFader* fader; class LinearFader* fader;
struct StelVertexArray* vertexArray; struct StelVertexArray* vertexArray;
}; };
#endif // _MILKYWAY_HPP_ #endif // _MILKYWAY_HPP_
 End of changes. 4 change blocks. 
2 lines changed or deleted 8 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/