Ticket #3814: cinematic_camera_cleanup_1.patch

source/graphics/CinemaPath.cpp

@@ -194 +194 @@
 #endif
 }
 
+CVector3D CCinemaPath::GetNodePosition(const int index) const
+{
+    return Node[index].Position;
+}
+
+fixed CCinemaPath::GetNodeDuration(const int index) const
+{
+    return Node[index].Distance;
+}
+
+fixed CCinemaPath::GetDuration() const
+{
+    return MaxDistance;
+}
+
+float CCinemaPath::GetNodeFraction() const
+{
+    return (m_TimeElapsed - m_PreviousNodeTime) / Node[m_CurrentNode].Distance.ToFloat();
+}
+
+float CCinemaPath::GetElapsedTime() const
+{
+    return m_TimeElapsed;
+}
+
+CStrW CCinemaPath::GetName() const
+{
+    return m_Name;
+}
+
+void CCinemaPath::SetTimescale(fixed scale)
+{
+    m_Timescale = scale;
+}
+
 void CCinemaPath::MoveToPointAt(float t, float nodet, const CVector3D& startRotation)
 {
     CCamera *camera = g_Game->GetView()->GetCamera();
@@ -288 +323 @@
     return t;
 }
 
+const CCinemaData* CCinemaPath::GetData() const
+{
+    return CCinemaData::GetData();
+}
+
 bool CCinemaPath::Validate()
 {
     if (m_TimeElapsed > GetDuration().ToFloat() || m_TimeElapsed < 0.0f)
@@ -324 +364 @@
 
     MoveToPointAt(m_TimeElapsed / GetDuration().ToFloat(), GetNodeFraction(), m_PreviousRotation);
     return true;
-}
- No newline at end of file
+}
+
+bool CCinemaPath::Empty() const
+{
+    return Node.empty();
+}
+
+fixed CCinemaPath::GetTimescale() const
+{
+    return m_Timescale;
+}
+
+const TNSpline& CCinemaPath::getTargetSpline() const
+{
+    return m_TargetSpline;
+}

source/graphics/CinemaPath.h

@@ -59 +59 @@
 public:
     CCinemaPath() : m_TimeElapsed(0), m_PreviousNodeTime(0) {}
     CCinemaPath(const CCinemaData& data, const TNSpline& spline, const TNSpline& targetSpline);
-    ~CCinemaPath() { DistStylePtr = NULL;  DistModePtr = NULL; }
 
     // Sets camera position to calculated point on spline
     void MoveToPointAt(float t, float nodet, const CVector3D&);
@@ -80 +79 @@
     float (CCinemaPath::*DistStylePtr)(float ratio) const;
     float (CCinemaPath::*DistModePtr)(float ratio) const;
 
-    const CCinemaData* GetData() const { return CCinemaData::GetData(); }
+    const CCinemaData* GetData() const;
 
 public:
 
@@ -88 +87 @@
     void DrawSpline(const RNSpline& spline, const CVector4D& RGBA, int smoothness, bool lines) const;
     void DrawNodes(const CVector4D& RGBA) const;
 
-    inline CVector3D GetNodePosition(const int index) const { return Node[index].Position; }
-    inline fixed GetNodeDuration(const int index) const { return Node[index].Distance; }
-    inline fixed GetDuration() const { return MaxDistance; }
+    CVector3D GetNodePosition(const int index) const;
+    fixed GetNodeDuration(const int index) const;
+    fixed GetDuration() const;
 
-    inline float GetNodeFraction() const { return (m_TimeElapsed - m_PreviousNodeTime) / Node[m_CurrentNode].Distance.ToFloat(); }
-    inline float GetElapsedTime() const { return m_TimeElapsed; }
+    float GetNodeFraction() const;
+    float GetElapsedTime() const;
 
-    CStrW GetName() const { return m_Name; }
+    CStrW GetName() const;
 
-    inline void SetTimescale(fixed scale) { m_Timescale = scale; }
+    void SetTimescale(fixed scale);
 
     float m_TimeElapsed;
     float m_PreviousNodeTime; // How much time has passed before the current node
@@ -122 +121 @@
     /**
      * Returns true if path doesn't contain nodes
      */
-    bool Empty() { return Node.empty(); }
+    bool Empty() const;
 
