Ticket #3814: cinematic_camera_cleanup_2.patch

source/graphics/CinemaPath.cpp

@@ -89 +89 @@
 void CCinemaPath::Draw() const
 {
     DrawSpline(*this, CVector4D(0.2f, 0.2f, 1.f, 0.5f), 100, true);
+    DrawNodes(*this, CVector4D(0.5f, 1.0f, 0.f, 0.5f));
+
+    if (!m_LookAtTarget)
+        return;
+
     DrawSpline(m_TargetSpline, CVector4D(1.0f, 0.2f, 0.2f, 0.5f), 100, true);
-    DrawNodes(CVector4D(0.5f, 1.0f, 0.f, 0.5f));
+    DrawNodes(m_TargetSpline, CVector4D(1.0f, 0.5f, 0.f, 0.5f));
 }
 
 void CCinemaPath::DrawSpline(const RNSpline& spline, const CVector4D& RGBA, int smoothness, bool lines) const
@@ -157 +162 @@
 #endif
 }
 
-void CCinemaPath::DrawNodes(const CVector4D& RGBA) const
+void CCinemaPath::DrawNodes(const RNSpline& spline, const CVector4D& RGBA) const
 {
 #if CONFIG2_GLES
     #warning TODO : do something about CCinemaPath on GLES
@@ -167 +172 @@
 
     glColor4f(RGBA.X, RGBA.Y, RGBA.Z, RGBA.W);
     glBegin(GL_POINTS);
-    for (size_t i = 0; i < Node.size(); ++i)
-        glVertex3f(Node[i].Position.X.ToFloat(), Node[i].Position.Y.ToFloat(), Node[i].Position.Z.ToFloat());
+    const std::vector<SplineData> nodes = spline.GetAllNodes();
+    for (size_t i = 0; i < nodes.size(); ++i)
+        glVertex3f(nodes[i].Position.X.ToFloat(), nodes[i].Position.Y.ToFloat(), nodes[i].Position.Z.ToFloat());
     glEnd();
 
-    if (!m_LookAtTarget)
-    {
-        glPointSize(1.0f);
-        glDisable(GL_POINT_SMOOTH);
-        return;
-    }
-
-    // draw target nodes
-    glColor4f(RGBA.Y, RGBA.X, RGBA.Z, RGBA.W);
-    glBegin(GL_POINTS);
-    for (size_t i = 0; i < m_TargetSpline.GetAllNodes().size(); ++i)
-        glVertex3f(
-            m_TargetSpline.GetAllNodes()[i].Position.X.ToFloat(),
-            m_TargetSpline.GetAllNodes()[i].Position.Y.ToFloat(),
-            m_TargetSpline.GetAllNodes()[i].Position.Z.ToFloat()
-        );
-    glEnd();
-
     glPointSize(1.0f);
     glDisable(GL_POINT_SMOOTH);
 #endif
@@ -357 +345 @@
 {
     m_TimeElapsed += m_Timescale.ToFloat() * deltaRealTime;
     if (!Validate())
-    {
-        m_TimeElapsed = 0.0f;
         return false;
-    }
 
     MoveToPointAt(m_TimeElapsed / GetDuration().ToFloat(), GetNodeFraction(), m_PreviousRotation);
     return true;
@@ -371 +356 @@
     return Node.empty();
 }
 
+void CCinemaPath::Reset()
+{
+    m_TimeElapsed = 0.0f;
+}
+
 fixed CCinemaPath::GetTimescale() const
 {
     return m_Timescale;
 }
 
-const TNSpline& CCinemaPath::getTargetSpline() const
+const TNSpline& CCinemaPath::GetTargetSpline() const
 {
     return m_TargetSpline;
 }

source/graphics/CinemaPath.h

@@ -85 +85 @@
 
     void Draw() const;
     void DrawSpline(const RNSpline& spline, const CVector4D& RGBA, int smoothness, bool lines) const;
-    void DrawNodes(const CVector4D& RGBA) const;
+    void DrawNodes(const RNSpline& spline, const CVector4D& RGBA) const;
 
     CVector3D GetNodePosition(const int index) const;
     fixed GetNodeDuration(const int index) const;
@@ -123 +123 @@
      */
     bool Empty() const;
 
+    /**
+     * Resets the path state
+     */
+    void Reset();
+
     fixed GetTimescale() const;
 
-    const TNSpline& getTargetSpline() const;
+    const TNSpline& GetTargetSpline() const;
 
 private:
 

source/graphics/MapWriter.cpp

@@ -410 +410 @@
             {
                 fixed timescale = it->second.GetTimescale();
                 const std::vector<SplineData>& nodes = it->second.GetAllNodes();
-                const std::vector<SplineData>& target_nodes = it->second.getTargetSpline().GetAllNodes();
+                const std::vector<SplineData>& target_nodes = it->second.GetTargetSpline().GetAllNodes();
                 const CCinemaData* data = it->second.GetData();
                 
                 XML_Element("Path");

source/simulation2/components/CCmpCinemaManager.cpp

@@ -96 +96 @@
             if (!data->m_LookAtTarget)
                 continue;
 
-            const std::vector<SplineData>& targetNodes = path.getTargetSpline().GetAllNodes();
+            const std::vector<SplineData>& targetNodes = path.GetTargetSpline().GetAllNodes();
             serialize.NumberU32("NumberOfTargetNodes", targetNodes.size(), 1, MAX_SPLINE_NODES);
             for (size_t i = 0; i < targetNodes.size(); ++i)
             {
                 if (i > 0)
-                    serialize.NumberFixed_Unbounded("NodeDeltaTime", nodes[i - 1].Distance);
+                    serialize.NumberFixed_Unbounded("NodeDeltaTime", targetNodes[i - 1].Distance);
                 else
                     serialize.NumberFixed_Unbounded("NodeDeltaTime", fixed::Zero());
-                serialize.NumberFixed_Unbounded("PositionX", nodes[i].Position.X);
-                serialize.NumberFixed_Unbounded("PositionY", nodes[i].Position.Y);
-                serialize.NumberFixed_Unbounded("PositionZ", nodes[i].Position.Z);
+                serialize.NumberFixed_Unbounded("PositionX", targetNodes[i].Position.X);
+                serialize.NumberFixed_Unbounded("PositionY", targetNodes[i].Position.Y);
+                serialize.NumberFixed_Unbounded("PositionZ", targetNodes[i].Position.Z);
             }
         }
     }
