Ticket #3301: cinematic_camera_map_saving_fix.2.patch

source/graphics/CinemaPath.h

@@ -126 +126 @@
 
     fixed GetTimescale() const { return m_Timescale; }
 
-    TNSpline* getTargetSpline() { return &m_TargetSpline; }
+    const TNSpline& getTargetSpline() const { return m_TargetSpline; }
 
 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 CCinemaData* data = it->second.GetData();
-
+                
                 XML_Element("Path");
                 XML_Attribute("name", data->m_Name);
                 XML_Attribute("timescale", timescale);
@@ -419 +420 @@
                 XML_Attribute("mode", data->m_Mode);
                 XML_Attribute("style", data->m_Style);
 
-                // TODO: write target nodes
-                for (size_t j = 0; j < nodes.size(); ++j)
+                fixed last_target = fixed::Zero();
+                for (size_t i = 0, j = 0; i < nodes.size(); ++i)
                 {
                     XML_Element("Node");
-                    if (j > 0)
-                        XML_Attribute("deltatime", nodes[j - 1].Distance);
-                    else
-                        XML_Attribute("deltatime", 0.0f);
+                    fixed distance = i > 0 ? nodes[i - 1].Distance : fixed::Zero();
+                    last_target += distance;
 
+                    XML_Attribute("deltatime", distance);
+
                     {
                         XML_Element("Position");
-                        XML_Attribute("x", nodes[j].Position.X);
-                        XML_Attribute("y", nodes[j].Position.Y);
-                        XML_Attribute("z", nodes[j].Position.Z);
+                        XML_Attribute("x", nodes[i].Position.X);
+                        XML_Attribute("y", nodes[i].Position.Y);
+                        XML_Attribute("z", nodes[i].Position.Z);
                     }
 
                     {
                         XML_Element("Rotation");
-                        XML_Attribute("x", nodes[j].Rotation.X);
-                        XML_Attribute("y", nodes[j].Rotation.Y);
-                        XML_Attribute("z", nodes[j].Rotation.Z);
+                        XML_Attribute("x", nodes[i].Rotation.X);
+                        XML_Attribute("y", nodes[i].Rotation.Y);
+                        XML_Attribute("z", nodes[i].Rotation.Z);
                     }
+
+                    if (j >= target_nodes.size())
+                        continue;
+
+                    fixed target_distance = j > 0 ? target_nodes[j - 1].Distance : fixed::Zero();
+
+                    if (target_distance > last_target)
+                        continue;
+
+                    {
+                        XML_Element("Target");
+                        XML_Attribute("x", target_nodes[j].Position.X);
+                        XML_Attribute("y", target_nodes[j].Position.Y);
+                        XML_Attribute("z", target_nodes[j].Position.Z);
+                    }
+
+                    last_target = fixed::Zero();
+                    ++j;
                 }
             }
         }

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)
             {