diff options
author | Rider Linden <rider@lindenlab.com> | 2017-09-27 09:36:26 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2017-09-27 09:36:26 -0700 |
commit | 52b0d4173cec0f643f37d426aef8f5ab1fdf3232 (patch) | |
tree | 5e2cb3e2ea12cabe81bb4a6b134968109e3414b4 /indra/newview/llvosky.h | |
parent | 0d414c1fb579dffc122c4d021a84cd126c612e54 (diff) |
No longer 'goth windlight only', sky parameters passed from settings object.
Diffstat (limited to 'indra/newview/llvosky.h')
-rw-r--r-- | indra/newview/llvosky.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/indra/newview/llvosky.h b/indra/newview/llvosky.h index 9cfb9773bd..c865e8701c 100644 --- a/indra/newview/llvosky.h +++ b/indra/newview/llvosky.h @@ -33,6 +33,7 @@ #include "llviewertexture.h" #include "llviewerobject.h" #include "llframetimer.h" +#include "v3colorutil.h" ////////////////////////////////// @@ -85,26 +86,6 @@ BOOL clip_quad_to_horizon(F32& t_left, F32& t_right, LLVector3 v_clipped[4], const LLVector3 v_corner[4], const F32 cos_max_angle); F32 clip_side_to_horizon(const LLVector3& v0, const LLVector3& v1, const F32 cos_max_angle); -inline F32 color_intens ( const LLColor3 &col ) -{ - return col.mV[0] + col.mV[1] + col.mV[2]; -} - -inline F32 color_max(const LLColor3 &col) -{ - return llmax(col.mV[0], col.mV[1], col.mV[2]); -} - -inline F32 color_max(const LLColor4 &col) -{ - return llmax(col.mV[0], col.mV[1], col.mV[2]); -} - - -inline F32 color_min(const LLColor3 &col) -{ - return llmin(col.mV[0], col.mV[1], col.mV[2]); -} class LLFace; class LLHaze; |