From 5a8fdc8a0b79c14382872571b113b5c5559083c4 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 23 Apr 2012 20:16:53 +0100
Subject: ubitODE - do own timing control (as chODE does) until heartbeat does
 it right

---
 OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs  |  8 ++--
 OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 47 +++++++++++++++---------
 2 files changed, 34 insertions(+), 21 deletions(-)

(limited to 'OpenSim/Region/Physics')

diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
index 7c0bbef..dc6c18d 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
@@ -695,7 +695,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                     m_PIDTau = 0;
                 else
                 {
-                    float mint = (0.05f > _parent_scene.ODE_STEPSIZE ? 0.05f : _parent_scene.ODE_STEPSIZE);
+                    float mint = (0.05f > m_timeStep ? 0.05f : m_timeStep);
                     if (value < mint)
                         m_PIDTau = mint;
                     else
@@ -723,7 +723,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                     m_PIDHoverTau = 0;
                 else
                 {
-                    float mint = (0.05f > _parent_scene.ODE_STEPSIZE ? 0.05f : _parent_scene.ODE_STEPSIZE);
+                    float mint = (0.05f > m_timeStep ? 0.05f : m_timeStep);
                     if (value < mint)
                         m_PIDHoverTau = mint;
                     else
@@ -801,7 +801,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         {
             if (force.IsFinite())
             {
-                AddChange(changes.AddForce, force / _parent_scene.ODE_STEPSIZE);
+                AddChange(changes.AddForce, force * m_invTimeStep);
             }
             else
             {
@@ -814,7 +814,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         {
             if (force.IsFinite())
             {
-                AddChange(changes.AddAngForce, force / _parent_scene.ODE_STEPSIZE);
+                AddChange(changes.AddAngForce, force * m_invTimeStep);
             }
             else
             {
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index 1d9fa93..cf74f14 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -189,9 +189,12 @@ namespace OpenSim.Region.Physics.OdePlugin
         private const uint m_regionHeight = Constants.RegionSize;
 
         public float ODE_STEPSIZE = 0.020f;
+        public float HalfOdeStep = 0.01f;
         private float metersInSpace = 25.6f;
         private float m_timeDilation = 1.0f;
 
+        DateTime m_lastframe;
+
         public float gravityx = 0f;
         public float gravityy = 0f;
         public float gravityz = -9.8f;
@@ -485,6 +488,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                 }
             }
 
+            HalfOdeStep = ODE_STEPSIZE * 0.5f;
+
             ContactgeomsArray = Marshal.AllocHGlobal(contactsPerCollision * d.ContactGeom.unmanagedSizeOf);
             GlobalContactsArray = GlobalContactsArray = Marshal.AllocHGlobal(maxContactsbeforedeath * d.Contact.unmanagedSizeOf);
 
@@ -564,6 +569,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             // let this now be real maximum values
             spaceGridMaxX--;
             spaceGridMaxY--;
+            m_lastframe = DateTime.UtcNow;
         }
 
         internal void waitForSpaceUnlock(IntPtr space)
@@ -1685,24 +1691,30 @@ namespace OpenSim.Region.Physics.OdePlugin
         /// <returns></returns>
         public override float Simulate(float timeStep)
         {
+
+            DateTime now = DateTime.UtcNow;
+            TimeSpan SinceLastFrame = now - m_lastframe;
+            m_lastframe = now;
+            timeStep = (float)SinceLastFrame.TotalSeconds;
+            
             // acumulate time so we can reduce error
             step_time += timeStep;
 
-            if (step_time < ODE_STEPSIZE)
+            if (step_time < HalfOdeStep)
                 return 0;
 
-            if (framecount >= int.MaxValue)
+            if (framecount < 0)
                 framecount = 0;
 
             framecount++;
 
-            int curphysiteractions = m_physicsiterations;
+            int curphysiteractions;
 
+            // if in trouble reduce step resolution
             if (step_time >= m_SkipFramesAtms)
-            {
-                // if in trouble reduce step resolution
-                curphysiteractions /= 2;
-            }
+                curphysiteractions = m_physicsiterations / 2;
+            else
+                curphysiteractions = m_physicsiterations;
 
             int nodeframes = 0;
 
@@ -1722,8 +1734,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                     base.TriggerPhysicsBasedRestart();
                 }
 
-
-                while (step_time >= ODE_STEPSIZE && nodeframes < 10) //limit number of steps so we don't say here for ever
+                while (step_time >= HalfOdeStep && nodeframes < 10) //limit number of steps so we don't say here for ever
                 {
                     try
                     {
@@ -1905,15 +1916,17 @@ namespace OpenSim.Region.Physics.OdePlugin
                     d.WorldExportDIF(world, fname, physics_logging_append_existing_logfile, prefix);
                 }
                 
-                // think time dilation is not a physics issue alone..  but ok let's fake something
-                if (step_time < ODE_STEPSIZE) // we did the required loops
+                // think time dilation as to do with dinamic step size that we dont' have
+                // even so tell something to world
+                if (nodeframes < 10) // we did the requested loops
                     m_timeDilation = 1.0f;
-                else
-                { // we didn't forget the lost ones and let user know something
-                    m_timeDilation = 1 - step_time / timeStep;
-                    if (m_timeDilation < 0)
-                        m_timeDilation = 0;
-                    step_time = 0;
+                else if (step_time > 0)
+                {
+                    m_timeDilation = timeStep / step_time;
+                    if (m_timeDilation > 1)
+                        m_timeDilation = 1;
+                    if (step_time > m_SkipFramesAtms)
+                        step_time = 0;
                 }
             }
 
-- 
cgit v1.1