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

Mantis 

Guard against NaN being returned from llRotBetween. Return a zero rotation
if the result is NaN.
0.6.0-stable
Melanie Thielker 2008-09-19 17:00:17 +00:00
parent 092ad53dc7
commit 592f98c4aa
2 changed files with 18 additions and 2 deletions
OpenSim/Region/ScriptEngine
Common
Shared/Api/Implementation

10
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@ -562,7 +562,15 @@ namespace OpenSim.Region.ScriptEngine.Common
LSL_Types.Vector3 axis = LSL_Types.Vector3.Norm(crossProduct); LSL_Types.Vector3 axis = LSL_Types.Vector3.Norm(crossProduct);
double s = Math.Sin(angle / 2); double s = Math.Sin(angle / 2);
return new LSL_Types.Quaternion(axis.x * s, axis.y * s, axis.z * s, (float)Math.Cos(angle / 2)); double x = axis.x * s;
double y = axis.y * s;
double z = axis.z * s;
double w = Math.Cos(angle / 2);
if(Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w))
return new LSL_Types.Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
return new LSL_Types.Quaternion((float)x, (float)y, (float)z, (float)w);
} }
public void llWhisper(int channelID, string text) public void llWhisper(int channelID, string text)

10
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -581,7 +581,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
LSL_Types.Vector3 axis = LSL_Types.Vector3.Norm(crossProduct); LSL_Types.Vector3 axis = LSL_Types.Vector3.Norm(crossProduct);
double s = Math.Sin(angle / 2); double s = Math.Sin(angle / 2);
return new LSL_Types.Quaternion(axis.x * s, axis.y * s, axis.z * s, (float)Math.Cos(angle / 2)); double x = axis.x * s;
double y = axis.y * s;
double z = axis.z * s;
double w = Math.Cos(angle / 2);
if(Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w))
return new LSL_Types.Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
return new LSL_Types.Quaternion((float)x, (float)y, (float)z, (float)w);
} }
public void llWhisper(int channelID, string text) public void llWhisper(int channelID, string text)