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

add vector variant of osSlerp; update script syntax

Browse Source
This commit is contained in:
UbitUmarov
2021-01-06 16:32:51 +00:00
parent be649ee7e5
commit a3b26255dd
6 changed files with 90 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5647,6 +5647,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return LSL_Rotation.Slerp(a, b, amount);
}
public LSL_Vector osSlerp(LSL_Vector a, LSL_Vector b, LSL_Float amount)
{
if (amount < 0)
amount = 0;
else if (amount > 1.0)
amount = 1.0;
return LSL_Vector.Slerp(a, b, amount);
}
public void osResetAllScripts(LSL_Integer linkset)
{
UUID me = m_item.ItemID;

1
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
View File

@@ -561,6 +561,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
LSL_Key osGetLastChangedEventKey();
LSL_Float osGetPSTWallclock();
LSL_Rotation osSlerp(LSL_Rotation a, LSL_Rotation b, LSL_Float amount);
vector osSlerp(vector a, vector b, LSL_Float amount);
void osResetAllScripts(LSL_Integer AllLinkset);
LSL_Integer osIsNotValidNumber(LSL_Float v);

2
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
View File

@@ -35,7 +35,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public partial class ScriptBaseClass
{
// SCRIPTS CONSTANTS
public static readonly LSLInteger OS_APIVERSION = 15;
public static readonly LSLInteger OS_APIVERSION = 16;
public static readonly LSLInteger TRUE = 1;
public static readonly LSLInteger FALSE = 0;

5
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
View File

@@ -1432,6 +1432,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_OSSL_Functions.osSlerp(a, b, amount);
}
public vector osSlerp(vector a, vector b, LSL_Float amount)
{
return m_OSSL_Functions.osSlerp(a, b, amount);
}
public void osResetAllScripts(LSL_Integer allLinkSet)
{
m_OSSL_Functions.osResetAllScripts(allLinkSet);

24
OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
View File

@@ -366,6 +366,30 @@ namespace OpenSim.Region.ScriptEngine.Shared
return new Vector3(0, 0, 0);
}
public static Vector3 Slerp(Vector3 v1, Vector3 v2, double amount)
{
double angle = (v1.x * v2.x) + (v1.y * v2.y) + (v1.z * v2.z);
double scale;
double invscale;
if (angle < 0.999f)
{
angle = Math.Acos(angle);
invscale = 1.0f / Math.Sin(angle);
scale = Math.Sin((1.0f - amount) * angle) * invscale;
invscale *= Math.Sin((amount * angle));
}
else
{
scale = 1.0f - amount;
invscale = amount;
}
return new Vector3(
v1.x * scale + v2.x * invscale,
v1.y * scale + v2.y * invscale,
v1.z * scale + v2.z * invscale
);
}
#endregion
}