diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
| commit | 6d52efe452aa8469e0343da1c7d108f3f52ab651 (patch) | |
| tree | a87be48e9840d7fc1f7ee514d7c7f994e71fdb3c /indra/newview/llsky.h | |
| parent | 6027ad2630b8650cabcf00628ee9b0d25bedd67f (diff) | |
Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
Diffstat (limited to 'indra/newview/llsky.h')
| -rw-r--r-- | indra/newview/llsky.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/llsky.h b/indra/newview/llsky.h index 690b54a59e..e9e9999ff9 100644 --- a/indra/newview/llsky.h +++ b/indra/newview/llsky.h @@ -39,7 +39,6 @@ #include "v4color.h" #include "v4coloru.h" #include "llvosky.h" -#include "llvostars.h" #include "llvoground.h" const F32 NIGHTTIME_ELEVATION = -8.0f; // degrees @@ -47,6 +46,9 @@ const F32 NIGHTTIME_ELEVATION_COS = (F32)sin(NIGHTTIME_ELEVATION*DEG_TO_RAD); class LLViewerCamera; +class LLVOWLSky; +class LLVOWLClouds; + class LLSky { @@ -64,10 +66,8 @@ public: void setSunDirection(const LLVector3 &sun_direction, const LLVector3 &sun_ang_velocity); void setSunTargetDirection(const LLVector3 &sun_direction, const LLVector3 &sun_ang_velocity); - LLColor4 getFogColor() const; - void setCloudDensityAtAgent(F32 cloud_density); void setWind(const LLVector3& wind); @@ -88,21 +88,24 @@ public: LLVector3 getMoonDirection() const; LLColor4 getSunDiffuseColor() const; LLColor4 getMoonDiffuseColor() const; + LLColor4 getSunAmbientColor() const; + LLColor4 getMoonAmbientColor() const; LLColor4 getTotalAmbientColor() const; BOOL sunUp() const; - LLColor4 calcInScatter(LLColor4& transp, const LLVector3 &point, F32 exag) const; F32 getSunPhase() const; void setSunPhase(const F32 phase); void destroyGL(); void restoreGL(); + void resetVertexBuffers(); public: LLPointer<LLVOSky> mVOSkyp; // Pointer to the LLVOSky object (only one, ever!) - LLPointer<LLVOStars> mVOStarsp; // Pointer to the LLVOStars object (only one, ever!) LLPointer<LLVOGround> mVOGroundp; + LLPointer<LLVOWLSky> mVOWLSkyp; + LLVector3 mSunTargDir; // Legacy stuff |