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

* This fixes the avatar stuck in objects on login and teleport by gently applying an upward motion when stuck in things on the Z 

* Comments describe how it filters out good, normal collisions, from 'stuck' collisions..   It's especially sensitive in feetbox collisions since this is where normal collisions happen under usual circumstances.
avinationmerge
teravus 2013-05-14 20:55:56 -04:00
parent 799ba5aa7b
commit 477a5e3a35
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
View File

@ -1097,8 +1097,20 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
float h = contact.pos.Z - _position.Z; float h = contact.pos.Z - _position.Z;
// Only do this if the normal is sufficiently pointing in the 'up' direction
if (Math.Abs(contact.normal.Z) > 0.95f) if (Math.Abs(contact.normal.Z) > 0.95f)
{ {
// We Only want to do this if we're sunk into the object a bit and we're stuck and we're trying to move and feetcollision is false
if ((contact.depth > 0.0010f && _velocity.X == 0f && _velocity.Y == 0 && _velocity.Z == 0)
&& (_target_velocity.X > 0 || _target_velocity.Y > 0 || _target_velocity.Z > 0)
&& (!feetcollision) )
{
m_collisionException = true; // Stop looping, do this only once not X times Contacts
_position.Z += contact.depth + 0.01f; // Move us Up the amount that we sank in, and add 0.01 meters to gently lift avatar up.
return true;
}
if (contact.normal.Z > 0) if (contact.normal.Z > 0)
contact.normal.Z = 1.0f; contact.normal.Z = 1.0f;
else else