Ticket #3814: cinematic_camera_spline_clear.patch

source/graphics/CinemaPath.cpp

@@ -43 +43 @@
     : CCinemaData(data), TNSpline(spline), m_TargetSpline(targetSpline), m_TimeElapsed(0.f)
 {
     m_TimeElapsed = 0;
+
+    // Calculate curves by nodes
     BuildSpline();
+    m_TargetSpline.BuildSpline();
 
     if (m_Orientation == L"target")
     {

source/maths/NUSpline.h

@@ -15 +15 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-//Desc:  Contains classes for smooth splines
-//Borrowed from Game Programming Gems4.  (Slightly changed to better suit our purposes 
-//(and compatability).  Any references to external material can be found there
+// Desc:  Contains classes for smooth splines
+// Borrowed from Game Programming Gems4.  (Slightly changed to better suit our purposes 
+// (and compatability).  Any references to external material can be found there
 
 #ifndef INCLUDED_NUSPLINE
 #define INCLUDED_NUSPLINE
 
-#define MAX_SPLINE_NODES 40
-#include <stdlib.h>
+#define MAX_SPLINE_NODES 128
+#include <cstdlib>
 
 #include "FixedVector3D.h"
 #include "Vector3D.h"
 
+/**
+ * Struct for an Spline Node data
+ */
 struct SplineData
 {
     // Should be fixed, because used in the simulation
@@ -35 +38 @@
     CVector3D Velocity;
     // TODO: make rotation as other spline
     CFixedVector3D Rotation;
-    fixed Distance/*, DistanceOffset*/; //DistanceOffset is to keep track of how far into the spline this node is
+    fixed Distance; // Time interval to previous node, should be 0 for first node
 };
 
+
+/**
+ * Rounded Nonuniform Spline for describing spatial curves or paths with constant speed
+ */
 class RNSpline
 {
 public:
@@ -61 +68 @@
     CVector3D GetEndVelocity(int index);
 };
 
+
+/**
+ * Smooth Nonuniform Spline for describing paths with smooth acceleration and deceleration,
+ * but without turning
+ */
 class SNSpline : public RNSpline
 {
 public:
     virtual ~SNSpline() {}
-    void BuildSpline(){ RNSpline::BuildSpline(); Smooth(); Smooth(); Smooth(); }
+    void BuildSpline() { RNSpline::BuildSpline(); Smooth(); Smooth(); Smooth(); }
     void Smooth();
 };
 
+
+/**
+ * Timed Nonuniform Spline for paths with different time intervals between nodes
+ */
 class TNSpline : public SNSpline
 {
 public:
@@ -81 +97 @@
     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() { RNSpline::BuildSpline();  Smooth(); Smooth(); Smooth(); }
+    void Smooth() { for (int x = 0; x < 3; ++x) { SNSpline::Smooth(); Constrain(); } }
     void Constrain();
 };