Landscape.hpp   Landscape.hpp 
skipping to change at line 36 skipping to change at line 36
#include "StelProjector.hpp" #include "StelProjector.hpp"
#include "StelNavigator.hpp" #include "StelNavigator.hpp"
#include "StelFader.hpp" #include "StelFader.hpp"
#include "StelUtils.hpp" #include "StelUtils.hpp"
#include "StelTextureTypes.hpp" #include "StelTextureTypes.hpp"
#include "StelLocation.hpp" #include "StelLocation.hpp"
class QSettings; class QSettings;
class StelLocation; class StelLocation;
class StelCore; class StelCore;
class StelPainter;
//! @class Landscape //! @class Landscape
//! Store and manages the displaying of the Landscape. //! Store and manages the displaying of the Landscape.
//! Don't use this class direcly, use the LandscapeMgr. //! Don't use this class direcly, use the LandscapeMgr.
class Landscape class Landscape
{ {
public: public:
Landscape(float _radius = 2.); Landscape(float _radius = 2.);
virtual ~Landscape(); virtual ~Landscape();
virtual void load(const QSettings& landscapeIni, const QString& land scapeId) = 0; virtual void load(const QSettings& landscapeIni, const QString& land scapeId) = 0;
skipping to change at line 86 skipping to change at line 87
protected: protected:
//! Load attributes common to all landscapes //! Load attributes common to all landscapes
//! @param landscapeIni A reference to an existant QSettings object which describes the landscape //! @param landscapeIni A reference to an existant QSettings object which describes the landscape
//! @param landscapeId The name of the directory for the landscape f iles (e.g. "ocean") //! @param landscapeId The name of the directory for the landscape f iles (e.g. "ocean")
void loadCommon(const QSettings& landscapeIni, const QString& landsc apeId); void loadCommon(const QSettings& landscapeIni, const QString& landsc apeId);
//! search for a texture in landscape directory, else global texture s directory //! search for a texture in landscape directory, else global texture s directory
//! @param basename The name of a texture file, e.g. "fog.png" //! @param basename The name of a texture file, e.g. "fog.png"
//! @param landscapeId The landscape ID (directory name) to which th e texture belongs //! @param landscapeId The landscape ID (directory name) to which th e texture belongs
//! @exception misc possibility of throwing boost:filesystem or "fil e not found" exceptions //! @exception misc possibility of throwing "file not found" excepti ons
const QString getTexturePath(const QString& basename, const QString& landscapeId); const QString getTexturePath(const QString& basename, const QString& landscapeId);
float radius; float radius;
QString name; QString name;
float skyBrightness; float skyBrightness;
bool validLandscape; // was a landscape loaded properly? bool validLandscape; // was a landscape loaded properly?
LinearFader landFader; LinearFader landFader;
LinearFader fogFader; LinearFader fogFader;
QString author; QString author;
QString description; QString description;
skipping to change at line 117 skipping to change at line 118
class LandscapeOldStyle : public Landscape class LandscapeOldStyle : public Landscape
{ {
public: public:
LandscapeOldStyle(float _radius = 2.); LandscapeOldStyle(float _radius = 2.);
virtual ~LandscapeOldStyle(); virtual ~LandscapeOldStyle();
virtual void load(const QSettings& landscapeIni, const QString& land scapeId); virtual void load(const QSettings& landscapeIni, const QString& land scapeId);
virtual void draw(StelCore* core); virtual void draw(StelCore* core);
void create(bool _fullpath, QMap<QString, QString> param); void create(bool _fullpath, QMap<QString, QString> param);
private: private:
void drawFog(StelCore* core) const; void drawFog(StelCore* core, StelPainter&) const;
void drawDecor(StelCore* core) const; void drawDecor(StelCore* core, StelPainter&) const;
void drawGround(StelCore* core) const; void drawGround(StelCore* core, StelPainter&) const;
StelTextureSP* sideTexs; StelTextureSP* sideTexs;
int nbSideTexs; int nbSideTexs;
int nbSide; int nbSide;
landscapeTexCoord* sides; landscapeTexCoord* sides;
StelTextureSP fogTex; StelTextureSP fogTex;
landscapeTexCoord fogTexCoord; landscapeTexCoord fogTexCoord;
StelTextureSP groundTex; StelTextureSP groundTex;
landscapeTexCoord groundTexCoord; landscapeTexCoord groundTexCoord;
int nbDecorRepeat; int nbDecorRepeat;
float fogAltAngle; float fogAltAngle;
skipping to change at line 147 skipping to change at line 148
}; };
class LandscapeFisheye : public Landscape class LandscapeFisheye : public Landscape
{ {
public: public:
LandscapeFisheye(float _radius = 1.); LandscapeFisheye(float _radius = 1.);
virtual ~LandscapeFisheye(); virtual ~LandscapeFisheye();
virtual void load(const QSettings& landscapeIni, const QString& land scapeId); virtual void load(const QSettings& landscapeIni, const QString& land scapeId);
virtual void draw(StelCore* core); virtual void draw(StelCore* core);
void create(const QString _name, bool _fullpath, const QString& _map tex, void create(const QString _name, bool _fullpath, const QString& _map tex,
double _texturefov, double angleRotateZ); double _texturefov, double angleRotateZ);
private: private:
StelTextureSP mapTex; StelTextureSP mapTex;
float texFov; float texFov;
}; };
class LandscapeSpherical : public Landscape class LandscapeSpherical : public Landscape
{ {
public: public:
LandscapeSpherical(float _radius = 1.); LandscapeSpherical(float _radius = 1.);
virtual ~LandscapeSpherical(); virtual ~LandscapeSpherical();
virtual void load(const QSettings& landscapeIni, const QString& land scapeId); virtual void load(const QSettings& landscapeIni, const QString& land scapeId);
virtual void draw(StelCore* core); virtual void draw(StelCore* core);
void create(const QString _name, bool _fullpath, void create(const QString _name, bool _fullpath,
const QString& _maptex, double angleRotateZ); const QString& _maptex, double angleRotateZ) ;
private: private:
StelTextureSP mapTex; StelTextureSP mapTex;
}; };
#endif // _LANDSCAPE_HPP_ #endif // _LANDSCAPE_HPP_
 End of changes. 5 change blocks. 
6 lines changed or deleted 7 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/