Atmosphere.hpp   Atmosphere.hpp 
skipping to change at line 56 skipping to change at line 56
virtual ~Atmosphere(void); virtual ~Atmosphere(void);
void computeColor(double JD, Vec3d _sunPos, Vec3d moonPos, float moo nPhase, StelCore* core, void computeColor(double JD, Vec3d _sunPos, Vec3d moonPos, float moo nPhase, StelCore* core,
float latitude = 45.f, float altitude = 200.f, float latitude = 45.f, float altitude = 200.f,
float temperature = 15.f, float relativeHumidity = 40.f); float temperature = 15.f, float relativeHumidity = 40.f);
void draw(StelCore* core); void draw(StelCore* core);
void update(double deltaTime) {fader.update((int)(deltaTime*1000));} void update(double deltaTime) {fader.update((int)(deltaTime*1000));}
//! Set fade in/out duration in seconds //! Set fade in/out duration in seconds
void setFadeDuration(float duration) {fader.setDuration((int)(durati on*1000.f));} void setFadeDuration(float duration) {fader.setDuration((int)(durati on*1000.f));}
//! Get fade in/out duration in seconds //! Get fade in/out duration in seconds
float getFadeDuration() {return fader.getDuration()/1000.f;} float getFadeDuration() {return (float)fader.getDuration()/1000.f;}
//! Define whether to display atmosphere //! Define whether to display atmosphere
void setFlagShow(bool b){fader = b;} void setFlagShow(bool b){fader = b;}
//! Get whether atmosphere is displayed //! Get whether atmosphere is displayed
bool getFlagShow() const {return fader;} bool getFlagShow() const {return fader;}
//! Get the actual atmosphere intensity due to eclipses + fader //! Get the actual atmosphere intensity due to eclipses + fader
//! @return the display intensity ranging from 0 to 1 //! @return the display intensity ranging from 0 to 1
float getRealDisplayIntensityFactor(void) const {return fader.getInt erstate()*eclipseFactor;} float getRealDisplayIntensityFactor(void) const {return fader.getInt erstate()*eclipseFactor;}
skipping to change at line 94 skipping to change at line 94
Skybright skyb; Skybright skyb;
int skyResolutionY,skyResolutionX; int skyResolutionY,skyResolutionX;
Vec2f* posGrid; Vec2f* posGrid;
Vec4f* colorGrid; Vec4f* colorGrid;
unsigned int* indices; unsigned int* indices;
//! The average luminance of the atmosphere in cd/m2 //! The average luminance of the atmosphere in cd/m2
float averageLuminance; float averageLuminance;
float eclipseFactor; float eclipseFactor;
ParabolicFader fader; LinearFader fader;
float lightPollutionLuminance; float lightPollutionLuminance;
//! Whether vertex shader should be used //! Whether vertex shader should be used
bool useShader; bool useShader;
//! Vertex shader used for xyYToRGB computation //! Vertex shader used for xyYToRGB computation
class QGLShaderProgram* atmoShaderProgram; class QGLShaderProgram* atmoShaderProgram;
struct { struct {
int alphaWaOverAlphaDa; int alphaWaOverAlphaDa;
int oneOverGamma; int oneOverGamma;
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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/