From 53b0ee242d6b9f769a81743a52fa89e065bb7657 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 21 Jun 2020 14:27:24 +0100 Subject: [PATCH] add a 3 to 1 daycycle and make it the default --- .../World/LightShare/EnvironmentModule.cs | 5 ++++- bin/assets/SettingsAssetSet/DefaultDaycycle.xml | 1 - bin/assets/SettingsAssetSet/SettingsAssetSet.xml | 9 ++++++++- bin/inventory/SettingsLibrary/Items.xml | 13 ++++++++++++- 4 files changed, 24 insertions(+), 4 deletions(-) delete mode 100644 bin/assets/SettingsAssetSet/DefaultDaycycle.xml diff --git a/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs b/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs index 2e9d14740d..68fb6b1a4f 100644 --- a/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs +++ b/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs @@ -65,7 +65,10 @@ namespace OpenSim.Region.CoreModules.World.LightShare private ILandChannel m_landChannel; private static ViewerEnvironment m_DefaultEnv = null; - private static readonly string m_defaultDayAssetID = "5646d39e-d3d7-6aff-ed71-30fc87d64a91"; + // 1/1 night day ratio + //private static readonly string m_defaultDayAssetID = "5646d39e-d3d7-6aff-ed71-30fc87d64a91"; + // 3/1 night day ratio + private static readonly string m_defaultDayAssetID = "5646d39e-d3d7-6aff-ed71-30fc87d64a92"; private int m_regionEnvVersion = -1; diff --git a/bin/assets/SettingsAssetSet/DefaultDaycycle.xml b/bin/assets/SettingsAssetSet/DefaultDaycycle.xml deleted file mode 100644 index 1a3dac446d..0000000000 --- a/bin/assets/SettingsAssetSet/DefaultDaycycle.xml +++ /dev/null @@ -1 +0,0 @@ -frames10809890408763334407absorption_configconstant_term1exp_scale0exp_term0linear_term0width0constant_term1exp_scale0exp_term0linear_term0width0bloom_id3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3befcloud_color0.22615399956703186035156250.22615399956703186035156250.2261539995670318603515625cloud_id1dc1368f-e8fe-f02d-a08d-9d9f11c1af6bcloud_pos_density110.5260969996452331542968750.87999999523162841796875cloud_pos_density210.5260969996452331542968750.125cloud_scale0.4199999868869781494140625cloud_scroll_rate0.499400138854980468750.0109996795654296875cloud_shadow0.269999980926513671875cloud_variance0dome_offset0.959999978542327880859375dome_radius15000droplet_radius800flags0gamma1glow50.001000000047497451305389404-0.4799999892711639404296875halo_idice_level0legacy_hazeambient0.20405027270317077636718750.24246673285961151123046880.329999983310699462890625blue_density0.4499999880790710449218750.4499999880790710449218750.449999988079071044921875blue_horizon0.23999999463558197021484380.23999999463558197021484380.2399999946355819702148438density_multiplier0.0001590000028954818844795227distance_multiplier9.999999747378751635551453e-05haze_density4haze_horizon0max_y906.20001220703125mie_configanisotropy0.800000011920928955078125constant_term0exp_scale-0.0008333333535119891166687012exp_term1linear_term0width0moisture_level0moon_brightness0.5moon_idec4b9f0b-d008-45c6-96a4-01dd947ac621moon_rotation0-0.707107007503509521484375-4.028524611338415994943318e-140.70710647106170654296875moon_scale1planet_radius6360rainbow_id11b4c57c-56b3-04ed-1f82-2004363882e4rayleigh_configconstant_term0exp_scale-0.0001250000059371814131736755exp_term1linear_term0width0sky_bottom_radius6360sky_top_radius6420star_brightness500sun_arc_radians0.0004499999922700226306915283sun_idsun_rotation00.70710653066635131835937500.70710694789886474609375sun_scale1sunlight_color0.348766922950744628906250.35574248433113098144531250.659999966621398925781250.2199999988079071044921875typesky12059426462794438368blur_multiplier0.04000000283122062683105469flags0fresnel_offset0.5fresnel_scale0.39999997615814208984375normal_map822ded49-9a6c-f61c-cb89-6df54f42cdf4normal_scale222scale_above0.02999999932944774627685547scale_below0.2000000029802322387695313typewaterunderwater_fog_mod0.25water_fog_color0.015686275437474250793457030.14901961386203765869140630.2509804069995880126953125water_fog_density16wave1_direction1.049999713897705078125-0.4200000762939453125wave2_direction1.10999965667724609375-1.160000085830688476562512704758109389341107absorption_configconstant_term1exp_scale0exp_term0linear_term0width0constant_term1exp_scale0exp_term0linear_term0width0bloom_id3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3befcloud_color0.22615399956703186035156250.22615399956703186035156250.2261539995670318603515625cloud_id1dc1368f-e8fe-f02d-a08d-9d9f11c1af6bcloud_pos_density110.5260969996452331542968750.87999999523162841796875cloud_pos_density210.5260969996452331542968750.125cloud_scale0.4199999868869781494140625cloud_scroll_rate0.499400138854980468750.0109996795654296875cloud_shadow0.269999980926513671875cloud_variance0dome_offset0.959999978542327880859375dome_radius15000droplet_radius800flags0gamma1glow50.001000000047497451305389404-0.4799999892711639404296875halo_idice_level0legacy_hazeambient1.0199999809265136718750.8099999427795410156250.809999942779541015625blue_density0.14522500336170196533203130.39999699592590332031250.80000197887420654296875blue_horizon0.10767599940299987792968750.21348699927330017089843750.25density_multiplier0.0004600000102072954177856445distance_multiplier1haze_density0.699999988079071044921875haze_horizon0.1599999964237213134765625max_y562.5mie_configanisotropy0.800000011920928955078125constant_term0exp_scale-0.0008333333535119891166687012exp_term1linear_term0width0moisture_level0moon_brightness0.5moon_idec4b9f0b-d008-45c6-96a4-01dd947ac621moon_rotation00.037689492106437683105468754.361759309290391684044152e-080.99928951263427734375moon_scale1planet_radius6360rainbow_id11b4c57c-56b3-04ed-1f82-2004363882e4rayleigh_configconstant_term0exp_scale-0.0001250000059371814131736755exp_term1linear_term0width0sky_bottom_radius6360sky_top_radius6420star_brightness0sun_arc_radians0.0004499999922700226306915283sun_idsun_rotation0-0.9992895126342773437500.03768949210643768310546875sun_scale1sunlight_color2.8385701179504394531252.8385701179504394531252.8385701179504394531251typesky13959514211989552638absorption_configconstant_term1exp_scale0exp_term0linear_term0width0constant_term1exp_scale0exp_term0linear_term0width0bloom_id3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3befcloud_color0.22616603970527648925781250.22616603970527648925781250.2261660397052764892578125cloud_id1dc1368f-e8fe-f02d-a08d-9d9f11c1af6bcloud_pos_density110.5260969996452331542968750.88000023365020751953125cloud_pos_density210.5260969996452331542968750.125cloud_scale0.4199999868869781494140625cloud_scroll_rate0.499400138854980468750.0109996795654296875cloud_shadow0.269999980926513671875cloud_variance0dome_offset0.959999978542327880859375dome_radius15000droplet_radius800flags0gamma1glow5.0009989738464355468750.001000000047497451305389404-0.480001032352447509765625halo_idice_level0legacy_hazeambient0.8099999427795410156250.4628978371620178222656250.629999935626983642578125blue_density0.1579318046569824218750.43499568104743957519531250.87000000476837158203125blue_horizon0.20673196017742156982421880.409883141517639160156250.4799999892711639404296875density_multiplier0.0006200000061653554439544678distance_multiplier2.6999280452728271484375haze_density0.53999996185302734375haze_horizon0.1599999964237213134765625max_y563mie_configanisotropy0.800000011920928955078125constant_term0exp_scale-0.0008333333535119891166687012exp_term1linear_term0width0moisture_level0moon_brightness0.5moon_idec4b9f0b-d008-45c6-96a4-01dd947ac621moon_rotation00.998889923095703125-9.238106599696038756519556e-070.04710662364959716796875moon_scale1planet_radius6360rainbow_id11b4c57c-56b3-04ed-1f82-2004363882e4rayleigh_configconstant_term0exp_scale-0.0001250000059371814131736755exp_term1linear_term0width0sky_bottom_radius6360sky_top_radius6420star_brightness0sun_arc_radians0.0004499999922700226306915283sun_idsun_rotation0-0.0471064895391464233398437500.998889923095703125sun_scale1sunlight_color2.369999885559082031252.369999885559082031252.369999885559082031250.78999996185302734375typesky17057452632552534691absorption_configconstant_term1exp_scale0exp_term0linear_term0width0constant_term1exp_scale0exp_term0linear_term0width0bloom_id3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3befcloud_color0.22615399956703186035156250.22615399956703186035156250.2261539995670318603515625cloud_id1dc1368f-e8fe-f02d-a08d-9d9f11c1af6bcloud_pos_density110.5260969996452331542968750.87999999523162841796875cloud_pos_density210.5260969996452331542968750.125cloud_scale0.4199999868869781494140625cloud_scroll_rate0.499400138854980468750.0109996795654296875cloud_shadow0.269999980926513671875cloud_variance0dome_offset0.959999978542327880859375dome_radius15000droplet_radius800flags0gamma1glow50.001000000047497451305389404-0.4799999892711639404296875halo_idice_level0legacy_hazeambient0.22259476780891418457031250.264502525329589843750.3599999845027923583984375blue_density0.4499911665916442871093750.4499985575675964355468750.450010120868682861328125blue_horizon0.23999616503715515136718750.2399992346763610839843750.2400002926588058471679688density_multiplier0.0003000046417582780122756958distance_multiplier9.999999747378751635551453e-05haze_density3.9999043941497802734375haze_horizon4.634855940821580588817596e-06max_y906.1900634765625mie_configanisotropy0.800000011920928955078125constant_term0exp_scale-0.0008333333535119891166687012exp_term1linear_term0width0moisture_level0moon_brightness0.5moon_idec4b9f0b-d008-45c6-96a4-01dd947ac621moon_rotation0-0.9238796234130859375-8.076819568714199704118073e-080.382683277130126953125moon_scale1planet_radius6360rainbow_id11b4c57c-56b3-04ed-1f82-2004363882e4rayleigh_configconstant_term0exp_scale-0.0001250000059371814131736755exp_term1linear_term0width0sky_bottom_radius6360sky_top_radius6420star_brightness499.985504150390625sun_arc_radians0.0004499999922700226306915283sun_idsun_rotation00.382683187723159790039062500.9238796234130859375sun_scale1sunlight_color0.60242295265197753906250.614470362663269042968751.139999985694885253906250.37999999523162841796875typesky17616589359191419202absorption_configconstant_term1exp_scale0exp_term0linear_term0width0constant_term1exp_scale0exp_term0linear_term0width0bloom_id3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3befcloud_color0.40999999642372131347656250.40999999642372131347656250.4099999964237213134765625cloud_id1dc1368f-e8fe-f02d-a08d-9d9f11c1af6bcloud_pos_density110.5260969996452331542968751cloud_pos_density210.5260969996452331542968750.125cloud_scale0.4199999868869781494140625cloud_scroll_rate0.199999809265136718750.0109996795654296875cloud_shadow0.269999980926513671875cloud_variance0dome_offset0.959999978542327880859375dome_radius15000droplet_radius800flags0gamma1glow50.001000000047497451305389404-0.4799999892711639404296875halo_idice_level0legacy_hazeambient1.04999995231628417968751.04999995231628417968751.0499999523162841796875blue_density0.24475814402103424072265630.44872328639030456542968750.7599999904632568359375blue_horizon0.4954838156700134277343750.4954838156700134277343750.63999998569488525390625density_multiplier0.0001799999881768599152565002distance_multiplier0.800000011920928955078125haze_density0.699999988079071044921875haze_horizon0.189999997615814208984375max_y1605mie_configanisotropy0.800000011920928955078125constant_term0exp_scale-0.0008333333535119891166687012exp_term1linear_term0width0moisture_level0moon_brightness0.5moon_idec4b9f0b-d008-45c6-96a4-01dd947ac621moon_rotation00.38268336653709411621093753.345525456666109676007181e-080.923879563808441162109375moon_scale1planet_radius6360rainbow_id11b4c57c-56b3-04ed-1f82-2004363882e4rayleigh_configconstant_term0exp_scale-0.0001250000059371814131736755exp_term1linear_term0width0sky_bottom_radius6360sky_top_radius6420star_brightness0sun_arc_radians0.0004499999922700226306915283sun_idsun_rotation0-0.923879623413085937500.382683277130126953125sun_scale1sunlight_color0.7342105507850646972656250.7815789580345153808593750.899999976158142089843750.2999999821186065673828125typesky18208940288658674853absorption_configconstant_term1exp_scale0exp_term0linear_term0width0constant_term1exp_scale0exp_term0linear_term0width0bloom_id3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3befcloud_color0.40999999642372131347656250.40999999642372131347656250.4099999964237213134765625cloud_id1dc1368f-e8fe-f02d-a08d-9d9f11c1af6bcloud_pos_density110.5260969996452331542968751cloud_pos_density210.5260969996452331542968750.125cloud_scale0.4199999868869781494140625cloud_scroll_rate0.199999809265136718750.0109996795654296875cloud_shadow0.269999980926513671875cloud_variance0dome_offset0.959999978542327880859375dome_radius15000droplet_radius800flags0gamma1glow50.001000000047497451305389404-0.4799999892711639404296875halo_idice_level0legacy_hazeambient1.04999995231628417968751.04999995231628417968751.0499999523162841796875blue_density0.24475815892219543457031250.44872328639030456542968750.7599999904632568359375blue_horizon0.4954838156700134277343750.4954838156700134277343750.63999998569488525390625density_multiplier0.0001799999881768599152565002distance_multiplier0.800000011920928955078125haze_density0.699999988079071044921875haze_horizon0.189999997615814208984375max_y1605mie_configanisotropy0.800000011920928955078125constant_term0exp_scale-0.0008333333535119891166687012exp_term1linear_term0width0moisture_level0moon_brightness0.5moon_idec4b9f0b-d008-45c6-96a4-01dd947ac621moon_rotation00.7071067690849304199218755.404234527874203497521677e-150.7071068286895751953125moon_scale1planet_radius6360rainbow_id11b4c57c-56b3-04ed-1f82-2004363882e4rayleigh_configconstant_term0exp_scale-0.0001250000059371814131736755exp_term1linear_term0width0sky_bottom_radius6360sky_top_radius6420star_brightness0sun_arc_radians0.0004499999922700226306915283sun_idsun_rotation0-0.707106828689575195312500.7071068286895751953125sun_scale1sunlight_color0.7342105507850646972656250.7815789580345153808593750.899999976158142089843750.2999999821186065673828125typesky3639038607915694966absorption_configconstant_term1exp_scale0exp_term0linear_term0width0constant_term1exp_scale0exp_term0linear_term0width0bloom_id3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3befcloud_color0.22615399956703186035156250.22615399956703186035156250.2261539995670318603515625cloud_id1dc1368f-e8fe-f02d-a08d-9d9f11c1af6bcloud_pos_density110.5260969996452331542968750.87999999523162841796875cloud_pos_density210.5260969996452331542968750.125cloud_scale0.4199999868869781494140625cloud_scroll_rate0.499400138854980468750.0109996795654296875cloud_shadow0.269999980926513671875cloud_variance0dome_offset0.959999978542327880859375dome_radius15000droplet_radius800flags0gamma1glow50.001000000047497451305389404-0.4799999892711639404296875halo_idice_level0legacy_hazeambient0.20404693484306335449218750.24246276915073394775390630.3300038278102874755859375blue_density0.4499911665916442871093750.4499985575675964355468750.450010120868682861328125blue_horizon0.23999616503715515136718750.2399992346763610839843750.2400002926588058471679688density_multiplier0.0003000046417582780122756958distance_multiplier9.999999747378751635551453e-05haze_density3.9999043941497802734375haze_horizon4.634855940821580588817596e-06max_y906.1900634765625mie_configanisotropy0.800000011920928955078125constant_term0exp_scale-0.0008333333535119891166687012exp_term1linear_term0width0moisture_level0moon_brightness0.5moon_idec4b9f0b-d008-45c6-96a4-01dd947ac621moon_rotation0-0.38268360495567321777343753.345525101394741795957088e-080.92387950420379638671875moon_scale1planet_radius6360rainbow_id11b4c57c-56b3-04ed-1f82-2004363882e4rayleigh_configconstant_term0exp_scale-0.0001250000059371814131736755exp_term1linear_term0width0sky_bottom_radius6360sky_top_radius6420star_brightness499.985504150390625sun_arc_radians0.0004499999922700226306915283sun_idsun_rotation00.9238795042037963867187500.3826837241649627685546875sun_scale1sunlight_color0.348789811134338378906250.35576510429382324218750.66003584861755371093750.2200119793415069580078125typesky4342854188752023401absorption_configconstant_term1exp_scale0exp_term0linear_term0width0constant_term1exp_scale0exp_term0linear_term0width0bloom_id3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3befcloud_color0.370000004768371582031250.370000004768371582031250.37000000476837158203125cloud_id1dc1368f-e8fe-f02d-a08d-9d9f11c1af6bcloud_pos_density110.5260969996452331542968751cloud_pos_density210.5260969996452331542968750.125cloud_scale0.4199999868869781494140625cloud_scroll_rate0.199999809265136718750.0109996795654296875cloud_shadow0.2733333110809326171875cloud_variance0dome_offset0.959999978542327880859375dome_radius15000droplet_radius800flags0gamma1glow50.001000000047497451305389404-0.4799999892711639404296875halo_idice_level0legacy_hazeambient1.04999995231628417968751.04999995231628417968751.0499999523162841796875blue_density0.15999999642372131347656250.44872328639030456542968750.7599999904632568359375blue_horizon0.539999961853027343750.47999998927116394042968750.699999988079071044921875density_multiplier0.0001799999881768599152565002distance_multiplier0.80000007152557373046875haze_density0.7000000476837158203125haze_horizon0.189999997615814208984375max_y1605mie_configanisotropy0.800000011920928955078125constant_term0exp_scale-0.0008333333535119891166687012exp_term1linear_term0width0moisture_level0moon_brightness0.5moon_idec4b9f0b-d008-45c6-96a4-01dd947ac621moon_rotation00.923879563808441162109375-8.076811752744106343016028e-080.382683277130126953125moon_scale1planet_radius6360rainbow_id11b4c57c-56b3-04ed-1f82-2004363882e4rayleigh_configconstant_term0exp_scale-0.0001250000059371814131736755exp_term1linear_term0width0sky_bottom_radius6360sky_top_radius6420star_brightness0sun_arc_radians0.0004499999922700226306915283sun_idsun_rotation0-0.3826833963394165039062500.923879563808441162109375sun_scale1sunlight_color0.7342105507850646972656250.7815789580345153808593750.899999976158142089843750.2999999821186065673828125typeskynameDefault environmenttrackskey_keyframe0key_name12059426462794438368key_keyframe0key_name10809890408763334407key_keyframe0.125key_name17057452632552534691key_keyframe0.25key_name13959514211989552638key_keyframe0.375key_name4342854188752023401key_keyframe0.5key_name18208940288658674853key_keyframe0.625key_name17616589359191419202key_keyframe0.75key_name12704758109389341107key_keyframe0.875key_name3639038607915694966typedaycycle \ No newline at end of file diff --git a/bin/assets/SettingsAssetSet/SettingsAssetSet.xml b/bin/assets/SettingsAssetSet/SettingsAssetSet.xml index f70432a329..1142af8b91 100644 --- a/bin/assets/SettingsAssetSet/SettingsAssetSet.xml +++ b/bin/assets/SettingsAssetSet/SettingsAssetSet.xml @@ -1,9 +1,16 @@ +
+ + + + +
+
- +
diff --git a/bin/inventory/SettingsLibrary/Items.xml b/bin/inventory/SettingsLibrary/Items.xml index 4de0f7fc3b..91df4c6376 100644 --- a/bin/inventory/SettingsLibrary/Items.xml +++ b/bin/inventory/SettingsLibrary/Items.xml @@ -29,12 +29,23 @@ - +
+ +
+ + + + + + + + +