-    fixed GetTimescale() const { return m_Timescale; }
+    fixed GetTimescale() const;
 
-    const TNSpline& getTargetSpline() const { return m_TargetSpline; }
+    const TNSpline& getTargetSpline() const;
 
 private:
 

source/maths/NUSpline.cpp

@@ -44 +44 @@
 
 /*********************************** R N S **************************************************/
 
+RNSpline::RNSpline()
+    : NodeCount(0)
+{
+}
+
 // adds node and updates segment length
 void RNSpline::AddNode(const CFixedVector3D& pos)
 {
@@ -124 +129 @@
         Node[i+1].Position, endVel, t);
 }
 
+const std::vector<SplineData>& RNSpline::GetAllNodes() const
+{
+    return Node;
+}
+
 // internal. Based on Equation 14 
 CVector3D RNSpline::GetStartVelocity(int index)
 {
@@ -144 +154 @@
 
 /*********************************** S N S **************************************************/
 
+void SNSpline::BuildSpline()
+{
+    RNSpline::BuildSpline();
+    for (int i = 0; i < 3; ++i)
+        Smooth();
+}
+
 // smoothing filter.
 void SNSpline::Smooth()
 {
@@ -223 +240 @@
     Node.erase(Node.begin() + index, Node.begin() + index + 1);
     --NodeCount;
 }
+
 void TNSpline::UpdateNodeTime(const int index, fixed time)
 {
     if (NodeCount == 0 || index > NodeCount - 1)
@@ -230 +248 @@
 
     Node[index].Distance = time;
 }
+
 void TNSpline::UpdateNodePos(const int index, const CFixedVector3D& pos)
 {
     if (NodeCount == 0 || index > NodeCount - 1)
@@ -238 +257 @@
     Node[index].Position = pos;
 }
 
+void TNSpline::BuildSpline()
+{
+    RNSpline::BuildSpline();
+    for (int i = 0; i < 3; ++i)
+        Smooth();
+}
+
+void TNSpline::Smooth()
+{
+    for (int i = 0; i < 3; ++i)
+    {
+        SNSpline::Smooth();
+        Constrain();
+    }
+}
+
 void TNSpline::Constrain()
 {
     if (NodeCount < 3)

source/maths/NUSpline.h

@@ -51 +51 @@
 {
 public:
 
-    RNSpline() { NodeCount = 0; }
-    virtual ~RNSpline() {}
+    RNSpline();
+    virtual ~RNSpline() = default;
 
     void AddNode(const CFixedVector3D& pos);
     void BuildSpline();
     CVector3D GetPosition(float time) const;
     CVector3D GetRotation(float time) const;
-    const std::vector<SplineData>& GetAllNodes() const { return Node; }
+    const std::vector<SplineData>& GetAllNodes() const;
 
     fixed MaxDistance;
     int NodeCount;
@@ -78 +78 @@
 class SNSpline : public RNSpline
 {
 public:
-    virtual ~SNSpline() {}
-    void BuildSpline(){ RNSpline::BuildSpline(); Smooth(); Smooth(); Smooth(); }
+    virtual ~SNSpline() = default;
+
+    void BuildSpline();
     void Smooth();
 };
 
@@ -90 +91 @@
 class TNSpline : public SNSpline
 {
 public:
-    virtual ~TNSpline() {}
+    virtual ~TNSpline() = default;
 
     void AddNode(const CFixedVector3D& pos, const CFixedVector3D& rotation, fixed timePeriod);
-    void PushNode() { Node.push_back( SplineData() ); }
     void InsertNode(const int index, const CFixedVector3D& pos, const CFixedVector3D& rotation, fixed timePeriod);
     void RemoveNode(const int index);
+    void UpdateNodePos(const int index, const CFixedVector3D& pos);
     void UpdateNodeTime(const int index, fixed time);
-    void UpdateNodePos(const int index, const CFixedVector3D& pos);
 
-    void BuildSpline(){ RNSpline::BuildSpline();  Smooth(); Smooth(); Smooth(); }
-    void Smooth(){ for (int x = 0; x < 3; ++x) { SNSpline::Smooth(); Constrain(); } }
+    void BuildSpline();
+    void Smooth();
     void Constrain();
 };