ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 19:35:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up the LookAt code in SOP and SOG. Added support for incrementally

Browse Source 
rotating physical objects. This does not use physics. Currently the rate
of change is determined as 1 / (PI * Strength).
This commit is contained in:
Mic Bowman
2012-01-13 14:48:56 -08:00
parent adea92f8b7
commit e1a2c44ebe
3 changed files with 34 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2865,13 +2865,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// Per discussion with Melanie, for non-physical objects llLookAt appears to simply
// set the rotation of the object, copy that behavior
if (m_host.PhysActor == null || !m_host.PhysActor.IsPhysical)
if (strength == 0 || m_host.PhysActor == null || !m_host.PhysActor.IsPhysical)
{
llSetRot(rot);
}
else
{
m_host.startLookAt(Rot2Quaternion(rot), (float)damping, (float)strength);
m_host.StartLookAt(Rot2Quaternion(rot), (float)strength, (float)damping);
}
}
@@ -3251,13 +3251,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// Per discussion with Melanie, for non-physical objects llLookAt appears to simply
// set the rotation of the object, copy that behavior
if (m_host.PhysActor == null || !m_host.PhysActor.IsPhysical)
if (strength == 0 || m_host.PhysActor == null || !m_host.PhysActor.IsPhysical)
{
llSetLocalRot(target);
}
else
{
m_host.RotLookAt(Rot2Quaternion(target), (float)damping, (float)strength);
m_host.RotLookAt(Rot2Quaternion(target), (float)strength, (float)damping);
}
}