ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

change avatar animator on forced hover, needs more testing

Browse Source
This commit is contained in:
UbitUmarov
2025-03-12 18:06:31 +00:00
parent f3c348cf40
commit 65eee21661
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -393,16 +393,18 @@ namespace OpenSim.Region.Framework.Scenes.Animation
if (!isColliding && currentControlState != motionControlStates.jumping)
{
float fallVelocity = actor.Velocity.Z;
// if stable on Hover assume falling
if(actor.PIDHoverActive && fallVelocity < 0.05f)
if(actor.PIDHoverActive)
{
Falling = true;
currentControlState = motionControlStates.falling;
m_lastFallVelocity = fallVelocity;
return "FALLDOWN";
m_animTickFall = 0;
m_animTickJump = 0;
Falling = false;
currentControlState = motionControlStates.flying;
m_lastFallVelocity = 0f;
return "HOVER";
}
float fallVelocity = actor.Velocity.Z;
if (fallVelocity < -2.5f)
Falling = true;

7
OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
View File

@@ -1263,12 +1263,9 @@ namespace OpenSim.Region.PhysicsModule.ubOde
break;
case PIDHoverType.GroundAndWater:
if (terrainheight > m_parent_scene.WaterLevel)
targetHoverHeight += terrainheight;
else
targetHoverHeight += m_parent_scene.WaterLevel;
targetHoverHeight += terrainheight > m_parent_scene.WaterLevel ? terrainheight : m_parent_scene.WaterLevel;
break;
} // end switch (m_PIDHoverType)
}
hoverPIDActive = true;