ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

.. and bad merge

Browse Source
This commit is contained in:
UbitUmarov
2023-03-23 23:16:31 +00:00
parent fb1ef7f784
commit 70bc11c94a
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Framework/ViewerSky.cs
View File

@@ -232,10 +232,7 @@ namespace OpenSim.Framework
{
OSDMap map = new();
float sun_angle;
float east_angle;
Vector4 lightnorm;
ViewerEnvironment.convertToAngles(this, out sun_angle, out east_angle, out lightnorm);
ViewerEnvironment.convertToAngles(this, out float sun_angle, out float east_angle, out Vector4 lightnorm);
map["ambient"] = new Vector4(ambient.X, ambient.Y, ambient.Z, 1);
map["blue_density"] = new Vector4(blue_density.X, blue_density.Y, blue_density.Z, 1);
map["blue_horizon"] = new Vector4(blue_horizon.X, blue_horizon.Y, blue_horizon.Z, 1);
@@ -381,7 +378,7 @@ namespace OpenSim.Framework
if (map.TryGetValue("halo_id", out otmp))
halo_id = otmp;
if (map.TryGetValue("ice_level", out otmp))
halo_id = otmp;
ice_level = otmp;
if (map.TryGetValue("reflection_probe_ambiance", out otmp))
reflectionProbeAmbiance = otmp;
@@ -409,9 +406,8 @@ namespace OpenSim.Framework
if (map.TryGetValue("mie_config", out otmp) && otmp is OSDArray mieArray)
{
tmpArray = otmp as OSDArray;
if (tmpArray.Count > 0)
mieconf.FromOSD(tmpArray[0] as OSDMap);
if (mieArray.Count > 0)
mieconf.FromOSD(mieArray[0] as OSDMap);
}
if (map.TryGetValue("moisture_level", out otmp))