ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 11:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

more variations on same thing

Browse Source
This commit is contained in:
UbitUmarov
2022-04-16 17:35:00 +01:00
parent a4fa491ea8
commit d785dc50e6
5 changed files with 148 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -498,18 +498,20 @@ namespace OpenSim.Region.Framework.Scenes.Animation
{
Falling = false;
currentControlState = motionControlStates.landing;
// TODO: SOFT_LAND support
float fallVsq = m_lastFallVelocity * m_lastFallVelocity;
if (fallVsq > 300f) // aprox 20*h
if ((controlFlags & (AgentManager.ControlFlags.AGENT_CONTROL_FINISH_ANIM)) == 0)
{
m_animTickLand = Environment.TickCount + 3000;
return "STANDUP";
}
if (fallVsq > 160f)
{
m_animTickLand = Environment.TickCount + 1500;
return "SOFT_LAND";
float fallVsq = m_lastFallVelocity * m_lastFallVelocity;
if (fallVsq > 300f) // aprox 20*h
{
m_animTickLand = Environment.TickCount + 3000;
return "STANDUP";
}
if (fallVsq > 160f)
{
m_animTickLand = Environment.TickCount + 1500;
return "SOFT_LAND";
}
}
m_animTickLand = Environment.TickCount + 600;
return "LAND";