From 88b65f32c7c09264e801178e75975db28d42a54c Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 21 Jan 2014 22:16:39 -0800
Subject: [PATCH] ACME-1236 : Modifies the 10 shipped filters to use the new
stencils and resolution independent filters
---
indra/newview/app_settings/filters/Colors1970.xml | 10 ++++++++--
indra/newview/app_settings/filters/Heatwave.xml | 8 +++++++-
indra/newview/app_settings/filters/JulesVerne.xml | 8 +++++++-
indra/newview/app_settings/filters/Newspaper.xml | 8 +++++++-
indra/newview/app_settings/filters/Sepia.xml | 8 +++++++-
indra/newview/app_settings/filters/Spotlight.xml | 10 ++++++++--
indra/newview/app_settings/filters/Video.xml | 12 ++++++++----
7 files changed, 52 insertions(+), 12 deletions(-)
diff --git a/indra/newview/app_settings/filters/Colors1970.xml b/indra/newview/app_settings/filters/Colors1970.xml
index 0dab2489a05..730d907fa76 100644
--- a/indra/newview/app_settings/filters/Colors1970.xml
+++ b/indra/newview/app_settings/filters/Colors1970.xml
@@ -19,14 +19,20 @@
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
- <real>0.5</real>
+ <real>0.3</real>
<real>0.0</real>
<real>0.0</real>
</array>
<array>
+ <string>stencil</string>
+ <string>vignette</string>
<string>blend</string>
- <real>10.0</real>
<real>0.0</real>
+ <real>1.0</real>
+ <real>0.0</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ <real>10.0</real>
</array>
<array>
<string>colorize</string>
diff --git a/indra/newview/app_settings/filters/Heatwave.xml b/indra/newview/app_settings/filters/Heatwave.xml
index 5c47ca0f849..a99f41c8335 100644
--- a/indra/newview/app_settings/filters/Heatwave.xml
+++ b/indra/newview/app_settings/filters/Heatwave.xml
@@ -15,9 +15,15 @@
<real>1.0</real>
</array>
<array>
+ <string>stencil</string>
+ <string>vignette</string>
<string>fade</string>
- <real>4.0</real>
<real>0.5</real>
+ <real>1.0</real>
+ <real>0.0</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ <real>4.0</real>
</array>
<array>
<string>colorize</string>
diff --git a/indra/newview/app_settings/filters/JulesVerne.xml b/indra/newview/app_settings/filters/JulesVerne.xml
index ddff4d19771..b0d4f8e9cd5 100644
--- a/indra/newview/app_settings/filters/JulesVerne.xml
+++ b/indra/newview/app_settings/filters/JulesVerne.xml
@@ -11,14 +11,20 @@
<string>grayscale</string>
</array>
<array>
+ <string>stencil</string>
+ <string>vignette</string>
<string>blend</string>
<real>0.0</real>
+ <real>1.0</real>
+ <real>0.0</real>
<real>0.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
</array>
<array>
<string>screen</string>
<string>line</string>
- <real>5.0</real>
+ <real>0.01</real>
<real>0.0</real>
</array>
</array>
diff --git a/indra/newview/app_settings/filters/Newspaper.xml b/indra/newview/app_settings/filters/Newspaper.xml
index 8247c34500a..b02a553dfa7 100755
--- a/indra/newview/app_settings/filters/Newspaper.xml
+++ b/indra/newview/app_settings/filters/Newspaper.xml
@@ -11,14 +11,20 @@
<string>grayscale</string>
</array>
<array>
+ <string>stencil</string>
+ <string>vignette</string>
<string>blend</string>
<real>0.0</real>
+ <real>1.0</real>
+ <real>0.0</real>
<real>0.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
</array>
<array>
<string>screen</string>
<string>2Dsine</string>
- <real>5.0</real>
+ <real>0.01</real>
<real>0.0</real>
</array>
</array>
diff --git a/indra/newview/app_settings/filters/Sepia.xml b/indra/newview/app_settings/filters/Sepia.xml
index d26df608b9e..3d577b29981 100644
--- a/indra/newview/app_settings/filters/Sepia.xml
+++ b/indra/newview/app_settings/filters/Sepia.xml
@@ -15,9 +15,15 @@
<real>1.0</real>
</array>
<array>
+ <string>stencil</string>
+ <string>vignette</string>
<string>fade</string>
- <real>4.0</real>
<real>0.5</real>
+ <real>1.0</real>
+ <real>0.0</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ <real>4.0</real>
</array>
<array>
<string>sepia</string>
diff --git a/indra/newview/app_settings/filters/Spotlight.xml b/indra/newview/app_settings/filters/Spotlight.xml
index 203130bdeed..044b2c0b3a2 100644
--- a/indra/newview/app_settings/filters/Spotlight.xml
+++ b/indra/newview/app_settings/filters/Spotlight.xml
@@ -19,9 +19,15 @@
<real>1.5</real>
</array>
<array>
+ <string>stencil</string>
+ <string>vignette</string>
<string>fade</string>
+ <real>0.75</real>
<real>1.0</real>
- <real>0.25</real>
+ <real>0.0</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ <real>5.0</real>
</array>
<array>
<string>saturate</string>
@@ -36,7 +42,7 @@
</array>
<array>
<string>brighten</string>
- <real>30</real>
+ <real>0.1</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
diff --git a/indra/newview/app_settings/filters/Video.xml b/indra/newview/app_settings/filters/Video.xml
index 144f340f125..09c4c796381 100755
--- a/indra/newview/app_settings/filters/Video.xml
+++ b/indra/newview/app_settings/filters/Video.xml
@@ -9,19 +9,23 @@
</array>
<array>
<string>darken</string>
- <real>15.0</real>
+ <real>0.1</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
- <string>lines</string>
- <real>10.0</real>
+ <string>stencil</string>
+ <string>scanlines</string>
+ <string>blend</string>
+ <real>0.0</real>
+ <real>1.0</real>
+ <real>0.01</real>
<real>0.0</real>
</array>
<array>
<string>brighten</string>
- <real>30.0</real>
+ <real>0.1</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
--
GitLab