summaryrefslogtreecommitdiff
path: root/indra/llimage/llimage.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-01-08 15:41:42 -0800
committerMerov Linden <merov@lindenlab.com>2014-01-08 15:41:42 -0800
commit3161d822ab1336a347f1bb34574b5c4b8e747799 (patch)
tree5772b1577aa4589ef1ed8619b9fa8061d7f8f206 /indra/llimage/llimage.h
parentc2a974f1556906f6ca69afb5942378c8dbf85169 (diff)
ACME-1236 : WIP : Added mode and angle parameter to filterScreen (renamed for consistency)
Diffstat (limited to 'indra/llimage/llimage.h')
-rwxr-xr-xindra/llimage/llimage.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llimage/llimage.h b/indra/llimage/llimage.h
index ed17f1af21..f2bb91a329 100755
--- a/indra/llimage/llimage.h
+++ b/indra/llimage/llimage.h
@@ -95,6 +95,12 @@ typedef enum e_vignette_mode
VIGNETTE_MODE_FADE = 2
} EVignetteMode;
+typedef enum e_screen_mode
+{
+ SCREEN_MODE_2DSINE = 0,
+ SCREEN_MODE_LINE = 1
+} EScreenMode;
+
//============================================================================
// library initialization class
@@ -283,7 +289,7 @@ public:
void filterGrayScale(); // Convert to grayscale
void filterSepia(); // Convert to sepia
void filterSaturate(F32 saturation); // < 1.0 desaturates, > 1.0 saturates
- void filterRotate(F32 alpha); // Rotates hue according to alpha, alpha is an angle in degrees
+ void filterRotate(F32 angle); // Rotates hue according to angle, angle in degrees
// Filter Operations : Color Corrections
// When specified, the LLColor3 alpha parameter indicates the intensity of the effect for each color channel
@@ -299,7 +305,7 @@ public:
// Filter Primitives
void colorTransform(const LLMatrix3 &transform);
void colorCorrect(const U8* lut_red, const U8* lut_green, const U8* lut_blue);
- void screenFilter(const S32 wave_length);
+ void filterScreen(EScreenMode mode, const S32 wave_length, const F32 angle);
void setVignette(EVignetteMode mode, F32 gamma, F32 min);
U32* getBrightnessHistogram();