MilkyWay.hpp   MilkyWay.hpp 
skipping to change at line 25 skipping to change at line 25
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#ifndef _MILKYWAY_HPP_ #ifndef _MILKYWAY_HPP_
#define _MILKYWAY_HPP_ #define _MILKYWAY_HPP_
#include "StelModule.hpp" #include "StelModule.hpp"
#include "VecMath.hpp" #include "VecMath.hpp"
#include "renderer/GenericVertexTypes.hpp" #include "StelTextureTypes.hpp"
#include "renderer/StelIndexBuffer.hpp"
#include "renderer/StelVertexBuffer.hpp"
//! @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
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.
virtual void init(); virtual void init();
//! Draw the Milky Way. //! Draw the Milky Way.
//! virtual void draw(StelCore* core);
//! @param core The StelCore object.
//! @param renderer Renderer to draw with.
virtual void draw(StelCore* core, class StelRenderer* renderer);
//! Update and time-dependent state. Updates the fade level while t he //! Update and time-dependent state. Updates the fade level while t he
//! Milky way rendering is being changed from on to off or off to on . //! Milky way rendering is being changed from on to off or off to on .
virtual void update(double deltaTime); virtual void update(double deltaTime);
//! 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
skipping to change at line 78 skipping to change at line 73
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;
private: private:
float radius; StelTextureSP tex;
class StelTextureNew* tex;
Vec3f color; Vec3f color;
float intensity; float intensity;
class LinearFader* fader; class LinearFader* fader;
//! Sphere used to draw the Milky Way. struct StelVertexArray* vertexArray;
class StelGeometrySphere* skySphere;
}; };
#endif // _MILKYWAY_HPP_ #endif // _MILKYWAY_HPP_
 End of changes. 4 change blocks. 
11 lines changed or deleted 4 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/