summaryrefslogtreecommitdiff
path: root/indra/llmath/v3colorutil.h
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2017-09-27 09:36:26 -0700
committerRider Linden <rider@lindenlab.com>2017-09-27 09:36:26 -0700
commit52b0d4173cec0f643f37d426aef8f5ab1fdf3232 (patch)
tree5e2cb3e2ea12cabe81bb4a6b134968109e3414b4 /indra/llmath/v3colorutil.h
parent0d414c1fb579dffc122c4d021a84cd126c612e54 (diff)
No longer 'goth windlight only', sky parameters passed from settings object.
Diffstat (limited to 'indra/llmath/v3colorutil.h')
-rw-r--r--indra/llmath/v3colorutil.h20
1 files changed, 20 insertions, 0 deletions
diff --git a/indra/llmath/v3colorutil.h b/indra/llmath/v3colorutil.h
index 00b36132d8..6d8cd9329b 100644
--- a/indra/llmath/v3colorutil.h
+++ b/indra/llmath/v3colorutil.h
@@ -91,5 +91,25 @@ inline LLColor3 smear(F32 val)
return LLColor3(val, val, val);
}
+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]);
+}
#endif