OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

work around sunlight_color mess

master
UbitUmarov 2020-06-23 16:07:25 +01:00
parent 60da45b715
commit 768f506a23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Framework/ViewerEnvironment.cs
View File

@ -189,6 +189,7 @@ namespace OpenSim.Framework
public float max_y = 1605; public float max_y = 1605;
public float star_brightness = 0f; public float star_brightness = 0f;
//this is a vector3 now, but al viewers expect a vector4, so keeping like this for now
public Vector4 sunlight_color = new Vector4(0.7342f, 0.7815f, 0.9f, 0.3f); public Vector4 sunlight_color = new Vector4(0.7342f, 0.7815f, 0.9f, 0.3f);
public string Name = "Default"; public string Name = "Default";
@ -480,8 +481,18 @@ namespace OpenSim.Framework
sun_rotation = otmp; sun_rotation = otmp;
if (map.TryGetValue("sun_scale", out otmp)) if (map.TryGetValue("sun_scale", out otmp))
sun_scale = otmp; sun_scale = otmp;
if (map.TryGetValue("sunlight_color", out otmp))
if (map.TryGetValue("sunlight_color", out otmp) && otmp is OSDArray)
{
tmpArray = otmp as OSDArray;
if(tmpArray.Count == 4)
sunlight_color = otmp; sunlight_color = otmp;
else
{
Vector3 tv = otmp;
sunlight_color = new Vector4(tv.X, tv.Y, tv.Z, 0);
}
}
Name = name; Name = name;
} }