Landscape.hpp   Landscape.hpp 
skipping to change at line 27 skipping to change at line 27
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA.
*/ */
#ifndef _LANDSCAPE_HPP_ #ifndef _LANDSCAPE_HPP_
#define _LANDSCAPE_HPP_ #define _LANDSCAPE_HPP_
#include <QMap> #include <QMap>
#include "VecMath.hpp" #include "VecMath.hpp"
#include "StelToneReproducer.hpp" #include "StelToneReproducer.hpp"
#include "StelProjector.hpp" #include "StelProjector.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 StelPainter;
skipping to change at line 74 skipping to change at line 74
bool getFlagShowFog() const {return (bool)fogFader;} bool getFlagShowFog() const {return (bool)fogFader;}
//! Get landscape name //! Get landscape name
QString getName() const {return name;} QString getName() const {return name;}
//! Get landscape author name //! Get landscape author name
QString getAuthorName() const {return author;} QString getAuthorName() const {return author;}
//! Get landscape description //! Get landscape description
QString getDescription() const {return description;} QString getDescription() const {return description;}
//! Return the associated location or NULL //! Return the associated location or NULL
const StelLocation& getLocation() const {return location;} const StelLocation& getLocation() const {return location;}
//! Return default Bortle index (light pollution value) or -1 (unkno
wn/no change)
int getDefaultBortleIndex() const {return defaultBortleIndex;}
//! Return default fog setting (0/1) or -1 (no change)
int getDefaultFogSetting() const {return defaultFogSetting;}
//! Return default atmosperic extinction, mag/airmass, or -1 (no cha
nge)
float getDefaultAtmosphericExtinction() const {return defaultExtinct
ionCoefficient;}
//! Return default atmospheric temperature, for refraction computati
on, or -1000 for "unknown/no change".
float getDefaultAtmosphericTemperature() const {return defaultTemper
ature;}
//! Return default atmospheric temperature, for refraction computati
on.
//! returns -1 to signal "standard conditions", or -2 for "unknown/i
nvalid/no change"
float getDefaultAtmosphericPressure() const {return defaultPressure;
}
//! Set the z-axis rotation (offset from original value when rotated //! Set the z-axis rotation (offset from original value when rotated
void setZRotation(float d) {angleRotateZOffset = d;} void setZRotation(float d) {angleRotateZOffset = d;}
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);
skipping to change at line 100 skipping to change at line 111
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;
// GZ patched, these can now be set in landscape.ini: // GZ patched, these can now be set in landscape.ini:
int rows; // horizontal rows int rows; // horizontal rows
int cols; // vertical columns int cols; // vertical columns
int defaultBortleIndex; // light pollution from landscape.ini, or -
1(no change)
int defaultFogSetting; // fog flag setting from landscape.ini: -1(n
o change), 0(off), 1(on)
double defaultExtinctionCoefficient; // atmospheric_extinction_coef
ficient from landscape.ini or -1
double defaultTemperature; // atmospheric_temperature from landscap
e.ini or -1000.0
double defaultPressure; // atmospheric_pressure from landscape.ini
or -1.0
typedef struct typedef struct
{ {
StelTextureSP tex; StelTextureSP tex;
float texCoords[4]; float texCoords[4];
} landscapeTexCoord; } landscapeTexCoord;
StelLocation location; StelLocation location;
float angleRotateZ; float angleRotateZ;
float angleRotateZOffset; float angleRotateZOffset;
 End of changes. 3 change blocks. 
1 lines changed or deleted 30 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/