diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-02-13 15:15:05 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-02-13 15:15:05 -0800 |
| commit | a5366f06edf5aa1b75328e26011989eba7c601ca (patch) | |
| tree | d59e759007efd85c03befc5a987dd6cb2dfbfc24 /indra/newview/app_settings | |
| parent | f95529b3f309f3ff24851697728c6c94a3218a2a (diff) | |
ACME-1277 : Final set of filters, added a SnapshotFiltersEnabled debug setting
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/filters/Autocontrast.xml | 11 | ||||
| -rw-r--r-- | indra/newview/app_settings/filters/JulesVerne.xml | 20 | ||||
| -rw-r--r-- | indra/newview/app_settings/filters/LensFlare.xml | 131 | ||||
| -rwxr-xr-x | indra/newview/app_settings/filters/Miniature.xml | 118 | ||||
| -rw-r--r-- | indra/newview/app_settings/filters/Overcast.xml | 24 | ||||
| -rw-r--r-- | indra/newview/app_settings/filters/Spotlight.xml | 38 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/app_settings/filters/Toycamera.xml (renamed from indra/newview/app_settings/filters/Heatwave.xml) | 36 | ||||
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 11 |
8 files changed, 310 insertions, 79 deletions
diff --git a/indra/newview/app_settings/filters/Autocontrast.xml b/indra/newview/app_settings/filters/Autocontrast.xml new file mode 100755 index 0000000000..ec3d7561bd --- /dev/null +++ b/indra/newview/app_settings/filters/Autocontrast.xml @@ -0,0 +1,11 @@ +<llsd> + <array> + <array> + <string>linearize</string> + <real>0.01</real> + <real>1.0</real> + <real>1.0</real> + <real>1.0</real> + </array> + </array> +</llsd> diff --git a/indra/newview/app_settings/filters/JulesVerne.xml b/indra/newview/app_settings/filters/JulesVerne.xml deleted file mode 100644 index 981e221da9..0000000000 --- a/indra/newview/app_settings/filters/JulesVerne.xml +++ /dev/null @@ -1,20 +0,0 @@ -<llsd> - <array> - <array> - <string>linearize</string> - <real>0.1</real> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - <array> - <string>grayscale</string> - </array> - <array> - <string>screen</string> - <string>line</string> - <real>0.02</real> - <real>0.0</real> - </array> - </array> -</llsd> diff --git a/indra/newview/app_settings/filters/LensFlare.xml b/indra/newview/app_settings/filters/LensFlare.xml new file mode 100644 index 0000000000..0b5af9c82b --- /dev/null +++ b/indra/newview/app_settings/filters/LensFlare.xml @@ -0,0 +1,131 @@ +<llsd> + <array> + <array> + <string>linearize</string> + <real>0.01</real> + <real>1.0</real> + <real>1.0</real> + <real>1.0</real> + </array> + <array> + <string>stencil</string> + <string>gradient</string> + <string>add</string> + <real>1.0</real> + <real>0.0</real> + <real>-1.0</real> + <real>1.0</real> + <real>1.0</real> + <real>-1.0</real> + </array> + <array> + <string>colorize</string> + <real>1.0</real> + <real>1.0</real> + <real>1.0</real> + <real>0.1</real> + <real>0.1</real> + <real>0.0</real> + </array> + <array> + <string>stencil</string> + <string>vignette</string> + <string>add</string> + <real>0.0</real> + <real>1.0</real> + <real>-1.0</real> + <real>1.0</real> + <real>1.5</real> + <real>5.0</real> + </array> + <array> + <string>colorize</string> + <real>1.0</real> + <real>1.0</real> + <real>1.0</real> + <real>0.6</real> + <real>0.0</real> + <real>0.0</real> + </array> + <array> + <string>stencil</string> + <string>vignette</string> + <string>add</string> + <real>0.0</real> + <real>1.0</real> + <real>-1.0</real> + <real>1.0</real> + <real>1.0</real> + <real>5.0</real> + </array> + <array> + <string>colorize</string> + <real>1.0</real> + <real>1.0</real> + <real>1.0</real> + <real>0.6</real> + <real>0.6</real> + <real>0.0</real> + </array> + <array> + <string>stencil</string> + <string>vignette</string> + <string>add</string> + <real>0.0</real> + <real>0.5</real> + <real>0.5</real> + <real>-0.5</real> + <real>0.10</real> + <real>20.0</real> + </array> + <array> + <string>colorize</string> + <real>1.0</real> + <real>1.0</real> + <real>1.0</real> + <real>0.7</real> + <real>0.0</real> + <real>0.0</real> + </array> + <array> + <string>stencil</string> + <string>vignette</string> + <string>add</string> + <real>0.0</real> + <real>0.5</real> + <real>0.6</real> + <real>-0.6</real> + <real>0.05</real> + <real>20.0</real> + </array> + <array> + <string>colorize</string> + <real>1.0</real> + <real>1.0</real> + <real>1.0</real> + <real>0.7</real> + <real>0.0</real> + <real>0.0</real> + </array> + <array> + <string>stencil</string> + <string>vignette</string> + <string>add</string> + <real>0.0</real> + <real>0.5</real> + <real>0.4</real> + <real>-0.4</real> + <real>0.025</real> + <real>20.0</real> + </array> + <array> + <string>colorize</string> + <real>1.0</real> + <real>1.0</real> + <real>1.0</real> + <real>0.7</real> + <real>0.0</real> + <real>0.0</real> + </array> + </array> +</llsd> diff --git a/indra/newview/app_settings/filters/Miniature.xml b/indra/newview/app_settings/filters/Miniature.xml new file mode 100755 index 0000000000..9aa8a87c6f --- /dev/null +++ b/indra/newview/app_settings/filters/Miniature.xml @@ -0,0 +1,118 @@ +<llsd> + <array> + <array> + <string>linearize</string> + <real>0.02</real> + <real>1.0</real> + <real>1.0</real> + <real>1.0</real> + </array> + <array> + <string>contrast</string> + <real>1.02</real> + <real>1.0</real> + <real>1.0</real> + <real>1.0</real> + </array> + <array> + <string>saturate</string> + <real>1.2</real> + </array> + <array> + <string>stencil</string> + <string>vignette</string> + <string>blend</string> + <real>0.0</real> + <real>0.25</real> + <real>0.0</real> + <real>0.0</real> + <real>0.25</real> + <real>2.0</real> + </array> + <array> + <string>sharpen</string> + </array> + <array> + <string>stencil</string> + <string>gradient</string> + <string>blend</string> + <real>1.0</real> + <real>0.0</real> + <real>0.0</real> + <real>-1.0</real> + <real>0.0</real> + <real>-0.25</real> + </array> + <array> + <string>blur</string> + </array> + <array> + <string>blur</string> + </array> + <array> + <string>blur</string> + </array> + <array> + <string>blur</string> + </array> + <array> + <string>blur</string> + </array> + <array> + <string>blur</string> + </array> + <array> + <string>blur</string> + </array> + <array> + <string>blur</string> + </array> + <array> + <string>blur</string> + </array> + <array> + <string>blur</string> + </array> + <array> + <string>stencil</string> + <string>gradient</string> + <string>blend</string> + <real>1.0</real> + <real>0.0</real> + <real>0.0</real> + <real>1.0</real> + <real>0.0</real> + <real>0.25</real> + </array> + <array> + <string>blur</string> + </array> + <array> + <string>blur</string> + </array> + <array> + <string>blur</string> + </array> + <array> + <string>blur</string> + </array> + <array> + <string>blur</string> + </array> + <array> + <string>blur</string> + </array> + <array> + <string>blur</string> + </array> + <array> + <string>blur</string> + </array> + <array> + <string>blur</string> + </array> + <array> + <string>blur</string> + </array> + </array> +</llsd>
\ No newline at end of file diff --git a/indra/newview/app_settings/filters/Overcast.xml b/indra/newview/app_settings/filters/Overcast.xml deleted file mode 100644 index dce5ab3e9e..0000000000 --- a/indra/newview/app_settings/filters/Overcast.xml +++ /dev/null @@ -1,24 +0,0 @@ -<llsd> - <array> - <array> - <string>linearize</string> - <real>0.1</real> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - <array> - <string>colorize</string> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - <real>0.0</real> - <real>0.3</real> - <real>0.0</real> - </array> - <array> - <string>saturate</string> - <real>0.35</real> - </array> - </array> -</llsd> diff --git a/indra/newview/app_settings/filters/Spotlight.xml b/indra/newview/app_settings/filters/Spotlight.xml index 044b2c0b3a..0e2e0ad68c 100644 --- a/indra/newview/app_settings/filters/Spotlight.xml +++ b/indra/newview/app_settings/filters/Spotlight.xml @@ -2,47 +2,43 @@ <array> <array> <string>linearize</string> - <real>0.1</real> + <real>0.0</real> + <real>1.0</real> <real>1.0</real> <real>1.0</real> + </array> + <array> + <string>stencil</string> + <string>vignette</string> + <string>add</string> + <real>0.0</real> + <real>0.4</real> + <real>0.0</real> + <real>0.0</real> <real>1.0</real> + <real>2.0</real> </array> <array> <string>contrast</string> - <real>0.8</real> <real>1.0</real> <real>1.0</real> <real>1.0</real> - </array> - <array> - <string>saturate</string> - <real>1.5</real> + <real>1.0</real> </array> <array> <string>stencil</string> <string>vignette</string> - <string>fade</string> - <real>0.75</real> - <real>1.0</real> + <string>add</string> + <real>-0.8</real> + <real>0.0</real> <real>0.0</real> <real>0.0</real> <real>1.0</real> - <real>5.0</real> - </array> - <array> - <string>saturate</string> - <real>0.8</real> + <real>2.0</real> </array> <array> <string>contrast</string> - <real>1.1</real> - <real>1.0</real> - <real>1.0</real> <real>1.0</real> - </array> - <array> - <string>brighten</string> - <real>0.1</real> <real>1.0</real> <real>1.0</real> <real>1.0</real> diff --git a/indra/newview/app_settings/filters/Heatwave.xml b/indra/newview/app_settings/filters/Toycamera.xml index a99f41c833..4e76f6b2fb 100644..100755 --- a/indra/newview/app_settings/filters/Heatwave.xml +++ b/indra/newview/app_settings/filters/Toycamera.xml @@ -1,15 +1,29 @@ <llsd> <array> <array> + <string>stencil</string> + <string>vignette</string> + <string>fade</string> + <real>0.0</real> + <real>1.0</real> + <real>0.0</real> + <real>0.0</real> + <real>1.2</real> + <real>3.0</real> + </array> + <array> <string>linearize</string> - <real>0.1</real> + <real>0.05</real> <real>1.0</real> <real>1.0</real> <real>1.0</real> </array> <array> + <string>grayscale</string> + </array> + <array> <string>contrast</string> - <real>0.8</real> + <real>1.1</real> <real>1.0</real> <real>1.0</real> <real>1.0</real> @@ -17,22 +31,16 @@ <array> <string>stencil</string> <string>vignette</string> - <string>fade</string> - <real>0.5</real> + <string>blend</string> <real>1.0</real> <real>0.0</real> <real>0.0</real> - <real>1.0</real> - <real>4.0</real> + <real>0.0</real> + <real>0.5</real> + <real>2.0</real> </array> <array> - <string>colorize</string> - <real>1.0</real> - <real>0.0</real> - <real>1.0</real> - <real>0.4</real> - <real>0.0</real> - <real>0.2</real> + <string>blur</string> </array> </array> -</llsd> +</llsd>
\ No newline at end of file diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index afc4ac617c..43c82c3005 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11268,6 +11268,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>SnapshotFiltersEnabled</key> + <map> + <key>Comment</key> + <string>Enable filters in the Snapshot Advanced panel (experimental).</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>SnapshotFormat</key> <map> <key>Comment</key> |