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

With ODE physics, fix an issue where the avatar couldn't jump and then move forward when moving south or west. 

Addresses http://opensimulator.org/mantis/view.php?id=5003
Thanks to UbitUmarov for this fix.
bullet-2.82
Justin Clark-Casey (justincc) 2014-07-18 17:54:10 +01:00
parent 1daec26ba0
commit cfbfca6447
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -895,30 +895,17 @@ namespace OpenSim.Region.Physics.OdePlugin
// We're colliding with something and we're not flying but we're moving // We're colliding with something and we're not flying but we're moving
// This means we're walking or running. // This means we're walking or running.
d.Vector3 pos = d.BodyGetPosition(Body); d.Vector3 pos = d.BodyGetPosition(Body);
vec.Z = (_target_velocity.Z - vel.Z)*PID_D + (_zeroPosition.Z - pos.Z)*PID_P; vec.Z = (_target_velocity.Z - vel.Z) * PID_D + (_zeroPosition.Z - pos.Z) * PID_P;
if (_target_velocity.X > 0) vec.X = ((_target_velocity.X - vel.X) / 1.2f) * PID_D;
{ vec.Y = ((_target_velocity.Y - vel.Y) / 1.2f) * PID_D;
vec.X = ((_target_velocity.X - vel.X) / 1.2f) * PID_D;
}
if (_target_velocity.Y > 0)
{
vec.Y = ((_target_velocity.Y - vel.Y) / 1.2f) * PID_D;
}
} }
else if (!m_iscolliding && !flying) else if (!m_iscolliding && !flying)
{ {
// we're not colliding and we're not flying so that means we're falling! // we're not colliding and we're not flying so that means we're falling!
// m_iscolliding includes collisions with the ground. // m_iscolliding includes collisions with the ground.
// d.Vector3 pos = d.BodyGetPosition(Body); vec.X = ((_target_velocity.X - vel.X) / 1.2f) * PID_D;
if (_target_velocity.X > 0) vec.Y = ((_target_velocity.Y - vel.Y) / 1.2f) * PID_D;
{
vec.X = ((_target_velocity.X - vel.X) / 1.2f) * PID_D;
}
if (_target_velocity.Y > 0)
{
vec.Y = ((_target_velocity.Y - vel.Y) / 1.2f) * PID_D;
}
} }
if (flying) if (flying)