diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-05-11 20:56:42 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-05-11 20:56:42 +0000 |
| commit | 875606a04d656ef6e5600a3a7fb6e8b52feb1945 (patch) | |
| tree | 7189f1cd0a2b043446e6f145cb9c72b3a1f125aa /indra/newview/llvosky.h | |
| parent | 783e05058c5d74984ab554fdc60aa06839b9b5c9 (diff) | |
QAR-566 maint-viewer-5-merge-2
Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2
Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release
Diffstat (limited to 'indra/newview/llvosky.h')
| -rw-r--r-- | indra/newview/llvosky.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/indra/newview/llvosky.h b/indra/newview/llvosky.h index 260aeeada7..c2ab9ae6a4 100644 --- a/indra/newview/llvosky.h +++ b/indra/newview/llvosky.h @@ -207,7 +207,7 @@ protected: F32 mDiskRadius; BOOL mDraw; // FALSE - do not draw. F32 mHorizonVisibility; // number [0, 1] due to how horizon - F32 mVisibility; // same but due to other objects being in frong. + F32 mVisibility; // same but due to other objects being in throng. BOOL mVisible; static F32 sInterpVal; LLVector3 mQuadCorner[4]; @@ -217,10 +217,12 @@ protected: public: LLHeavenBody(const F32 rad) : - mDirectionCached(LLVector3(0,0,0)), mDirection(LLVector3(0,0,0)), - mDiskRadius(rad), mDraw(FALSE), - mHorizonVisibility(1), mVisibility(1) - + mDirectionCached(LLVector3(0,0,0)), + mDirection(LLVector3(0,0,0)), + mIntensity(0.f), + mDiskRadius(rad), mDraw(FALSE), + mHorizonVisibility(1.f), mVisibility(1.f), + mVisible(FALSE) { mColor.setToBlack(); mColorCached.setToBlack(); @@ -261,7 +263,6 @@ public: BOOL isVisible() const { return mVisible; } void setVisible(const BOOL v) { mVisible = v; } - const F32& getIntensity() const { return mIntensity; } void setIntensity(const F32 c) { mIntensity = c; } @@ -311,19 +312,19 @@ LL_FORCE_INLINE LLColor3 calc_air_sca_sea_level() const LLColor3 gAirScaSeaLevel = calc_air_sca_sea_level(); const F32 AIR_SCA_INTENS = color_intens(gAirScaSeaLevel); -const F32 AIR_SCA_AVG = AIR_SCA_INTENS / 3; +const F32 AIR_SCA_AVG = AIR_SCA_INTENS / 3.f; class LLHaze { public: - LLHaze() : mG(0), mFalloff(1) {mSigSca.setToBlack();} - LLHaze(const F32 g, const LLColor3& sca, const F32 fo = 2) : - mG(g), mSigSca(0.25f/F_PI * sca), mFalloff(fo), mAbsCoef(0) + LLHaze() : mG(0), mFalloff(1), mAbsCoef(0.f) {mSigSca.setToBlack();} + LLHaze(const F32 g, const LLColor3& sca, const F32 fo = 2.f) : + mG(g), mSigSca(0.25f/F_PI * sca), mFalloff(fo), mAbsCoef(0.f) { mAbsCoef = color_intens(mSigSca) / AIR_SCA_INTENS; } - LLHaze(const F32 g, const F32 sca, const F32 fo = 2) : mG(g), + LLHaze(const F32 g, const F32 sca, const F32 fo = 2.f) : mG(g), mSigSca(0.25f/F_PI * LLColor3(sca, sca, sca)), mFalloff(fo) { mAbsCoef = 0.01f * sca / AIR_SCA_AVG; |