Skip to content
Snippets Groups Projects
Commit cf856b2b authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Merge remote-tracking branch 'origin/Project-Lightbox'

parents 5709a896 3e5378a1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/skins/default/xui/en/floater_lightbox_settings.xml
+ 3
− 3
View file @ cf856b2b
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater <floater
width="360" width="360"
height="310" height="320"
layout="topleft" layout="topleft"
min_height="310" min_height="320"
min_width="360" min_width="360"
name="floater_lightbox_settings" name="floater_lightbox_settings"
positioning="cascading" positioning="cascading"
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
top_pad="0" top_pad="0"
enabled="true" enabled="true"
follows="left|top" follows="left|top"
height="300" height="320"
left_delta="0" left_delta="0"
mouse_opaque="false" mouse_opaque="false"
name="lightbox_tab_container" name="lightbox_tab_container"
......
indra/newview/skins/default/xui/en/panel_lightbox_image.xml
+ 338
− 166
View file @ cf856b2b
...@@ -2,116 +2,64 @@ ...@@ -2,116 +2,64 @@
<panel <panel
class="colortone_settings" class="colortone_settings"
layout="topleft" layout="topleft"
width="300" width="350"
height="175" height="310"
name="colortone_settings" name="colortone_settings"
can_resize="true"> can_resize="false">
<text
follows="top"
layout="top"
height="15"
left_delta="10"
top_pad="4"
width="70"
tool_tip="Controls SMAA Quality"
value="Anti-Aliasing:" />
<combo_box
follows="top|left"
layout="topleft"
height="16"
width="95"
left_delta="120"
top_pad="-16"
max_chars="128"
allow_text_entry="false"
tool_tip="Controls SMAA Quality"
control_name="RenderFSAASamples"
name="smaa_combo">
<combo_box.item
label="Disable"
name="smaa_off"
value="0" />
<combo_box.item
label="Low (x2)"
name="smaa_2"
value="2" />
<combo_box.item
label="Medium (x4)"
name="smaa_4"
value="4" />
<combo_box.item
label="High (x8)"
name="smaa_8"
value="8" />
<combo_box.item
label="Ultra (x16)"
name="smaa_16"
value="16" />
</combo_box>
<text <text
follows="left|top" follows="left|top"
height="15" height="15"
left="10" left="10"
top_pad="4" top_pad="4"
width="105" width="100"
layout="topleft" layout="topleft"
tool_tip="Controls Anisotropic Filtering Quality" value="Image Processing" />
value="Anisotropic Filtering:" /> <text
<combo_box follows="left|top"
height="15"
left="30"
top_pad="5"
width="50"
layout="topleft"
tool_tip="Which Sharpen method to use."
value="Sharpen:" />
<combo_box
allow_text_entry="false" allow_text_entry="false"
tool_tip="Controls Anisotropic Filtering Quality" tool_tip="Which Sharpen method to use."
control_name="RenderAnisotropicLevel" control_name="RenderSharpenMethod"
follows="left|top" follows="left|top"
height="16" height="16"
layout="topleft" layout="topleft"
left="130" left_delta="70"
max_chars="128" max_chars="128"
name="anisotropicfilter_combo" name="sharpenmethod_combo"
top_pad="-16" top_pad="-16"
width="95"> width="80">
<combo_box.item
label="Disable"
name="anisotropicfilter_off"
value="0" />
<combo_box.item
label="Low (x2)"
name="anisotropicfilter_2"
value="2" />
<combo_box.item <combo_box.item
label="Medium (x4)" label="None"
name="anisotropicfilter_4" name="sharp_none"
value="4" /> value="0" />
<combo_box.item <combo_box.item
label="High (x8)" label="CAS"
name="anisotropicfilter_8" name="sharp_cas"
value="8" /> value="1" />
<combo_box.item <combo_box.item
label="Ultra (x16)" label="DLS"
name="anisotropicfilter_16" name="sharp_DLS"
value="16" /> value="2" />
</combo_box> </combo_box>
<text
follows="left|top"
height="15"
left="10"
top_pad="4"
width="90"
layout="topleft"
tool_tip="(Default: 1.0) [DANGEROUS] Internal render resolution scale. Sharpening interacts poorly with this setting, disable it for best results."
value="Resolution Scale:" />
<slider_bar <slider_bar
top_pad="-18" top_pad="-18"
height="20" height="20"
increment=".1" increment=".1"
follows="left|top|right" follows="left|top|right"
layout="topleft" layout="topleft"
max_val="2" max_val="1.0"
min_val="0.1" min_val="0.0"
left="100" left_delta="80"
right="-75" right="-75"
name="resMult_slider" name="sharp_strength_slider"
tool_tip="(Default: 1.0) [DANGEROUS] Internal render resolution scale. Sharpening interacts poorly with this setting, disable it for best results." control_name=""/>
control_name="RenderResolutionMultiplier"/>
<spinner <spinner
top_pad="-20" top_pad="-20"
height="15" height="15"
...@@ -120,15 +68,14 @@ ...@@ -120,15 +68,14 @@
decimal_digits="1" decimal_digits="1"
follows="top|right" follows="top|right"
layout="topleft" layout="topleft"
max_val="3" max_val="1.0"
min_val="0.1" min_val="0.0"
width="55" width="55"
increment=".1" increment=".1"
name="resMult_spinner" name="sharp_strength_spinner"
tool_tip="(Default: 1.0) [DANGEROUS] Internal render resolution scale. Sharpening interacts poorly with this setting, disable it for best results." control_name=""/>
control_name="RenderResolutionMultiplier"/>
<button <button
name="resMult_default_btn" name="sharpen_default_btn"
follows="top|right" follows="top|right"
layout="topleft" layout="topleft"
height="22" height="22"
...@@ -144,24 +91,24 @@ ...@@ -144,24 +91,24 @@
<text <text
follows="left|top" follows="left|top"
height="15" height="15"
left="10" left="30"
top_pad="2" top_pad="4"
width="75" width="70"
layout="topleft" layout="topleft"
tool_tip="(Default: Uchimura) Which algorithm should translate HDR values to SDR Colorspace" tool_tip="(Default: Uchimura) Which algorithm should translate HDR values to SDR Colorspace"
value="Tonemapper:" /> value="Tonemapper:" />
<combo_box <combo_box
allow_text_entry="false" allow_text_entry="false"
tool_tip="(Default: Uchimura) Which algorithm should translate HDR values to SDR Colorspace" tool_tip="(Default: Uchimura) Which algorithm should translate HDR values to SDR Colorspace"
control_name="RenderToneMapType" control_name="RenderToneMapType"
follows="left|top" follows="left|top"
height="16" height="16"
layout="topleft" layout="topleft"
left="130" left_delta="70"
max_chars="128" max_chars="128"
name="tonemap_type_combo" name="tonemap_type_combo"
top_pad="-16" top_pad="-16"
width="95"> width="80">
<combo_box.item <combo_box.item
label="Linear" label="Linear"
name="toneLinear" name="toneLinear"
...@@ -199,15 +146,6 @@ ...@@ -199,15 +146,6 @@
name="toneUncharted" name="toneUncharted"
value="9" /> value="9" />
</combo_box> </combo_box>
<text
follows="left|top"
height="15"
left="30"
top_pad="4"
width="55"
layout="topleft"
tool_tip="(Default: 1.0) Adjusts the overall brightness of the image via the Tonemapper"
value="Exposure:" />
<slider_bar <slider_bar
top_pad="-18" top_pad="-18"
height="20" height="20"
...@@ -216,13 +154,13 @@ ...@@ -216,13 +154,13 @@
layout="topleft" layout="topleft"
max_val="16.0" max_val="16.0"
min_val="0.1" min_val="0.1"
left="100" left_delta="80"
right="-75" right="-75"
name="exposure_slider" name="exposure_slider"
tool_tip="(Default: 1.0) Adjusts the overall brightness of the image via the Tonemapper" tool_tip="(Default: 1.0) Adjusts the overall brightness of the image via the Tonemapper"
control_name="RenderToneMapExposure"/> control_name="RenderToneMapExposure"/>
<spinner <spinner
top_pad="-20" top_pad="-19"
height="15" height="15"
label_width="0" label_width="0"
right="-20" right="-20"
...@@ -250,11 +188,12 @@ ...@@ -250,11 +188,12 @@
<button.commit_callback <button.commit_callback
function="ClickDefault" /> function="ClickDefault" />
</button> </button>
<text
<text
follows="left|top" follows="left|top"
height="15" height="15"
left="10" left="30"
top_pad="2" top_pad="4"
width="60" width="60"
layout="topleft" layout="topleft"
tool_tip="What Colorgrading LUT (Look Up Texture) to be used to colorgrade the image. Custom LUTs require the full filename!" tool_tip="What Colorgrading LUT (Look Up Texture) to be used to colorgrade the image. Custom LUTs require the full filename!"
...@@ -264,13 +203,13 @@ ...@@ -264,13 +203,13 @@
tool_tip="What Colorgrading LUT (Look Up Texture) to be used to colorgrade the image. Custom LUTs require the full filename!" tool_tip="What Colorgrading LUT (Look Up Texture) to be used to colorgrade the image. Custom LUTs require the full filename!"
control_name="RenderColorGradeLUT" control_name="RenderColorGradeLUT"
follows="left|top" follows="left|top"
height="15" height="20"
layout="topleft" layout="topleft"
right="-20" right="-2"
max_chars="200" max_chars="200"
name="colorlut_combo" name="colorlut_combo"
top_pad="-15" top_pad="-18"
width="180"> width="248">
<combo_box.item <combo_box.item
label="Neutral" label="Neutral"
name="lut_neutral" name="lut_neutral"
...@@ -372,91 +311,324 @@ ...@@ -372,91 +311,324 @@
name="lut_AST5" name="lut_AST5"
value="AESTHETICS_5.png" /> value="AESTHETICS_5.png" />
</combo_box> </combo_box>
<text <view_border
bevel_style="none"
height="0"
layout="topleft"
left="15"
name="render_divider"
top_pad="7"
width="275"/>
<text
follows="left|top" follows="left|top"
height="15" height="15"
left="10" left="10"
top_pad="7"
width="100"
layout="topleft"
value="Rendering Settings" />
<text
follows="left|top"
height="15"
left="30"
top_pad="4" top_pad="4"
width="90" width="90"
layout="topleft" layout="topleft"
tool_tip="Which Contrast-Aware Sharpen(CAS) method to use. FidelityFX: AMD's method, nVidia DLS: nVidia's method. Requires Anti-Aliasing to be enabled!" tool_tip="Controls SMAA Quality"
value="Sharpen Method:" /> value="Anti-Aliasing:" />
<combo_box <combo_box
follows="top|left"
layout="topleft"
height="16"
width="150"
right="-2"
top_pad="-16"
max_chars="128"
allow_text_entry="false" allow_text_entry="false"
tool_tip="Which Contrast-Aware Sharpen(CAS) method to use. FidelityFX: AMD's method, nVidia DLS: nVidia's method. Requires Anti-Aliasing to be enabled!" tool_tip="Controls SMAA Quality"
control_name="RenderSharpenMethod" control_name="RenderFSAASamples"
name="smaa_combo">
<combo_box.item
label="Disable"
name="smaa_off"
value="0" />
<combo_box.item
label="Low (x2)"
name="smaa_2"
value="2" />
<combo_box.item
label="Medium (x4)"
name="smaa_4"
value="4" />
<combo_box.item
label="High (x8)"
name="smaa_8"
value="8" />
<combo_box.item
label="Ultra (x16)"
name="smaa_16"
value="16" />
</combo_box>
<text
follows="left|top"
height="15"
left="30"
top_pad="4"
width="120"
layout="topleft"
tool_tip="Controls Anisotropic Filtering Quality"
value="Anisotropic Filtering:" />
<combo_box
allow_text_entry="false"
tool_tip="Controls Anisotropic Filtering Quality"
control_name="RenderAnisotropicLevel"
follows="left|top" follows="left|top"
height="16" height="16"
layout="topleft" layout="topleft"
left="130" right="-2"
max_chars="128" max_chars="128"
name="sharpenmethod_combo" name="anisotropicfilter_combo"
top_pad="-16" top_pad="-16"
width="95"> width="150">
<combo_box.item <combo_box.item
label="Disable" label="Disable"
name="sharp_none" name="anisotropicfilter_off"
value="0" /> value="0" />
<combo_box.item <combo_box.item
label="FidelityFX" label="Low (x2)"
name="sharp_amdfx" name="anisotropicfilter_2"
value="1" /> value="2" />
<combo_box.item <combo_box.item
label="nVidia DLS" label="Medium (x4)"
name="sharp_nv" name="anisotropicfilter_4"
value="2" /> value="4" />
</combo_box> <combo_box.item
label="High (x8)"
name="anisotropicfilter_8"
value="8" />
<combo_box.item
label="Ultra (x16)"
name="anisotropicfilter_16"
value="16" />
</combo_box>
<text
follows="left|top"
height="15"
left="30"
top_pad="3"
width="90"
layout="topleft"
value="Reflections:" />
<combo_box
control_name="RenderReflectionDetail"
height="16"
layout="topleft"
right="-2"
top_delta="0"
name="Reflections"
width="150">
<combo_box.item
label="None; opaque"
name="0"
value="-2"/>
<combo_box.item
label="None; transparent"
name="0"
value="-1"/>
<combo_box.item
label="Minimal"
name="0"
value="0"/>
<combo_box.item
label="Terrain and trees"
name="1"
value="1"/>
<combo_box.item
label="All static objects"
name="2"
value="2"/>
<combo_box.item
label="All avatars and objects"
name="3"
value="3"/>
<combo_box.item
label="Everything"
name="4"
value="4"/>
</combo_box>
<text <text
follows="left|top" follows="left|top"
height="15" height="15"
left="30" left="30"
top_pad="4" top_pad="4"
width="50" width="90"
layout="topleft" layout="topleft"
tool_tip="NOT YET IMPLEMENTED!" tool_tip="(Default: 1.0) [DANGEROUS] Internal render resolution scale. Sharpening interacts poorly with this setting, disable it for best results."
value="Strength:" /> value="Resolution Scale:" />
<slider_bar <slider_bar
enabled="false"
top_pad="-18" top_pad="-18"
height="20" height="20"
increment=".1" increment=".1"
follows="left|top|right" follows="left|top|right"
layout="topleft" layout="topleft"
max_val="1" max_val="2"
min_val="0" min_val=".5"
left="100" left="120"
right="-75" right="-55"
name="sharp_strength_slider" name="resMult_slider"
tool_tip="NOT YET IMPLEMENTED!" tool_tip="(Default: 1.0) [DANGEROUS] Internal render resolution scale. Sharpening interacts poorly with this setting, disable it for best results."
control_name=""/> control_name="RenderResolutionMultiplier"/>
<spinner <spinner
enabled="false"
top_pad="-20" top_pad="-20"
height="15" height="15"
label_width="0" label_width="0"
right="-20" right="-2"
decimal_digits="1" decimal_digits="1"
follows="top|right" follows="top|right"
layout="topleft" layout="topleft"
max_val="1" max_val="3"
min_val="0" min_val=".5"
width="55" width="55"
increment=".1" increment=".1"
name="sharp_strength_spinner" name="resMult_spinner"
tool_tip="NOT YET IMPLEMENTED!" tool_tip="(Default: 1.0) [DANGEROUS] Internal render resolution scale. Sharpening interacts poorly with this setting, disable it for best results."
control_name=""/> control_name="RenderResolutionMultiplier"/>
<button <text
name="sharpen_default_btn" follows="left|top"
height="15"
left="30"
top_pad="8"
width="90"
layout="topleft"
value="Draw Distance:" />
<slider_bar
top_pad="-18"
height="20"
increment="32"
follows="left|top|right"
layout="topleft"
max_val="1024"
min_val="32"
left="120"
right="-55"
name="draw_dist_slider_bar"
control_name="RenderFarClip"/>
<spinner
top_pad="-20"
height="15"
label_width="0"
right="-2"
decimal_digits="0"
follows="top|right" follows="top|right"
layout="topleft" layout="topleft"
height="22" max_val="1024"
left_delta="55" min_val="32"
top_pad="-15" width="55"
width="18" increment="32"
scale_image="true" name="draw_dist_spinner"
image_overlay="Refresh_Off" control_name="RenderFarClip"/>
image_overlay_alignment="center"> <text
<button.commit_callback follows="left|top"
function="ClickDefault" /> height="15"
</button> left="30"
top_pad="8"
width="90"
layout="topleft"
value="Object LOD:" />
<slider_bar
top_pad="-18"
height="20"
increment=".1"
follows="left|top|right"
layout="topleft"
max_val="4.0"
min_val="1.0"
left="120"
right="-55"
name="lod_slider_bar"
control_name="RenderVolumeLODFactor"/>
<spinner
top_pad="-20"
height="15"
label_width="0"
right="-2"
decimal_digits="1"
follows="top|right"
layout="topleft"
max_val="4.0"
min_val="1.0"
width="55"
increment=".1"
name="lod_spinner"
control_name="RenderVolumeLODFactor"/>
<text
follows="left|top"
height="15"
left="30"
top_pad="8"
width="90"
layout="topleft"
value="Max Particles:" />
<slider_bar
top_pad="-18"
height="20"
increment="256"
follows="left|top|right"
layout="topleft"
max_val="8192"
min_val="0"
left="120"
right="-55"
name="max_particles_slider_bar"
control_name="RenderMaxPartCount"/>
<spinner
top_pad="-20"
height="15"
label_width="0"
right="-2"
decimal_digits="0"
follows="top|right"
layout="topleft"
max_val="8192"
min_val="0"
width="55"
increment="256"
name="max_particles_spinner"
control_name="RenderMaxPartCount"/>
<text
follows="left|top"
height="15"
left="30"
top_pad="8"
width="90"
layout="topleft"
value="Max Avatars:" />
<slider_bar
top_pad="-18"
height="20"
increment="1"
follows="left|top|right"
layout="topleft"
max_val="65"
min_val="0"
left="120"
right="-55"
name="max_avatar_slider_bar"
control_name="RenderAvatarMaxNonImpostors"/>
<spinner
top_pad="-20"
height="15"
label_width="0"
right="-2"
decimal_digits="0"
follows="top|right"
layout="topleft"
max_val="65"
min_val="0"
width="55"
increment="1"
name="max_avatar_spinner"
control_name="RenderAvatarMaxNonImpostors"/>
</panel> </panel>
indra/newview/skins/default/xui/en/panel_lightbox_shadow.xml
+ 51
− 42
View file @ cf856b2b
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
class="shadow_settings" class="shadow_settings"
layout="topleft" layout="topleft"
width="350" width="350"
height="275" height="285"
name="shadow_settings"> name="shadow_settings">
<text <text
follows="left|top" follows="left|top"
...@@ -44,49 +44,58 @@ ...@@ -44,49 +44,58 @@
height="15" height="15"
left="30" left="30"
top_pad="4" top_pad="4"
width="90" width="110"
layout="topleft" layout="topleft"
tool_tip="(Default: Medium) Controls how detailed shadows are. Settings above 'Medium' are extremely demanding!" tool_tip="(Default: 1.0) Multiplier for shadowmap resolution. Use number input to override safe limits. High multipliers may overload and crash GPU drivers, especially on VRAM-limited systems!"
value="Shadow Quality: " /> value="Shadow Resolution: " />
<combo_box <slider_bar
allow_text_entry="false" top_pad="-18"
tool_tip="(Default: Medium) Controls how detailed shadows are. Settings above 'Medium' are extremely demanding!" height="20"
control_name="RenderShadowResolutionScale" increment=".1"
follows="left|top" follows="left|top|right"
height="16"
layout="topleft" layout="topleft"
left="130" max_val="2"
max_chars="128" min_val=".5"
name="shadowquality_combo" left="140"
top_pad="-16" right="-75"
width="80"> name="shadowres_slider"
<combo_box.item tool_tip="(Default: 1.0) Multiplier for shadowmap resolution. Use number input to override safe limits. High multipliers may overload and crash GPU drivers, especially on VRAM-limited systems!"
label="Low" control_name="RenderShadowResolutionScale"/>
name="shadow_low" <spinner
value="0.5" /> top_pad="-20"
<combo_box.item height="15"
label="Medium" label_width="0"
name="shadow_med" right="-20"
value="1.000" /> decimal_digits="1"
<combo_box.item follows="top|right"
label="High" layout="topleft"
name="shadow_high" max_val="4"
value="2.0" /> min_val=".5"
<combo_box.item width="55"
label="Very High" increment=".1"
name="shadow_vhigh" name="shadowres_spinner"
value="3.0" /> tool_tip="(Default: 1.0) Multiplier for shadowmap resolution. Use number input to override safe limits. High multipliers may overload and crash GPU drivers, especially on VRAM-limited systems!"
<combo_box.item control_name="RenderShadowResolutionScale"/>
label="Ultra" <button
name="shadow_ultra" name="shadowRes_default_btn"
value="4.0" /> follows="top|right"
</combo_box> layout="topleft"
height="22"
left_delta="55"
top_pad="-15"
width="18"
scale_image="true"
image_overlay="Refresh_Off"
image_overlay_alignment="center">
<button.commit_callback
function="ClickDefault" />
</button>
<text <text
follows="left|top" follows="left|top"
height="15" height="15"
left="30" left="30"
top_pad="3" top_pad="3"
width="70" width="110"
layout="topleft" layout="topleft"
tool_tip="(Default: -0.03) Reduces self-shadowing errors by ignoring faces too close to the shadow's origins. Smaller values allow more fine/accurate shadows at the cost of more shadow errors." tool_tip="(Default: -0.03) Reduces self-shadowing errors by ignoring faces too close to the shadow's origins. Smaller values allow more fine/accurate shadows at the cost of more shadow errors."
value="Shadow Bias:" /> value="Shadow Bias:" />
...@@ -137,7 +146,7 @@ ...@@ -137,7 +146,7 @@
height="15" height="15"
left="30" left="30"
top_pad="3" top_pad="3"
width="80" width="110"
layout="topleft" layout="topleft"
tool_tip="(Default: -0.01) Used to reduce shadow errors by offsetting the entire shadowmap. Smaller values allow more accurate shadows and less light bleed from thin objects at the cost of possible shadow errors at extreme angles from source." tool_tip="(Default: -0.01) Used to reduce shadow errors by offsetting the entire shadowmap. Smaller values allow more accurate shadows and less light bleed from thin objects at the cost of possible shadow errors at extreme angles from source."
value="Shadow Offset:" /> value="Shadow Offset:" />
...@@ -188,7 +197,7 @@ ...@@ -188,7 +197,7 @@
height="15" height="15"
left="30" left="30"
top_pad="3" top_pad="3"
width="90" width="110"
layout="topleft" layout="topleft"
tool_tip="(Default: 0.0) Reduces self-shadowing errors by ignoring faces too close to the shadow's origins. Smaller values allow more fine/accurate shadows at the cost of more shadow errors." tool_tip="(Default: 0.0) Reduces self-shadowing errors by ignoring faces too close to the shadow's origins. Smaller values allow more fine/accurate shadows at the cost of more shadow errors."
value="Spot Shadow Bias:" /> value="Spot Shadow Bias:" />
...@@ -239,7 +248,7 @@ ...@@ -239,7 +248,7 @@
height="15" height="15"
left="30" left="30"
top_pad="3" top_pad="3"
width="105" width="110"
layout="topleft" layout="topleft"
tool_tip="(Default: 0.15) Used to reduce shadow errors by offsetting the entire projector shadowmap. Smaller values allow more accurate shadows and less light bleed from thin objects at the cost of possible shadow errors at extreme angles from source." tool_tip="(Default: 0.15) Used to reduce shadow errors by offsetting the entire projector shadowmap. Smaller values allow more accurate shadows and less light bleed from thin objects at the cost of possible shadow errors at extreme angles from source."
value="Spot Shadow Offset:" /> value="Spot Shadow Offset:" />
...@@ -290,7 +299,7 @@ ...@@ -290,7 +299,7 @@
height="15" height="15"
left="30" left="30"
top_pad="3" top_pad="3"
width="70" width="110"
layout="topleft" layout="topleft"
tool_tip="(Default: 3.0) Controls both Shadow and SSAO blurring. Low values may cause SSAO noise to become apparent." tool_tip="(Default: 3.0) Controls both Shadow and SSAO blurring. Low values may cause SSAO noise to become apparent."
value="Shadow Blur:" /> value="Shadow Blur:" />
...@@ -341,7 +350,7 @@ ...@@ -341,7 +350,7 @@
height="15" height="15"
left="30" left="30"
top_pad="3" top_pad="3"
width="75" width="110"
layout="topleft" layout="topleft"
tool_tip="(Default: 0.0) Controls how far away from the camera should blurring occur. Larger values reduce blur near the camera. Try using this for shadow sharpening if you encounter SSAO noise when lowering Shadow Blur!" tool_tip="(Default: 0.0) Controls how far away from the camera should blurring occur. Larger values reduce blur near the camera. Try using this for shadow sharpening if you encounter SSAO noise when lowering Shadow Blur!"
value="Blur Distance:" /> value="Blur Distance:" />
......
indra/newview/skins/default/xui/en/panel_lightbox_ssao.xml
+ 4
− 4
View file @ cf856b2b
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
height="15" height="15"
left="30" left="30"
top_pad="4" top_pad="4"
width="130" width="110"
layout="topleft" layout="topleft"
tool_tip="NYI!" tool_tip="NYI!"
value="SSAO Strength:" /> value="SSAO Strength:" />
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
height="15" height="15"
left="30" left="30"
top_pad="3" top_pad="3"
width="130" width="110"
layout="topleft" layout="topleft"
tool_tip="(Default: 5.0) Occlusion sensitivity factor, larger = more." tool_tip="(Default: 5.0) Occlusion sensitivity factor, larger = more."
value="SSAO Factor:" /> value="SSAO Factor:" />
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
height="15" height="15"
left="30" left="30"
top_pad="3" top_pad="3"
width="130" width="110"
layout="topleft" layout="topleft"
tool_tip="(Default: 1500) Determines distance from surface to check for occlusion. Higher = Wider occlusion NOTE: Large values may produce artifacts." tool_tip="(Default: 1500) Determines distance from surface to check for occlusion. Higher = Wider occlusion NOTE: Large values may produce artifacts."
value="SSAO Scale:" /> value="SSAO Scale:" />
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
height="15" height="15"
left="30" left="30"
top_pad="3" top_pad="3"
width="130" width="110"
layout="topleft" layout="topleft"
tool_tip="(Default: 400) Determines max screen radius to use for occlusion. NOTE: Large values may produce artifacts." tool_tip="(Default: 400) Determines max screen radius to use for occlusion. NOTE: Large values may produce artifacts."
value="SSAO Max Scale:" /> value="SSAO Max Scale:" />
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment