1 files changed, 164 insertions, 62 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index 4865481..9c103cb 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -53,11 +53,17 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         {
             get { return m_movementAnimation; }
         }
-        protected string m_movementAnimation = "DEFAULT";
-
+ //       protected string m_movementAnimation = "DEFAULT";     //KF: 'DEFAULT' does not exist!
+        protected string m_movementAnimation = "CROUCH";                //KF: CROUCH ensures reliable Av Anim. init.
         private int m_animTickFall;
-        private int m_animTickJump;
-        
+//        private int m_animTickJump;
+        public int m_animTickJump;              // ScenePresence has to see this to control +Z force
+        public bool m_jumping = false;      // Add for jumping
+        public float m_jumpVelocity = 0f;   // Add for jumping
+        private int m_landing = 0;          // Add for jumping
+        public bool m_falling = false;      // Add for falling
+        private float m_fallHeight;         // Add for falling
+
         /// <value>
         /// The scene presence that this animator applies to
         /// </value>
@@ -114,7 +120,9 @@ namespace OpenSim.Region.Framework.Scenes.Animation
 
         public void ResetAnimations()
         {
+Console.WriteLine("ResetA.............");
             m_animations.Clear();
+TrySetMovementAnimation("STAND");
         }
         
         /// <summary>
@@ -123,8 +131,6 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         /// </summary>
         public void TrySetMovementAnimation(string anim)
         {
-            //m_log.DebugFormat("Updating movement animation to {0}", anim);
-
             if (!m_scenePresence.IsChildAgent)
             {
                 if (m_animations.TrySetDefaultAnimation(
@@ -142,14 +148,14 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         /// </summary>
         public string GetMovementAnimation()
         {
-            const float FALL_DELAY = 0.33f;
-            const float PREJUMP_DELAY = 0.25f;
-
+//Console.WriteLine("GMA-------"); //##
+//#@            const float FALL_DELAY = 0.33f;
+            const float FALL_DELAY = 800f; //##    mS
+//rm for jumping            const float PREJUMP_DELAY = 0.25f;
+            const float PREJUMP_DELAY = 200f;           // mS add for jumping
+            const float JUMP_PERIOD = 800f;              // mS add for jumping
             #region Inputs
-            if (m_scenePresence.SitGround)
-            {
-                return "SIT_GROUND_CONSTRAINED";
-            }
+
             AgentManager.ControlFlags controlFlags = (AgentManager.ControlFlags)m_scenePresence.AgentControlFlags;
             PhysicsActor actor = m_scenePresence.PhysicsActor;
 
@@ -159,11 +165,10 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             Vector3 left = Vector3.Transform(Vector3.UnitY, rotMatrix);
 
             // Check control flags
-            bool heldForward = 
-                (((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) || ((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS));
-            bool heldBack = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG;
-            bool heldLeft = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS;
-            bool heldRight = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG;
+            bool heldForward = ((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_AT_POS || (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS);
+            bool heldBack = ((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG || (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG);
+            bool heldLeft = ((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS || (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_POS);
+            bool heldRight = ((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG || (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_NEG);
             //bool heldTurnLeft = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT) == AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT;
             //bool heldTurnRight = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT) == AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT;
             bool heldUp = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) == AgentManager.ControlFlags.AGENT_CONTROL_UP_POS;
@@ -182,8 +187,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
 
             // Is the avatar trying to move?
 //            bool moving = (move != Vector3.Zero);
-            bool jumping = m_animTickJump != 0;
-
+// rm for jumping            bool jumping = m_animTickJump != 0;
             #endregion Inputs
 
             #region Flying
@@ -192,6 +196,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             {
                 m_animTickFall = 0;
                 m_animTickJump = 0;
+                m_jumping = false;           //add for jumping
+                m_falling = true;            //add for falling
+                m_jumpVelocity = 0f;         //add for jumping
+                actor.Selected = false;      //add for jumping flag
+                m_fallHeight = actor.Position.Z;    // save latest flying height
 
                 if (move.X != 0f || move.Y != 0f)
                 {
@@ -203,8 +212,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                 }
                 else if (move.Z < 0f)
                 {
-                    if (actor != null && actor.IsColliding)
+                    if (actor != null && actor.IsColliding) 
+                    {  //##
+//Console.WriteLine("LAND FLYING"); // ##
                         return "LAND";
+                }  //#
                     else
                         return "HOVER_DOWN";
                 }
@@ -218,48 +230,127 @@ namespace OpenSim.Region.Framework.Scenes.Animation
 
             #region Falling/Floating/Landing
 
-            if (actor == null || !actor.IsColliding)
+// rm for jumping            if (actor == null || !actor.IsColliding)
+            if ((actor == null || !actor.IsColliding) && !m_jumping)       // add for jumping
             {
-                float fallElapsed = (float)(Environment.TickCount - m_animTickFall) / 1000f;
+// rm                float fallElapsed = (float)(Environment.TickCount - m_animTickFall) / 1000f;
+                float fallElapsed = (float)(Environment.TickCount - m_animTickFall);   // add, in mS
                 float fallVelocity = (actor != null) ? actor.Velocity.Z : 0.0f;
+//Console.WriteLine("falling    t={0}   v={1}", fallElapsed, fallVelocity);   //##
+
+// rm for fall          if (m_animTickFall == 0 || (fallElapsed > FALL_DELAY && fallVelocity >= 0.0f))
+                if (!m_jumping && (fallVelocity < -3.0f) ) m_falling = true;       // add for falling and jumping
 
-                if (m_animTickFall == 0 || (fallElapsed > FALL_DELAY && fallVelocity >= 0.0f))
+                if (m_animTickFall == 0 || (fallVelocity >= 0.0f))         // add for jumping
+                    // not falling yet   or  going up         
                 {
-                    // Just started falling
+                    // reset start of fall time
                     m_animTickFall = Environment.TickCount;
                 }
-                else if (!jumping && fallElapsed > FALL_DELAY)
+//                else if (!jumping && fallElapsed > FALL_DELAY)
+                else if (!m_jumping && (fallElapsed > FALL_DELAY) && (fallVelocity < -3.0f) && (m_scenePresence.m_wasFlying)) // add for falling and jumping
                 {
                     // Falling long enough to trigger the animation
+//Console.WriteLine("FALLDOWN");  //##
                     return "FALLDOWN";
                 }
-                else if (m_animTickJump == -1)
-                {
-                    m_animTickJump = 0; 
-                    return "STAND";
-                }
 
                 return m_movementAnimation;
             }
 
             #endregion Falling/Floating/Landing
 
+
+            #region Jumping     // section added for jumping...
+
+            int jumptime;
+            jumptime = Environment.TickCount - m_animTickJump;
+
+
+            if ((move.Z > 0f) && (!m_jumping))
+            {
+//Console.WriteLine("PJ {0}", jumptime); //##
+                // Start jumping, prejump
+                m_animTickFall = 0;
+                m_jumping = true;
+                m_falling = false;
+                actor.Selected = true;      // borrowed for jmping flag
+                m_animTickJump = Environment.TickCount;
+                m_jumpVelocity = 0.35f;
+                return "PREJUMP";
+            }
+
+            if(m_jumping)
+            {
+                if ( (jumptime > (JUMP_PERIOD * 1.5f)) && actor.IsColliding)
+                {
+//Console.WriteLine("LA {0}", jumptime); //##
+                    // end jumping
+                    m_jumping = false;
+                    m_falling = false;
+                    actor.Selected = false;      // borrowed for jumping flag
+                    m_jumpVelocity = 0f;
+                    m_animTickFall = Environment.TickCount;
+                    return "LAND";
+                }
+                else if (jumptime > JUMP_PERIOD)
+                {
+//Console.WriteLine("JD {0}", jumptime); //##
+                    // jump down
+                    m_jumpVelocity = 0f;
+                    return "JUMP";
+                }
+                else if (jumptime > PREJUMP_DELAY)
+                {
+//Console.WriteLine("JU {0}", jumptime); //##
+                    // jump up
+                    m_jumping = true;
+                    m_jumpVelocity = 10f;
+                    return "JUMP";
+                }
+            }
+
+            #endregion Jumping          // end added section
+
             #region Ground Movement
 
             if (m_movementAnimation == "FALLDOWN")
             {
+                m_falling = false;
                 m_animTickFall = Environment.TickCount;
-
                 // TODO: SOFT_LAND support
-                return "LAND";
+                float fallHeight = m_fallHeight - actor.Position.Z;
+//Console.WriteLine("Hit from  {0}", fallHeight);  //##
+                if (fallHeight > 15.0f)         // add for falling
+                    return "STANDUP";
+                else if (fallHeight > 8.0f)     // add for falling
+                    return "SOFT_LAND";         // add for falling
+                else                            // add for falling
+                    return "LAND";              // add for falling
             }
-            else if (m_movementAnimation == "LAND")
+// rm jumping                float landElapsed = (float)(Environment.TickCount - m_animTickFall) / 1000f;
+// rm jumping                if ((m_animTickFall != 0) && (landElapsed <= FALL_DELAY))
+// rm for landing                    return "LAND";
+            else if ((m_movementAnimation == "LAND") || (m_movementAnimation == "SOFT_LAND") || (m_movementAnimation == "STANDUP"))
             {
-                float landElapsed = (float)(Environment.TickCount - m_animTickFall) / 1000f;
-                if ((m_animTickFall != 0) && (landElapsed <= FALL_DELAY))
-                    return "LAND";
-            }
+                int landElapsed = Environment.TickCount - m_animTickFall; // add for jumping
+                int limit = 1000;   // add for jumping 
+                if(m_movementAnimation == "LAND") limit = 350;   // add for jumping 
+                // NB if the above is set too long a weird anim reset from some place prevents STAND from being sent to client
 
+                if ((m_animTickFall != 0) && (landElapsed <= limit))  // add for jumping 
+                {
+//Console.WriteLine("Lelapse {0}", m_movementAnimation);  //##
+                    return m_movementAnimation;
+                }
+                else
+                {
+//Console.WriteLine("end/STAND");  //##
+                    m_fallHeight = actor.Position.Z;    // save latest flying height
+                    return "STAND";
+                }
+            }
+/* This section removed, replaced by jumping section
             m_animTickFall = 0;
 
             if (move.Z > 0f)
@@ -271,7 +362,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                     m_animTickJump = Environment.TickCount;
                     return "PREJUMP";
                 }
-                else if (Environment.TickCount - m_animTickJump > PREJUMP_DELAY * 1000.0f)
+                else if (Environment.TickCount - m_animTickJump > PREJUMP_DELAY * 800.0f)
                 {
                     // Start actual jump
                     if (m_animTickJump == -1)
@@ -284,37 +375,40 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                     m_animTickJump = -1;
                     return "JUMP";
                 }
-                else
-                    return "JUMP";
             }
             else
             {
                 // Not jumping
                 m_animTickJump = 0;
-
-                if (move.X != 0f || move.Y != 0f)
-                {
-                    // Walking / crouchwalking / running
-                    if (move.Z < 0f)
-                        return "CROUCHWALK";
-                    else if (m_scenePresence.SetAlwaysRun)
-                        return "RUN";
-                    else
-                        return "WALK";
-                }
+  */
+            // next section moved outside paren. and realigned for jumping
+            if (move.X != 0f || move.Y != 0f)
+            {
+                m_fallHeight = actor.Position.Z;    // save latest flying height
+                m_falling = false;      // Add for falling
+                // Walking / crouchwalking / running
+                if (move.Z < 0f)
+                    return "CROUCHWALK";
+                else if (m_scenePresence.SetAlwaysRun)
+                    return "RUN";
                 else
-                {
-                    // Not walking
-                    if (move.Z < 0f)
-                        return "CROUCH";
-                    else
-                        return "STAND";
-                }
+                    return "WALK";
             }
-
+// rm for jumping            else
+            else if (!m_jumping)    // add for jumping
+            {
+                m_falling = false;      // Add for falling
+                // Not walking
+                if (move.Z < 0f)
+                    return "CROUCH";
+                else
+                    return "STAND";
+            }
+            // end section realign for jumping
             #endregion Ground Movement
 
-            //return m_movementAnimation;
+            m_falling = false;      // Add for falling
+            return m_movementAnimation;
         }
 
         /// <summary>
@@ -323,7 +417,15 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         public void UpdateMovementAnimations()
         {
             m_movementAnimation = GetMovementAnimation();
-            TrySetMovementAnimation(m_movementAnimation);
+/*            if (m_movementAnimation == "PREJUMP" && !m_scenePresence.Scene.m_usePreJump)
+            {
+                // This was the previous behavior before PREJUMP
+                TrySetMovementAnimation("JUMP");
+            }
+            else
+            {      removed for jumping */
+                TrySetMovementAnimation(m_movementAnimation);
+// rm for jumping            }
         }
 
         public UUID[] GetAnimationArray()