admin/phoenix-firestorm
1
0
Fork 0
mirror of https://github.com/FirestormViewer/phoenix-firestorm.git synced 2026-08-14 00:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Aligned FS Fixed Environment floater for sky and water to match day cycle floater and fixed other minor errors

Browse Source
This commit is contained in:
Hecklezz
2026-01-28 09:12:47 +10:00
parent 7f70b8bfbd
commit 499ec72553
5 changed files with 107 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
indra/newview/skins/default/xui/en/floater_fs_fixedenvironment.xml
+5 -5
View File
@@ -14,7 +14,7 @@
save_visibility="false"
help_topic="fs_fixed_environment"
single_instance="true"
width="288">
width="300">
<string name="edit_sky">Edit Sky:</string>
<string name="edit_water">Edit Water:</string>
<layout_stack name="floater_stack"
@@ -28,11 +28,11 @@
auto_resize="false"
user_resize="false"
height="23"
width="288">
width="300">
<text
follows="left|top"
top="5"
left="0"
left="5"
width="40"
height="15"
name="info_panel_label"
@@ -105,7 +105,7 @@
left="0"
orientation="horizontal"
top="0"
width="288">
width="300">
<layout_panel
follows="bottom|left|right"
height="25"
@@ -113,7 +113,7 @@
left="0"
mouse_opaque="false"
name="load_btn_lp"
width="288">
width="300">
<button
height="23"
indra/newview/skins/default/xui/en/panel_fs_settings_sky_atmos.xml
+29 -29
View File
@@ -20,7 +20,7 @@ top="0">
layout="topleft"
top_pad="3"
left="0"
width="288"
width="300"
height="22"
bg_alpha_color="EmphasisColor"
border_visible="true"
@@ -40,7 +40,7 @@ top="0">
layout="topleft"
top_pad="1"
left="3"
width="280"
width="292"
height="87"
border_visible="true"
background_visible="true">
@@ -65,7 +65,7 @@ top="0">
left_pad="0"
name="ambient_light"
top_delta="-5"
width="166" />
width="178" />
<text
name="blue_horizon_label"
@@ -87,7 +87,7 @@ top="0">
left_pad="0"
name="blue_horizon"
top_delta="-5"
width="166" />
width="178" />
<text
name="blue_density_label"
@@ -109,7 +109,7 @@ top="0">
left_pad="0"
name="blue_density"
top_delta="-5"
width="166" />
width="178" />
</panel>
<panel
@@ -118,7 +118,7 @@ top="0">
layout="topleft"
top_pad="3"
left="0"
width="288"
width="300"
height="22"
bg_alpha_color="EmphasisColor"
border_visible="true"
@@ -139,7 +139,7 @@ top="0">
layout="topleft"
top_pad="1"
left="3"
width="280"
width="292"
height="149"
border_visible="true"
background_visible="true">
@@ -151,15 +151,15 @@ top="0">
layout="topleft"
left="5"
top_pad="7"
width="100">
width="110">
Haze Horizon:
</text>
<slider
decimal_digits="3"
decimal_digits="2"
follows="left|top"
height="16"
increment="0.001"
increment="0.01"
initial_value="0"
layout="topleft"
min_val="0"
@@ -175,7 +175,7 @@ top="0">
height="15"
layout="topleft"
left="5"
width="100">
width="110">
Haze Density:
</text>
@@ -199,7 +199,7 @@ top="0">
height="15"
layout="topleft"
left="5"
width="100">
width="110">
Density Multiplier:
</text>
@@ -223,7 +223,7 @@ top="0">
height="15"
layout="topleft"
left="5"
width="100">
width="110">
Distance Multiplier:
</text>
@@ -247,12 +247,12 @@ top="0">
height="15"
layout="topleft"
left="5"
width="100">
Maximum Altitide:
width="110">
Maximum Altitude:
</text>
<slider
decimal_digits="1"
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
@@ -271,7 +271,7 @@ top="0">
height="15"
layout="topleft"
left="5"
width="100">
width="110">
Brightness:
</text>
@@ -279,10 +279,10 @@ top="0">
decimal_digits="2"
follows="left|top"
height="16"
increment="0.1"
increment="0.01"
initial_value="0"
layout="topleft"
max_val="100"
max_val="20"
name="scene_gamma"
left_pad="0"
width="171"
@@ -295,7 +295,7 @@ top="0">
layout="topleft"
left="5"
tool_tip="Irradiance control. When not zero, enables HDR lighting model."
width="100"
width="110"
word_wrap="true">
Reflection Probe Ambiance (HDR):
</text>
@@ -304,10 +304,10 @@ top="0">
decimal_digits="2"
follows="left|top"
height="16"
increment="0.5"
increment="0.01"
initial_value="0"
layout="topleft"
max_val="100"
max_val="10"
name="probe_ambiance"
left_pad="0"
width="171"
@@ -320,7 +320,7 @@ top="0">
layout="topleft"
top_pad="3"
left="0"
width="288"
width="300"
height="22"
bg_alpha_color="EmphasisColor"
border_visible="true"
@@ -343,7 +343,7 @@ top="0">
layout="topleft"
top_pad="1"
left="3"
width="280"
width="292"
height="63"
border_visible="true"
background_visible="true">
@@ -355,7 +355,7 @@ top="0">
layout="topleft"
left="5"
top_pad="7"
width="100">
width="110">
Moisture Level:
</text>
@@ -379,7 +379,7 @@ top="0">
height="15"
layout="topleft"
left="5"
width="100">
width="110">
Droplet Radius:
</text>
@@ -387,11 +387,11 @@ top="0">
decimal_digits="3"
follows="left|top"
height="16"
increment="0.001"
increment="0.01"
initial_value="0"
left_pad="0"
layout="topleft"
min_val="0"
min_val="5"
max_val="1000.0"
name="droplet_radius"
width="171"
@@ -403,7 +403,7 @@ top="0">
height="15"
layout="topleft"
left="5"
width="100">
width="110">
Ice Level:
</text>
indra/newview/skins/default/xui/en/panel_fs_settings_sky_clouds.xml
+17 -17
View File
@@ -16,7 +16,7 @@ top="0">
layout="topleft"
top_pad="3"
left="0"
width="288"
width="300"
height="22"
bg_alpha_color="EmphasisColor"
border_visible="true"
@@ -37,7 +37,7 @@ top="0">
layout="topleft"
top_pad="1"
left="3"
width="280"
width="292"
height="35"
border_visible="true"
background_visible="true">
@@ -61,7 +61,7 @@ top="0">
left_pad="0"
name="cloud_color"
top_delta="-5"
width="166" />
width="178" />
</panel>
<panel
@@ -70,7 +70,7 @@ top="0">
layout="topleft"
top_pad="1"
left="3"
width="280"
width="292"
height="63"
border_visible="true"
background_visible="true">
@@ -96,7 +96,7 @@ top="0">
max_val="1"
name="cloud_coverage"
left_pad="0"
width="171"
width="183"
can_edit_text="true"/>
<text
@@ -116,11 +116,11 @@ top="0">
increment="0.01"
initial_value="0"
layout="topleft"
min_val="0"
min_val="0.01"
max_val="3"
name="cloud_scale"
left_pad="0"
width="171"
width="183"
can_edit_text="true"/>
<text
@@ -144,7 +144,7 @@ top="0">
max_val="1.0"
name="cloud_variance"
left_pad="0"
width="171"
width="183"
can_edit_text="true"/>
</panel>
@@ -154,7 +154,7 @@ top="0">
layout="topleft"
top_pad="1"
left="3"
width="280"
width="292"
height="77"
border_visible="true"
background_visible="true">
@@ -194,7 +194,7 @@ top="0">
min_val="0"
max_val="1"
name="cloud_density_x"
width="255"
width="267"
can_edit_text="true"/>
<text
@@ -218,7 +218,7 @@ top="0">
min_val="0"
max_val="1"
name="cloud_density_y"
width="255"
width="267"
can_edit_text="true"/>
<text
@@ -242,7 +242,7 @@ top="0">
min_val="0"
max_val="3"
name="cloud_density_d"
width="255"
width="267"
can_edit_text="true"/>
</panel>
@@ -252,7 +252,7 @@ top="0">
layout="topleft"
top_pad="1"
left="3"
width="280"
width="292"
height="77"
border_visible="true"
background_visible="true">
@@ -291,7 +291,7 @@ top="0">
min_val="0"
max_val="1"
name="cloud_detail_x"
width="255"
width="267"
can_edit_text="true"/>
<text
@@ -315,7 +315,7 @@ top="0">
min_val="0"
max_val="1"
name="cloud_detail_y"
width="255"
width="267"
can_edit_text="true"/>
<text
@@ -339,7 +339,7 @@ top="0">
min_val="0"
max_val="1"
name="cloud_detail_d"
width="255"
width="267"
can_edit_text="true"/>
</panel>
@@ -349,7 +349,7 @@ top="0">
layout="topleft"
top_pad="1"
left="3"
width="280"
width="292"
height="103"
border_visible="true"
background_visible="true">
indra/newview/skins/default/xui/en/panel_fs_settings_sky_sunmoon.xml
+23 -23
View File
@@ -15,7 +15,7 @@ top="0">
layout="topleft"
top_pad="3"
left="0"
width="288"
width="300"
height="22"
bg_alpha_color="EmphasisColor"
border_visible="true"
@@ -36,7 +36,7 @@ top="0">
layout="topleft"
top_pad="5"
left="3"
width="280"
width="292"
height="35"
border_visible="true"
background_visible="true">
@@ -68,7 +68,7 @@ top="0">
layout="topleft"
top_pad="3"
left="0"
width="288"
width="300"
height="22"
bg_alpha_color="EmphasisColor"
border_visible="true"
@@ -89,8 +89,8 @@ top="0">
layout="topleft"
top_pad="1"
left="3"
width="280"
height="145"
width="292"
height="157"
border_visible="true"
background_visible="true">
@@ -145,7 +145,7 @@ top="0">
max_val="2"
name="glow_focus"
left_pad="0"
width="120"
width="132"
can_edit_text="true"/>
<text
@@ -167,9 +167,9 @@ top="0">
layout="topleft"
left_pad="0"
min_val="0"
max_val="10"
max_val="1.99"
name="glow_size"
width="120"
width="132"
can_edit_text="true"/>
<text
@@ -186,14 +186,14 @@ top="0">
decimal_digits="0"
follows="left|top"
height="16"
increment="1"
increment="0.01"
initial_value="0"
layout="topleft"
left_pad="0"
min_val="0"
max_val="50000"
max_val="500"
name="star_brightness"
width="120"
width="132"
can_edit_text="true"/>
<text
@@ -215,10 +215,10 @@ top="0">
initial_value="0"
layout="topleft"
left_pad="0"
min_val="0.0"
max_val="100"
min_val="0.25"
max_val="20"
name="sun_scale"
width="215"
width="227"
can_edit_text="true"/>
<text
@@ -242,7 +242,7 @@ top="0">
min_val="0"
max_val="359.99"
name="sun_azimuth"
width="215"
width="227"
can_edit_text="true"/>
<text
@@ -266,7 +266,7 @@ top="0">
max_val="90"
name="sun_elevation"
left_pad="0"
width="215"
width="227"
can_edit_text="true"/>
</panel>
@@ -276,7 +276,7 @@ top="0">
layout="topleft"
top_pad="3"
left="0"
width="288"
width="300"
height="22"
bg_alpha_color="EmphasisColor"
border_visible="true"
@@ -297,7 +297,7 @@ top="0">
layout="topleft"
top_pad="1"
left="3"
width="280"
width="292"
height="125"
border_visible="true"
background_visible="true">
@@ -351,10 +351,10 @@ top="0">
initial_value="0"
layout="topleft"
left_pad="0"
min_val="0"
min_val="0.25"
max_val="20"
name="moon_scale"
width="145"
width="157"
can_edit_text="true"/>
<text
@@ -378,7 +378,7 @@ top="0">
max_val="1.0"
name="moon_brightness"
left_pad="0"
width="145"
width="157"
can_edit_text="true"/>
<text
@@ -402,7 +402,7 @@ top="0">
min_val="0"
max_val="359.99"
name="moon_azimuth"
width="215"
width="227"
can_edit_text="true"/>
<text
@@ -426,7 +426,7 @@ top="0">
max_val="90"
name="moon_elevation"
left_pad="0"
width="215"
width="227"
can_edit_text="true"/>
</panel>
</panel>
indra/newview/skins/default/xui/en/panel_fs_settings_water.xml
+33 -33
View File
@@ -13,9 +13,9 @@ top="0">
label="Fog"
follows="left|top"
layout="topleft"
top_pad="0"
left="0"
width="280"
top_pad="1"
left="3"
width="292"
height="65"
border_visible="true"
background_visible="true">
@@ -70,9 +70,9 @@ top="0">
label="Fog"
follows="left|top"
layout="topleft"
top_pad="0"
left="0"
width="280"
top_pad="1"
left="3"
width="292"
height="80"
border_visible="true"
background_visible="true">
@@ -88,17 +88,17 @@ top="0">
</text>
<slider
decimal_digits="1"
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
min_val="-10"
max_val="10"
min_val="0"
max_val="100"
name="water_fog_density"
left_pad="0"
width="155"
width="167"
can_edit_text="true"/>
<text
@@ -122,7 +122,7 @@ top="0">
min_val="0.0"
max_val="20.0"
name="water_underwater_mod"
width="155"
width="167"
can_edit_text="true"/>
<text
@@ -144,7 +144,7 @@ top="0">
layout="topleft"
name="water_fresnel_scale"
left_pad="0"
width="155"
width="167"
can_edit_text="true"/>
<text
@@ -166,7 +166,7 @@ top="0">
layout="topleft"
left_pad="0"
name="water_fresnel_offset"
width="155"
width="167"
can_edit_text="true"/>
</panel>
@@ -175,9 +175,9 @@ top="0">
follows="left|top"
label="Wave"
layout="topleft"
top_pad="0"
left="0"
width="280"
top_pad="1"
left="3"
width="292"
height="180"
border_visible="true"
background_visible="true">
@@ -246,7 +246,7 @@ top="0">
Reflection Wavelet Scale
</text>
<slider
decimal_digits="1"
decimal_digits="2"
follows="left|top"
increment="0.01"
height="16"
@@ -257,10 +257,10 @@ top="0">
max_val="10"
name="water_normal_scale_x"
top_pad="0"
width="270"
width="282"
can_edit_text="true"/>
<slider
decimal_digits="1"
decimal_digits="2"
follows="left|top"
increment="0.01"
initial_value="0.7"
@@ -271,10 +271,10 @@ top="0">
name="water_normal_scale_y"
top_pad="5"
label="Y:"
width="270"
width="282"
can_edit_text="true"/>
<slider
decimal_digits="1"
decimal_digits="2"
follows="left|top"
increment="0.01"
initial_value="0.7"
@@ -285,7 +285,7 @@ top="0">
name="water_normal_scale_z"
top_pad="5"
label="Z:"
width="270"
width="282"
can_edit_text="true"/>
</panel>
@@ -294,9 +294,9 @@ top="0">
label="Refraction"
follows="left|top"
layout="topleft"
top_pad="0"
left="0"
width="280"
top_pad="1"
left="3"
width="292"
height="60"
border_visible="true"
background_visible="true">
@@ -306,8 +306,8 @@ top="0">
height="15"
layout="topleft"
left="5"
width="155">
Refract Above Scale (Above):
width="160">
Refract Scale (Above):
</text>
<slider
@@ -322,7 +322,7 @@ top="0">
max_val="3"
name="water_scale_above"
left_pad="0"
width="115"
width="122"
can_edit_text="true" />
<text
@@ -331,7 +331,7 @@ top="0">
height="15"
layout="topleft"
left="5"
width="155">
width="160">
Refract Scale (Below):
</text>
@@ -347,7 +347,7 @@ top="0">
min_val="0"
max_val="3"
name="water_scale_below"
width="115"
width="122"
can_edit_text="true"/>
<text
@@ -356,7 +356,7 @@ top="0">
height="15"
layout="topleft"
left="5"
width="155">
width="160">
Blur Multiplier:
</text>
@@ -367,11 +367,11 @@ top="0">
increment="0.001"
initial_value="0"
layout="topleft"
min_val="-0.5"
min_val="0"
max_val="0.5"
name="water_blur_multip"
left_pad="0"
width="115"
width="122"
can_edit_text="true"/>
</panel>
</panel>