diff options
author | Justin Clark-Casey (justincc) | 2011-08-03 02:59:49 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-03 02:59:49 +0100 |
commit | 68a5fe04318fed4b306e8405861203c19a313a2f (patch) | |
tree | 866cda5d1890ddf5758c146d3756be9480ee053e /OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |
parent | Implement move to/autopilot for z axis movement as well. (diff) | |
download | opensim-SC_OLD-68a5fe04318fed4b306e8405861203c19a313a2f.zip opensim-SC_OLD-68a5fe04318fed4b306e8405861203c19a313a2f.tar.gz opensim-SC_OLD-68a5fe04318fed4b306e8405861203c19a313a2f.tar.bz2 opensim-SC_OLD-68a5fe04318fed4b306e8405861203c19a313a2f.tar.xz |
Improve z axis move to/autopilot so the avatar does alternative crouch/huzzah when walking along the ground
Moving a flying avatar to a ground point doesn't yet land the avatar. This may or may not be the best thing
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index 1334230..4ab818f 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||
@@ -27,6 +27,8 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | ||
31 | using log4net; | ||
30 | using OpenMetaverse; | 32 | using OpenMetaverse; |
31 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
32 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
@@ -40,6 +42,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
40 | /// </summary> | 42 | /// </summary> |
41 | public class ScenePresenceAnimator | 43 | public class ScenePresenceAnimator |
42 | { | 44 | { |
45 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
46 | |||
43 | public AnimationSet Animations | 47 | public AnimationSet Animations |
44 | { | 48 | { |
45 | get { return m_animations; } | 49 | get { return m_animations; } |
@@ -262,7 +266,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
262 | 266 | ||
263 | m_animTickFall = 0; | 267 | m_animTickFall = 0; |
264 | 268 | ||
265 | if (move.Z > 0f) | 269 | if (move.Z > 0.2f) |
266 | { | 270 | { |
267 | // Jumping | 271 | // Jumping |
268 | if (!jumping) | 272 | if (!jumping) |
@@ -323,6 +327,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
323 | public void UpdateMovementAnimations() | 327 | public void UpdateMovementAnimations() |
324 | { | 328 | { |
325 | m_movementAnimation = GetMovementAnimation(); | 329 | m_movementAnimation = GetMovementAnimation(); |
330 | // m_log.DebugFormat( | ||
331 | // "[SCENE PRESENCE ANIMATOR]: Got animation {0} for {1}", m_movementAnimation, m_scenePresence.Name); | ||
326 | TrySetMovementAnimation(m_movementAnimation); | 332 | TrySetMovementAnimation(m_movementAnimation); |
327 | } | 333 | } |
328 | 334 | ||