Ticket #1865: 0002-Move-checking-for-reinterpolation-after-a-position-h.patch

source/simulation2/components/CCmpPosition.cpp

@@ -72 +72 @@
     entity_pos_t m_YOffset;
     bool m_RelativeToGround; // whether m_YOffset is relative to terrain/water plane, or an absolute height
 
-    entity_angle_t m_RotX, m_RotY, m_LastRotY, m_PrevRotY, m_RotZ;
+    entity_angle_t m_RotX, m_RotY, m_RotZ;
     float m_InterpolatedRotY; // not serialized
 
     static std::string GetSchema()
@@ -121 +121 @@
 
         m_RotYSpeed = paramNode.GetChild("TurnRate").ToFixed().ToFloat();
 
-        m_RotX = m_RotY = m_RotZ = m_PrevRotY = m_LastRotY = entity_angle_t::FromInt(0);
+        m_RotX = m_RotY = m_RotZ = entity_angle_t::FromInt(0);
         m_InterpolatedRotY = 0;
-
-        m_PositionChanged = false;
-        m_Interpolated = false;
     }
 
     virtual void Deinit()
@@ -330 +327 @@
     virtual void SetYRotation(entity_angle_t y)
     {
         m_RotY = y;
-        m_PrevRotY = y;
-        m_LastRotY = y;
         m_InterpolatedRotY = m_RotY.ToFloat();
 
         AdvertisePositionChanges();
@@ -422 +417 @@
         {
         case MT_Interpolate:
         {
-            m_Interpolated = true;
-            if (!m_PositionChanged)
-                return;
-            
             const CMessageInterpolate& msgData = static_cast<const CMessageInterpolate&> (msg);
 
             float rotY = m_RotY.ToFloat();
@@ -447 +438 @@
             // Store the positions from the turn before
             m_PrevX = m_LastX;
             m_PrevZ = m_LastZ;
-            m_PrevRotY = m_LastRotY;
 
             m_LastX = m_X;
             m_LastZ = m_Z;
-            m_LastRotY = m_RotY;
-
-            m_PositionChanged = m_X != m_PrevX || m_Z != m_PrevZ || m_RotY != m_PrevRotY || !m_Interpolated;
-            m_Interpolated = false;
 
             break;
         }
         }
     }
 
-    virtual bool GetReinterpolate()
-    {
-        return m_PositionChanged;
-    }
-
 private:
     void AdvertisePositionChanges()
     {
@@ -479 +460 @@
             CMessagePositionChanged msg(GetEntityId(), false, entity_pos_t::Zero(), entity_pos_t::Zero(), entity_angle_t::Zero());
             GetSimContext().GetComponentManager().PostMessage(GetEntityId(), msg);
         }
-        m_PositionChanged = true;
     }
-
-    bool m_PositionChanged;
-    bool m_Interpolated;
 };
 
 REGISTER_COMPONENT_TYPE(Position)

source/simulation2/components/CCmpVisualActor.cpp

@@ -42 +42 @@
 #include "maths/Matrix3D.h"
 #include "maths/Vector3D.h"
 #include "ps/CLogger.h"
+#include "ps/Game.h"
+#include "network/NetTurnManager.h"
 #include "renderer/Scene.h"
 
 #include "tools/atlas/GameInterface/GameLoop.h"
@@ -55 +57 @@
         componentManager.SubscribeToMessageType(MT_Interpolate);
         componentManager.SubscribeToMessageType(MT_RenderSubmit);
         componentManager.SubscribeToMessageType(MT_OwnershipChanged);
+        componentManager.SubscribeToMessageType(MT_PositionChanged);
         componentManager.SubscribeGloballyToMessageType(MT_TerrainChanged);
     }
 
@@ -83 +86 @@
     bool m_ConstructionPreview;
     fixed m_ConstructionProgress;
 
