LandscapeMgr.hpp   LandscapeMgr.hpp 
skipping to change at line 74 skipping to change at line 74
public: public:
LandscapeMgr(); LandscapeMgr();
virtual ~LandscapeMgr(); virtual ~LandscapeMgr();
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods defined in the StelModule class // Methods defined in the StelModule class
//! Initialize the LandscapeManager class. //! Initialize the LandscapeManager class.
//! Operations performed: //! Operations performed:
//! - Load the default landscape as specified in the application con figuration //! - Load the default landscape as specified in the application con figuration
//! - Set up landscape-releated display flags from ini parser object //! - Set up landscape-related display flags from ini parser object
virtual void init(); virtual void init();
//! Draw the landscape graphics, cardinal points and atmosphere. //! Draw the landscape graphics, cardinal points and atmosphere.
virtual void draw(StelCore* core); virtual void draw(StelCore* core);
//! Update time-dependent state. //! Update time-dependent state.
//! Includes: //! Includes:
//! - Landscape, atmosphere and cardinal point on/off fading. //! - Landscape, atmosphere and cardinal point on/off fading.
//! - Atmophere colour calulation based on location, position of sun //! - Atmophere colour calculation based on location, position of su n
//! and moon. //! and moon.
//! - updates adaptation lumenescence lased on visible bright object s. //! - updates adaptation luminescence based on visible bright object s.
virtual void update(double deltaTime); virtual void update(double deltaTime);
//! Get the order in which this module will draw it's objects relati ve to other modules. //! Get the order in which this module will draw its objects relativ e to other modules.
virtual double getCallOrder(StelModuleActionName actionName) const; virtual double getCallOrder(StelModuleActionName actionName) const;
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Method specific to the landscape manager // Method specific to the landscape manager
//! Return the global landscape luminance [0..1], for being used e.g for setting eye adaptation. //! Return the global landscape luminance [0..1], for being used e.g for setting eye adaptation.
//! GZ 2014-01-03: THIS IS MISLEADING. Returns 1 if atmosphere drawi ng is on and no eclipse underway, 0 if atmosphere is switched off. //! GZ 2014-01-03: THIS IS MISLEADING. Returns 1 if atmosphere drawi ng is on and no eclipse underway, 0 if atmosphere is switched off.
//! The actual brightness is of no concern here. You may use getAtmo sphereAverageLuminance() for this. //! The actual brightness is of no concern here. You may use getAtmo sphereAverageLuminance() for this.
float getLuminance() const; float getLuminance() const;
//! return average luminance [cd/m^2] of atmosphere. Around 10 at su nset, 6400 in daylight, >0 in dark night. //! return average luminance [cd/m^2] of atmosphere. Around 10 at su nset, 6400 in daylight, >0 in dark night.
float getAtmosphereAverageLuminance() const; float getAtmosphereAverageLuminance() const;
skipping to change at line 156 skipping to change at line 156
//! @param name the name of the new landscape, as found in the lands cape:name key of the landscape.ini file. //! @param name the name of the new landscape, as found in the lands cape:name key of the landscape.ini file.
bool setCurrentLandscapeName(const QString& name); bool setCurrentLandscapeName(const QString& name);
//! Get the default landscape ID. //! Get the default landscape ID.
const QString& getDefaultLandscapeID() const {return defaultLandscap eID;} const QString& getDefaultLandscapeID() const {return defaultLandscap eID;}
//! Change the default landscape to the landscape with the ID specif ied. //! Change the default landscape to the landscape with the ID specif ied.
//! @param id the ID of the landscape to use by default //! @param id the ID of the landscape to use by default
//! @return false if the new landscape could not be set (e.g. no lan dscape of that ID was found). True on success. //! @return false if the new landscape could not be set (e.g. no lan dscape of that ID was found). True on success.
bool setDefaultLandscapeID(const QString& id); bool setDefaultLandscapeID(const QString& id);
//! Return a pseudo HTML formated string with all informations on th e current landscape //! Return a pseudo HTML formatted string with all informations on t he current landscape
QString getCurrentLandscapeHtmlDescription() const; QString getCurrentLandscapeHtmlDescription() const;
//! Return a pseudo HTML formated string with information from descr iption or ini file //! Return a pseudo HTML formatted string with information from desc ription or ini file
QString getDescription() const; QString getDescription() const;
//! Get flag for displaying Landscape. //! Get flag for displaying Landscape.
bool getFlagLandscape() const; bool getFlagLandscape() const;
//! Set flag for displaying Landscape. //! Set flag for displaying Landscape.
void setFlagLandscape(const bool displayed); void setFlagLandscape(const bool displayed);
//! Get whether the landscape is currently visible. If true, object below landscape must be rendered. //! Get whether the landscape is currently visible. If true, object below landscape must be rendered.
bool getIsLandscapeFullyVisible() const; bool getIsLandscapeFullyVisible() const;
skipping to change at line 287 skipping to change at line 287
//! an empty string on failure. //! an empty string on failure.
//QString installLandscapeFromDirectory(QString pathToSourceLandscap eIni, bool display = false, bool forAllUsers = false); //QString installLandscapeFromDirectory(QString pathToSourceLandscap eIni, bool display = false, bool forAllUsers = false);
*/ */
//! This function removes a landscape from the user data directory. //! This function removes a landscape from the user data directory.
//! It tries to recursively delete all files in the landscape direct ory //! It tries to recursively delete all files in the landscape direct ory
//! and then remove it from the list of available landscapes. //! and then remove it from the list of available landscapes.
//! If the function encounters any file that can't be deleted //! If the function encounters any file that can't be deleted
//! it aborts the operation (previously deleted files are not restor ed). //! it aborts the operation (previously deleted files are not restor ed).
//! Landscapes that were packaged with Stellarium can't be removed, //! Landscapes that were packaged with Stellarium can't be removed,
//! thanks to the #packagedtLandscapeIDs list. //! thanks to the #packagedLandscapeIDs list.
//! @param landscapeID an installed landscape's identifier (the fold er name) //! @param landscapeID an installed landscape's identifier (the fold er name)
//! @todo Find a better way to pass error messages. //! @todo Find a better way to pass error messages.
bool removeLandscape(const QString landscapeID); bool removeLandscape(const QString landscapeID);
//! This function reads a landscape's name from its configuration fi le. //! This function reads a landscape's name from its configuration fi le.
//! @param landscapeID an installed landscape's identifier (the fold er name) //! @param landscapeID an installed landscape's identifier (the fold er name)
//! @returns an empty string if there is no such landscape or some o ther //! @returns an empty string if there is no such landscape or some o ther
//! error occurs //! error occurs
QString loadLandscapeName(const QString landscapeID); QString loadLandscapeName(const QString landscapeID);
 End of changes. 7 change blocks. 
7 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/