AriasCreations/LSLEditor
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev-next' into dev-syntax-code

Browse source
This commit is contained in:
Ima Mechanique 2012-12-28 02:51:15 +00:00
commit e9b5a4f825
8 changed files with 94 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

22
trunk/SecondLife/SecondLifeMain.cs
View file

@ -447,6 +447,9 @@ namespace LSLEditor
public static readonly integer OBJECT_PATHFINDING_TYPE = 20;
public static readonly integer OBJECT_GROUP = 7;
public static readonly integer OBJECT_CREATOR = 8;
public static readonly integer OBJECT_PHYSICS = 21;
public static readonly integer OBJECT_PHANTOM = 22;
public static readonly integer OBJECT_TEMP_ON_REZ = 23;
public static readonly integer OBJECT_STREAMING_COST = 15;
public static readonly integer OBJECT_PHYSICS_COST = 16;
@ -1203,11 +1206,20 @@ namespace LSLEditor
public Float llAngleBetween(rotation a, rotation b)
{
double Angle = 2 * Math.Acos((a.x * b.x + a.y * b.y + a.z * b.z + a.s * b.s)
/ Math.Sqrt((a.x * a.x + a.y * a.y + a.z * a.z + a.s * a.s) *
(b.x * b.x + b.y * b.y + b.z * b.z + b.s * b.s)));
Verbose("AngleBetween(" + a + "," + b + ")=" + Angle);
return Angle;
rotation r = b / a; // calculate the rotation between the two arguments as quaternion
double s2 = r.s * r.s; // square of the s-element
double v2 = r.x * r.x + r.y * r.y + r.z * r.z; // sum of the squares of the v-elements
if (s2 < v2) // compare the s-component to the v-component
{
return 2.0 * Math.Acos(Math.Sqrt(s2 / (s2 + v2))); // use arccos if the v-component is dominant
}
else if (v2 != 0) // make sure the v-component is non-zero
{
return 2.0 * Math.Asin(Math.Sqrt(v2 / (s2 + v2))); // use arcsin if the s-component is dominant
}
return 0.0; // one or both arguments are scaled too small to be meaningful, or the values are the same, so return zero
// implementation taken from LSL Portal. http://wiki.secondlife.com/w/index.php?title=LlAngleBetween
}
public void llApplyImpulse(vector force, integer local)