merge

1 files changed, 50 insertions, 33 deletions

diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index d81d8a2..80ee510 100644
--- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -295,6 +295,7 @@ namespace OpenSim.Region.Framework.Scenes
             lock (m_frames)
             {
                 KeyframeTimer.Add(this);
+                m_lasttickMS = Util.GetTimeStampMS();
                 m_timerStopped = false;
             }
         }
@@ -326,8 +327,8 @@ namespace OpenSim.Region.Framework.Scenes
                         newMotion.m_selected = true;
                 }
 
-                newMotion.m_timerStopped = false;
-                newMotion.m_running = true;
+//                newMotion.m_timerStopped = false;
+//                newMotion.m_running = true;
                 newMotion.m_isCrossing = false;
                 newMotion.m_waitingCrossing = false;
             }
@@ -483,9 +484,10 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_group.RootPart.Velocity = Vector3.Zero;
             m_group.RootPart.AngularVelocity = Vector3.Zero;
-            m_group.SendGroupRootTerseUpdate();
-//            m_group.RootPart.ScheduleTerseUpdate();
+//            m_group.SendGroupRootTerseUpdate();
+            m_group.RootPart.ScheduleTerseUpdate();
             m_frames.Clear();
+            m_group.Scene.EventManager.TriggerMovingEndEvent(m_group.RootPart.LocalId);
         }
 
         public void Pause()
@@ -496,8 +498,9 @@ namespace OpenSim.Region.Framework.Scenes
             m_group.RootPart.Velocity = Vector3.Zero;
             m_group.RootPart.AngularVelocity = Vector3.Zero;
             m_skippedUpdates = 1000;
-            m_group.SendGroupRootTerseUpdate();
-//            m_group.RootPart.ScheduleTerseUpdate();
+//            m_group.SendGroupRootTerseUpdate();
+            m_group.RootPart.ScheduleTerseUpdate();
+            m_group.Scene.EventManager.TriggerMovingEndEvent(m_group.RootPart.LocalId);
         }
 
         public void Suspend()
@@ -644,15 +647,16 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_group.RootPart.Velocity = Vector3.Zero;
             m_group.RootPart.AngularVelocity = Vector3.Zero;
-            m_group.SendGroupRootTerseUpdate();
- 
+//            m_group.SendGroupRootTerseUpdate();
+            m_group.RootPart.ScheduleTerseUpdate();
             m_frames.Clear();
         }
 
-        Vector3 m_lastPosUpdate;
-        Quaternion m_lastRotationUpdate;
-        Vector3 m_currentVel;
-        int m_skippedUpdates;
+        [NonSerialized()] Vector3 m_lastPosUpdate;
+        [NonSerialized()] Quaternion m_lastRotationUpdate;
+        [NonSerialized()] Vector3 m_currentVel;
+        [NonSerialized()] int m_skippedUpdates;
+        [NonSerialized()] double m_lasttickMS;
 
         private void DoOnTimer(double tickDuration)
         {
@@ -673,7 +677,8 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     m_group.RootPart.Velocity = Vector3.Zero;
                     m_skippedUpdates = 1000;
-                    m_group.SendGroupRootTerseUpdate();
+//                    m_group.SendGroupRootTerseUpdate();
+                    m_group.RootPart.ScheduleTerseUpdate();
                 }
                 return;
             }
@@ -696,6 +701,8 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
             }
 
+            double nowMS = Util.GetTimeStampMS();
+
             if (m_frames.Count == 0)
             {
                 lock (m_frames)
@@ -716,10 +723,16 @@ namespace OpenSim.Region.Framework.Scenes
                 m_currentVel /= (m_currentFrame.TimeMS * 0.001f);
 
                 m_currentFrame.TimeMS += (int)tickDuration;
+                m_lasttickMS = nowMS - 50f;
                 update = true;
             }
 
-            m_currentFrame.TimeMS -= (int)tickDuration;
+            int elapsed = (int)(nowMS - m_lasttickMS);
+            if( elapsed > 3 * tickDuration)
+                elapsed = (int)tickDuration;
+
+            m_currentFrame.TimeMS -= elapsed;
+            m_lasttickMS = nowMS;
 
             // Do the frame processing
             double remainingSteps = (double)m_currentFrame.TimeMS / tickDuration;
@@ -752,7 +765,8 @@ namespace OpenSim.Region.Framework.Scenes
             }
             else
             {
-                bool lastSteps = remainingSteps < 4;
+//                bool lastSteps = remainingSteps < 4;
+        
                 Vector3 currentPosition = m_group.AbsolutePosition;
                 Vector3 motionThisFrame = (Vector3)m_currentFrame.Position - currentPosition;
                 motionThisFrame /= (float)remainingSteps;
@@ -766,20 +780,22 @@ namespace OpenSim.Region.Framework.Scenes
                     Quaternion step = Quaternion.Slerp(m_currentFrame.StartRotation, (Quaternion)m_currentFrame.Rotation, completed);
                     step.Normalize();
                     m_group.RootPart.RotationOffset = step;
+/*
                     if (Math.Abs(step.X - m_lastRotationUpdate.X) > 0.001f
                         || Math.Abs(step.Y - m_lastRotationUpdate.Y) > 0.001f
                         || Math.Abs(step.Z - m_lastRotationUpdate.Z) > 0.001f)
                         update = true;
+*/
                 }
 
                 m_group.AbsolutePosition = m_nextPosition;
-                if(lastSteps)
-                    m_group.RootPart.Velocity = Vector3.Zero;
-                else
+//                if(lastSteps)
+//                    m_group.RootPart.Velocity = Vector3.Zero;
+//                else
                     m_group.RootPart.Velocity = m_currentVel;
-
+/*
                 if(!update && (
-                    lastSteps ||
+//                    lastSteps ||
                     m_skippedUpdates * tickDuration > 0.5 ||
                     Math.Abs(m_nextPosition.X - currentPosition.X) > 5f ||
                     Math.Abs(m_nextPosition.Y - currentPosition.Y) > 5f ||
@@ -790,15 +806,16 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 else
                     m_skippedUpdates++;
-
-            }
-            if(update)
-            {
-                m_lastPosUpdate = m_nextPosition;
-                m_lastRotationUpdate = m_group.GroupRotation; 
-                m_skippedUpdates = 0;
-                m_group.SendGroupRootTerseUpdate();
-            }
+*/
+            }
+//            if(update)
+//            {
+//                m_lastPosUpdate = m_nextPosition;
+//                m_lastRotationUpdate = m_group.GroupRotation; 
+//                m_skippedUpdates = 0;
+//                m_group.SendGroupRootTerseUpdate();
+                m_group.RootPart.ScheduleTerseUpdate();
+//            }
         }
 
         public Byte[] Serialize()
@@ -842,8 +859,8 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_group.RootPart.Velocity = Vector3.Zero;
                 m_skippedUpdates = 1000;
-                m_group.SendGroupRootTerseUpdate();
-//                m_group.RootPart.ScheduleTerseUpdate();
+//                m_group.SendGroupRootTerseUpdate();
+                m_group.RootPart.ScheduleTerseUpdate();
             }
         }
 
@@ -855,8 +872,8 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_group.RootPart.Velocity = Vector3.Zero;
                 m_skippedUpdates = 1000;
-                m_group.SendGroupRootTerseUpdate();
-//                m_group.RootPart.ScheduleTerseUpdate();
+//                m_group.SendGroupRootTerseUpdate();
+                m_group.RootPart.ScheduleTerseUpdate();
 
                 if (m_running)
                 {