Changeset 3019 in orxonox.OLD for orxonox/branches

Timestamp:

Nov 28, 2004, 1:46:56 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/bezierTrack: added Class Curve, and made BezierCurve derived from it

Location:

orxonox/branches/bezierTrack/src

Files:

• curve.cc (modified) (3 diffs)
• curve.h (modified) (2 diffs)

orxonox/branches/bezierTrack/src/curve.cc

@@ -17 +17 @@
 
 #include "curve.h"
+
+
+
+/**
+   \brief adds a new Node to the bezier Curve
+   \param newNode a Vector to the position of the new node
+*/
+void Curve::addNode(const Vector& newNode)
+{
+  if (nodeCount != 0 )
+    {
+      currentNode = currentNode->next = new PathNode;
+    }
+  currentNode->position = newNode;
+  currentNode->next = 0; // not sure if this really points to NULL!!
+  currentNode->number = (++nodeCount);
+  return;
+}
+
 
 /**
@@ -48 +67 @@
       delete tmpNode;
     }
-}
-
-/**
-   \brief adds a new Node to the bezier Curve
-   \param newNode a Vector to the position of the new node
-*/
-void BezierCurve::addNode(const Vector& newNode)
-{
-  if (nodeCount != 0 )
-    {
-      currentNode = currentNode->next = new PathNode;
-    }
-  currentNode->position = newNode;
-  currentNode->next = 0; // not sure if this really points to NULL!!
-  currentNode->number = (++nodeCount);
-  return;
 }
 
@@ -136 +139 @@
 
 
-int BezierCurve::ncr(int n, int i)
+int ncr(int n, int i)
 {
   int ret = 1;

orxonox/branches/bezierTrack/src/curve.h

@@ -12 +12 @@
 
 
-//! Bezier Curve
-/**
-   Class to handle bezier curves in 3-dimesnsional space
-   
-   needed for  the Tracking system in OrxOnoX.
-*/
-class BezierCurve
+
+class Curve
 {
- private:
+ protected:
   int nodeCount;
   Vector curvePoint;
-  
+
   struct PathNode
   {
@@ -34 +29 @@
   PathNode* currentNode; 
 
-  int ncr(int n, int i);
+ public:
 
+  void addNode (const Vector& newNode);
+
+};
+
+//! Bezier Curve
+/**
+   Class to handle bezier curves in 3-dimesnsional space
+   
+   needed for  the Tracking system in OrxOnoX.
+*/
+class BezierCurve : public Curve
+{
+ private:
+  // all from Curve-Class
  public:
   BezierCurve (void);
   ~BezierCurve (void);
-  void addNode (const Vector& newNode);
-  Vector calcPos (float t);
-  Vector calcDir (float t);
+  virtual Vector calcPos (float t);
+  virtual Vector calcDir (float t);
   
   Vector getPos () const;
 };
 
+int ncr(int n, int i);