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

* Added a routine to check if a PhysicsVector and Quaternion is finite

Browse Source 
* Now validating input to the Physics scene and warning when something is awry.
* This should help nail down that Non Finite Avatar Position Detected issue.
This commit is contained in:
Teravus Ovares
2009-04-07 16:13:17 +00:00
parent 11f8ea30f9
commit 9bbc7e8bf6
3 changed files with 193 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
View File

@@ -380,10 +380,23 @@ namespace OpenSim.Region.Physics.OdePlugin
set
{
if (Body == IntPtr.Zero || Shell == IntPtr.Zero)
_position.X = value.X; _position.Y = value.Y; _position.Z = value.Z;
m_taintPosition.X = value.X; m_taintPosition.Y = value.Y; m_taintPosition.Z = value.Z;
_parent_scene.AddPhysicsActorTaint(this);
{
if (PhysicsVector.isFinite(value))
{
_position.X = value.X;
_position.Y = value.Y;
_position.Z = value.Z;
m_taintPosition.X = value.X;
m_taintPosition.Y = value.Y;
m_taintPosition.Z = value.Z;
_parent_scene.AddPhysicsActorTaint(this);
}
else
{
m_log.Warn("[PHYSICS]: Got a NaN Position from Scene on a Character");
}
}
}
}
@@ -402,15 +415,22 @@ namespace OpenSim.Region.Physics.OdePlugin
get { return new PhysicsVector(CAPSULE_RADIUS*2, CAPSULE_RADIUS*2, CAPSULE_LENGTH); }
set
{
m_pidControllerActive = true;
if (PhysicsVector.isFinite(value))
{
m_pidControllerActive = true;
PhysicsVector SetSize = value;
m_tainted_CAPSULE_LENGTH = (SetSize.Z * 1.15f) - CAPSULE_RADIUS * 2.0f;
m_tainted_CAPSULE_LENGTH = (SetSize.Z*1.15f) - CAPSULE_RADIUS*2.0f;
//m_log.Info("[SIZE]: " + CAPSULE_LENGTH.ToString());
Velocity = new PhysicsVector(0f, 0f, 0f);
_parent_scene.AddPhysicsActorTaint(this);
_parent_scene.AddPhysicsActorTaint(this);
}
else
{
m_log.Warn("[PHYSICS]: Got a NaN Size from Scene on a Character");
}
}
}
@@ -616,8 +636,15 @@ namespace OpenSim.Region.Physics.OdePlugin
}
set
{
m_pidControllerActive = true;
_target_velocity = value;
if (PhysicsVector.isFinite(value))
{
m_pidControllerActive = true;
_target_velocity = value;
}
else
{
m_log.Warn("[PHYSICS]: Got a NaN velocity from Scene in a Character");
}
}
}
@@ -667,22 +694,29 @@ namespace OpenSim.Region.Physics.OdePlugin
/// <param name="force"></param>
public override void AddForce(PhysicsVector force, bool pushforce)
{
if (pushforce)
if (PhysicsVector.isFinite(force))
{
m_pidControllerActive = false;
force *= 100f;
doForce(force);
//m_log.Debug("Push!");
//_target_velocity.X += force.X;
// _target_velocity.Y += force.Y;
//_target_velocity.Z += force.Z;
if (pushforce)
{
m_pidControllerActive = false;
force *= 100f;
doForce(force);
//m_log.Debug("Push!");
//_target_velocity.X += force.X;
// _target_velocity.Y += force.Y;
//_target_velocity.Z += force.Z;
}
else
{
m_pidControllerActive = true;
_target_velocity.X += force.X;
_target_velocity.Y += force.Y;
_target_velocity.Z += force.Z;
}
}
else
{
m_pidControllerActive = true;
_target_velocity.X += force.X;
_target_velocity.Y += force.Y;
_target_velocity.Z += force.Z;
m_log.Warn("[PHYSICS]: Got a NaN force applied to a Character");
}
//m_lastUpdateSent = false;
}
@@ -847,8 +881,14 @@ namespace OpenSim.Region.Physics.OdePlugin
// end add Kitto Flora
}
doForce(vec);
if (PhysicsVector.isFinite(vec))
{
doForce(vec);
}
else
{
m_log.Warn("[PHYSICS]: Got a NaN force vector in Move()");
}
}
/// <summary>