@@ -188 +188 @@
             if (!pCinematicSimulationData->m_Enabled)
                 break;
 
+            pCinematicSimulationData->m_ElapsedTime += msgData.turnLength;
+            pCinematicSimulationData->m_CurrentPathElapsedTime += msgData.turnLength;
+            if (pCinematicSimulationData->m_CurrentPathElapsedTime >= pCinematicSimulationData->m_PathQueue.front().GetDuration())
+            {
+                CMessageCinemaPathEnded msgCinemaPathEnded(pCinematicSimulationData->m_PathQueue.front().GetName());
+                pCinematicSimulationData->m_PathQueue.pop_front();
+                g_Game->GetSimulation2()->PostMessage(SYSTEM_ENTITY, msgCinemaPathEnded);
+                pCinematicSimulationData->m_CurrentPathElapsedTime = fixed::Zero();
+                if (!pCinematicSimulationData->m_PathQueue.empty())
+                    pCinematicSimulationData->m_PathQueue.front().Reset();
+            }
             if (pCinematicSimulationData->m_ElapsedTime >= pCinematicSimulationData->m_TotalTime)
             {
+                pCinematicSimulationData->m_CurrentPathElapsedTime = fixed::Zero();
                 pCinematicSimulationData->m_ElapsedTime = fixed::Zero();
                 pCinematicSimulationData->m_TotalTime = fixed::Zero();
                 g_Game->GetView()->GetCinema()->SetEnabled(false);
                 g_Game->GetSimulation2()->PostMessage(SYSTEM_ENTITY, CMessageCinemaQueueEnded());
             }
-            else
-            {
-                pCinematicSimulationData->m_ElapsedTime += msgData.turnLength;
-                pCinematicSimulationData->m_CurrentPathElapsedTime += msgData.turnLength;
-                if (pCinematicSimulationData->m_CurrentPathElapsedTime >= pCinematicSimulationData->m_PathQueue.front().GetDuration())
-                {
-                    CMessageCinemaPathEnded msgCinemaPathEnded(pCinematicSimulationData->m_PathQueue.front().GetName());
-                    pCinematicSimulationData->m_PathQueue.pop_front();
-                    g_Game->GetSimulation2()->PostMessage(SYSTEM_ENTITY, msgCinemaPathEnded);
-                }
-            }
             break;
         }
         default:
@@ -218 +219 @@
         if (!g_Game || !g_Game->GetView())
             return;
         g_Game->GetView()->GetCinema()->AddPathToQueue(name);
-        CinematicSimulationData* pGetCinematicSimulationData = g_Game->GetView()->GetCinema()->GetCinematicSimulationData();
-        pGetCinematicSimulationData->m_TotalTime += pGetCinematicSimulationData->m_Paths[name].GetDuration();
+        CinematicSimulationData* pCinematicSimulationData = g_Game->GetView()->GetCinema()->GetCinematicSimulationData();
+        if (pCinematicSimulationData->m_PathQueue.size() == 1)
+            pCinematicSimulationData->m_PathQueue.front().Reset();
+        pCinematicSimulationData->m_TotalTime += pCinematicSimulationData->m_Paths[name].GetDuration();
     }
 
     virtual void Play()