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

* Added finite testing to the character and object constructor

0.6.5-rc1
Teravus Ovares 2009-04-07 16:41:07 +00:00
parent 9bbc7e8bf6
commit b326b55bcd
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,11 +133,24 @@ namespace OpenSim.Region.Physics.OdePlugin
// ode = dode; // ode = dode;
_velocity = new PhysicsVector(); _velocity = new PhysicsVector();
_target_velocity = new PhysicsVector(); _target_velocity = new PhysicsVector();
_position = pos;
m_taintPosition.X = pos.X;
m_taintPosition.Y = pos.Y; if (PhysicsVector.isFinite(pos))
m_taintPosition.Z = pos.Z; {
_position = pos;
m_taintPosition.X = pos.X;
m_taintPosition.Y = pos.Y;
m_taintPosition.Z = pos.Z;
}
else
{
_position = new PhysicsVector(128,128,parent_scene.GetTerrainHeightAtXY(128,128) + 10);
m_taintPosition.X = _position.X;
m_taintPosition.Y = _position.Y;
m_taintPosition.Z = _position.Z;
m_log.Warn("[PHYSICS]: Got NaN Position on Character Create");
}
_acceleration = new PhysicsVector(); _acceleration = new PhysicsVector();
_parent_scene = parent_scene; _parent_scene = parent_scene;

18
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
View File

@ -173,6 +173,11 @@ namespace OpenSim.Region.Physics.OdePlugin
//gc = GCHandle.Alloc(prim_geom, GCHandleType.Pinned); //gc = GCHandle.Alloc(prim_geom, GCHandleType.Pinned);
ode = dode; ode = dode;
_velocity = new PhysicsVector(); _velocity = new PhysicsVector();
if (!PhysicsVector.isFinite(pos))
{
pos = new PhysicsVector(128, 128, parent_scene.GetTerrainHeightAtXY(128, 128) + 0.5f);
m_log.Warn("[PHYSICS]: Got nonFinite Object create Position");
}
_position = pos; _position = pos;
m_taintposition = pos; m_taintposition = pos;
PID_D = parent_scene.bodyPIDD; PID_D = parent_scene.bodyPIDD;
@ -185,6 +190,12 @@ namespace OpenSim.Region.Physics.OdePlugin
prim_geom = IntPtr.Zero; prim_geom = IntPtr.Zero;
prev_geom = IntPtr.Zero; prev_geom = IntPtr.Zero;
if (!PhysicsVector.isFinite(pos))
{
size = new PhysicsVector(0.5f, 0.5f, 0.5f);
m_log.Warn("[PHYSICS]: Got nonFinite Object create Size");
}
if (size.X <= 0) size.X = 0.01f; if (size.X <= 0) size.X = 0.01f;
if (size.Y <= 0) size.Y = 0.01f; if (size.Y <= 0) size.Y = 0.01f;
if (size.Z <= 0) size.Z = 0.01f; if (size.Z <= 0) size.Z = 0.01f;
@ -193,6 +204,13 @@ namespace OpenSim.Region.Physics.OdePlugin
m_taintsize = _size; m_taintsize = _size;
_acceleration = new PhysicsVector(); _acceleration = new PhysicsVector();
m_rotationalVelocity = PhysicsVector.Zero; m_rotationalVelocity = PhysicsVector.Zero;
if (!QuaternionIsFinite(rotation))
{
rotation = Quaternion.Identity;
m_log.Warn("[PHYSICS]: Got nonFinite Object create Rotation");
}
_orientation = rotation; _orientation = rotation;
m_taintrot = _orientation; m_taintrot = _orientation;
_mesh = mesh; _mesh = mesh;