Changeset 3433 in orxonox.OLD for orxonox/trunk/src/curve.h

Timestamp:

Mar 1, 2005, 2:36:56 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged back the trackManager to the trunk.
merged with command:
svn merge -r 3369:HEAD branches/trackManager trunk
resolved conflicts in world.cc additive differences.

File:

• orxonox/trunk/src/curve.h (modified) (5 diffs)

orxonox/trunk/src/curve.h

@@ -23 +23 @@
   Vector curvePoint;     //!< The point on the Cureve at a local Time.
   float localTime;       //!< If the time of one point is asked more than once the programm will not calculate it again.
-  Curve* dirCurve;       //!< The derivation-curve of this Curve.
   int derivation;        //!< Which derivation of a Curve is this.
 
@@ -42 +41 @@
   virtual void rebuild(void) = 0;
  public:
+  Curve* dirCurve;       //!< The derivation-curve of this Curve.
   void addNode(const Vector& newNode);
+  void addNode(const Vector& newNode, unsigned int insertPosition);
   Vector getNode(unsigned int nodeToFind);
   inline int getNodeCount(void) { return this->nodeCount;}
@@ -48 +49 @@
   virtual Vector calcPos(float t) = 0;
   virtual Vector calcDir(float t) = 0;
+  virtual Vector calcAcc(float t) = 0;
   virtual Quaternion calcQuat(float t) = 0;
  
+  // DEBUG
+  void debug(void);
 };
 
@@ -69 +73 @@
   Vector calcPos(float t);
   Vector calcDir(float t);
+  Vector calcAcc(float t);
   Quaternion calcQuat(float t);
   
@@ -105 +110 @@
   Vector calcPos(float t);
   Vector calcDir(float t);
+  Vector calcAcc(float t);
   Quaternion calcQuat(float t);