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

ubitODE - again avatar/terrain collision. Reduce new viewers interpolators efects reporting null velocity and aceleration when stopped near the right position, where they can still have instantanius large values that can get magnified by interpolators, specially using diferent timing estimation.

avinationmerge
UbitUmarov 2012-04-20 03:17:36 +01:00
parent aeb5aed5b7
commit ec6347f987
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -862,12 +862,12 @@ namespace OpenSim.Region.Physics.OdePlugin
float depth = terrainheight - chrminZ; float depth = terrainheight - chrminZ;
if (!flying) if (!flying)
{ {
vec.Z = -vel.Z * PID_D * 1.5f + depth * PID_P * 60; vec.Z = -vel.Z * PID_D * 1.5f + depth * PID_P * 50;
} }
else else
vec.Z = depth * PID_P * 60; vec.Z = depth * PID_P * 50;
if (depth < 0.2f) if (depth < 0.1f)
{ {
m_iscolliding = true; m_iscolliding = true;
m_colliderfilter = 2; m_colliderfilter = 2;
@ -1009,9 +1009,17 @@ namespace OpenSim.Region.Physics.OdePlugin
// update our local ideia of position velocity and aceleration // update our local ideia of position velocity and aceleration
_position = localpos; _position = localpos;
if (_zeroFlag)
{
_velocity = Vector3.Zero;
_acceleration = Vector3.Zero;
}
else
{
_acceleration = _velocity; // previus velocity _acceleration = _velocity; // previus velocity
_velocity = vel; _velocity = vel;
_acceleration = (vel - _acceleration) / timeStep; _acceleration = (vel - _acceleration) / timeStep;
}
} }