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

let hoverheight rest position be a falling state

avinationmerge
UbitUmarov 2015-09-30 20:37:14 +01:00
parent aa3303e3af
commit 6df75a927c
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
View File

@ -399,6 +399,15 @@ namespace OpenSim.Region.Framework.Scenes.Animation
{ {
float fallVelocity = actor.Velocity.Z; float fallVelocity = actor.Velocity.Z;
// if stable on Hover assume falling
if(actor.PIDHoverActive && fallVelocity < 0.05f)
{
Falling = true;
currentControlState = motionControlStates.falling;
m_lastFallVelocity = fallVelocity;
return "FALLDOWN";
}
if (fallVelocity < -2.5f) if (fallVelocity < -2.5f)
Falling = true; Falling = true;
@ -431,7 +440,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
#region Jumping // section added for jumping... #region Jumping // section added for jumping...
if (isColliding && heldUp && currentControlState != motionControlStates.jumping) if (isColliding && heldUp && currentControlState != motionControlStates.jumping && !actor.PIDHoverActive)
{ {
// Start jumping, prejump // Start jumping, prejump
currentControlState = motionControlStates.jumping; currentControlState = motionControlStates.jumping;

3
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -3363,7 +3363,8 @@ namespace OpenSim.Region.Framework.Scenes
// m_log.DebugFormat("[SCENE PRESENCE]: Force to apply before modification was {0} for {1}", direc, Name); // m_log.DebugFormat("[SCENE PRESENCE]: Force to apply before modification was {0} for {1}", direc, Name);
if (Animator.currentControlState == ScenePresenceAnimator.motionControlStates.falling) if (Animator.currentControlState == ScenePresenceAnimator.motionControlStates.falling
&& (PhysicsActor == null || !PhysicsActor.PIDHoverActive))
{ {
if (breaking) if (breaking)
direc.Z = -9999f; //hack to tell physics to stop on Z direc.Z = -9999f; //hack to tell physics to stop on Z