+    bool m_Interpolated;
+    u32 m_PositionChangedTurn;
+
     static std::string GetSchema()
     {
         return
@@ -172 +178 @@
 
         // We need to select animation even if graphics are disabled, as this modifies serialized state
         SelectAnimation("idle", false, fixed::FromInt(1), L"");
+
+        m_Interpolated = false;
+        m_PositionChangedTurn = 0;
     }
 
     virtual void Deinit()
@@ -285 +294 @@
             m_Unit->GetModel().SetTerrainDirty(msgData.i0, msgData.j0, msgData.i1, msgData.j1);
             break;
         }
+        case MT_PositionChanged:
+        {
+            // The position was changed, so we need to interpolate again
+            m_PositionChangedTurn = g_Game->GetTurnManager()->GetCurrentTurn();
+            m_Interpolated = false;
+            break;
+        }
         }
     }
 
@@ -726 +742 @@
     if (m_Unit == NULL)
         return;
 
+    if (m_Interpolated && m_ConstructionProgress.IsZero() && !g_AtlasGameLoop->running)
+    {
+        // Position hasn't changed so skip most of the work.  Special cases are when placing a building or being
+        // in atlas (since terrain height can change in atlas)
+        m_Unit->UpdateModel(frameTime);
+        return;
+    }
+
     // Disable rendering of the unit if it has no position
     CmpPtr<ICmpPosition> cmpPosition(GetSimContext(), GetEntityId());
     if (!cmpPosition || !cmpPosition->IsInWorld())
@@ -735 +759 @@
         UpdateVisibility();
         m_PreviouslyRendered = true;
     }
-    else if (!cmpPosition->GetReinterpolate() && m_ConstructionProgress.IsZero() &&
-             !g_AtlasGameLoop->running)
-    {
-        // Position hasn't changed so skip most of the work.  Special cases are when placing a building or being
-        // in atlas (since terrain height can change in atlas)
-        m_Unit->UpdateModel(frameTime);
-        return;
-    }
+
+    m_Interpolated = (g_Game->GetTurnManager()->GetCurrentTurn() > m_PositionChangedTurn);
 
     // Even if HIDDEN due to LOS, we need to set up the transforms
     // so that projectiles will be launched from the right place

source/simulation2/components/ICmpPosition.cpp

@@ -38 +38 @@
 DEFINE_INTERFACE_METHOD_1("SetYRotation", void, ICmpPosition, SetYRotation, entity_angle_t)
 DEFINE_INTERFACE_METHOD_2("SetXZRotation", void, ICmpPosition, SetXZRotation, entity_angle_t, entity_angle_t)
 DEFINE_INTERFACE_METHOD_0("GetRotation", CFixedVector3D, ICmpPosition, GetRotation)
-DEFINE_INTERFACE_METHOD_0("GetReinterpolate", bool, ICmpPosition, GetReinterpolate)
 // Excluded: GetInterpolatedTransform (not safe for scripts)
 END_INTERFACE_WRAPPER(Position)

source/simulation2/components/ICmpPosition.h

@@ -168 +168 @@
      */
     virtual CMatrix3D GetInterpolatedTransform(float frameOffset, bool forceFloating) = 0;
 
-    virtual bool GetReinterpolate() = 0;
-
     DECLARE_INTERFACE_TYPE(Position)
 };
 

source/simulation2/components/tests/test_RangeManager.h

@@ -59 +59 @@
     virtual fixed GetDistanceTravelled() { return fixed::Zero(); }
     virtual void GetInterpolatedPosition2D(float UNUSED(frameOffset), float& x, float& z, float& rotY) { x = z = rotY = 0; }
     virtual CMatrix3D GetInterpolatedTransform(float UNUSED(frameOffset), bool UNUSED(forceFloating)) { return CMatrix3D(); }
-    virtual bool GetReinterpolate() { return true; } 
 };
 
 class TestCmpRangeManager : public CxxTest::TestSuite