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

stop sending sun direction, recent viewers should not need it, and it costs cpu

master
UbitUmarov 2020-06-15 04:03:06 +01:00
parent b3ce8e9fc7
commit 4329f5962a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/ViewerEnviroment.cs
View File

@ -272,7 +272,6 @@ namespace OpenSim.Framework
float east_angle; float east_angle;
Vector4 lightnorm; Vector4 lightnorm;
ViewerEnviroment.convertToAngles(this, out sun_angle, out east_angle, out lightnorm); ViewerEnviroment.convertToAngles(this, out sun_angle, out east_angle, out lightnorm);
map["ambient"] = new Vector4(ambient.X, ambient.Y, ambient.Z, 1); 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_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); map["blue_horizon"] = new Vector4(blue_horizon.X, blue_horizon.Y, blue_horizon.Z, 1);
@ -973,7 +972,8 @@ namespace OpenSim.Framework
public static void convertToAngles(SkyData sky, out float sun_angle, out float east_angle, out Vector4 lightnorm) public static void convertToAngles(SkyData sky, out float sun_angle, out float east_angle, out Vector4 lightnorm)
{ {
Vector3 v = Xrot(sky.sun_rotation); Vector3 v = Xrot(sky.sun_rotation);
lightnorm = new Vector4(v.X, v.Y, v.Z,1); v.Normalize();
lightnorm = new Vector4(v.X, v.Y, v.Z, 1);
sun_angle = (float)Math.Asin(v.Z); sun_angle = (float)Math.Asin(v.Z);
east_angle = -(float)Math.Atan2(v.Y, v.X); east_angle = -(float)Math.Atan2(v.Y, v.X);
@ -1337,6 +1337,7 @@ namespace OpenSim.Framework
return true; return true;
} }
/* not needed for wl viewers
public bool getWLPositions(float altitude, float dayfrac, out Vector3 sundir) public bool getWLPositions(float altitude, float dayfrac, out Vector3 sundir)
{ {
sundir = Vector3.Zero; sundir = Vector3.Zero;
@ -1360,5 +1361,6 @@ namespace OpenSim.Framework
sundir = Xrot(sunrot); sundir = Xrot(sunrot);
return true; return true;
} }
*/
} }
} }