Ticket #1846: 0001-Don-t-reinterpolate-if-the-position-of-a-component-d.2.patch

source/simulation2/components/CCmpPosition.cpp

@@ -123 +123 @@
 
         m_RotX = m_RotY = m_RotZ = entity_angle_t::FromInt(0);
         m_InterpolatedRotY = 0;
+
+        m_PositionChanged = false;
     }
 
     virtual void Deinit()
@@ -454 +456 @@
             m_LastX = m_X;
             m_LastZ = m_Z;
 
+            m_PositionChanged = m_X != m_PrevX || m_Z != m_PrevZ;
+
             break;
         }
         }
     }
 
+    virtual bool GetReinterpolate()
+    {
+        return m_PositionChanged;
+    }
+
 private:
     void AdvertisePositionChanges()
     {
@@ -472 +481 @@
             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;
 };
 
 REGISTER_COMPONENT_TYPE(Position)

source/simulation2/components/CCmpVisualActor.cpp

@@ -733 +733 @@
         UpdateVisibility();
         m_PreviouslyRendered = true;
     }
+    else if (!cmpPosition->GetReinterpolate() && m_ConstructionProgress.IsZero())
+    {
+        m_Unit->UpdateModel(frameTime);
+        return;
+    }
 
     // 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