Changeset 10091 in orxonox.OLD for branches/playability/src/util/track/track.cc

Timestamp:

Dec 18, 2006, 4:36:03 PM (17 years ago)

Author:

bknecht

Message:

a few more steps fusing TrackElement and TrackManager to Track.. not very far, can't really work during the afternoon. Will have some time this evening

File:

• branches/playability/src/util/track/track.cc (modified) (6 diffs)

branches/playability/src/util/track/track.cc

@@ -26 +26 @@
 #include "track/track.h"
 
-#include "track/track_manager.h"
 #include "p_node.h"
 
@@ -59 +58 @@
 void Track::init()
 {
-  // resetting all elements
-  this->firstTrackElem = NULL;
-
-
-  // make a debug track
-  this->firstTrackElem = new TrackElement();
-  this->firstTrackElem->ID = 1;
-  this->firstTrackElem->setName("root");
-
-  this->currentTrackElem = firstTrackElem;
-
   this->curveType = CURVE_BEZIER;
-  this->trackElemCount = 1;
-
+  this->startingTime = 0;
+  this->duration = 10;
+  this->endTime = 1;
+  this->width = 10;
+  this->curve = new BezierCurve();
   this->trackNode = new PNode(PNode::getNullParent(), PNODE_ALL);
 }
@@ -81 +72 @@
 Track::~Track()
 {
-  if( this->firstTrackElem)
-    delete this->firstTrackElem;
+
 }
 
@@ -117 +107 @@
 void Track::addPoint(Vector newPoint)
 {
-//   if (this->currentTrackElem->isFresh)
-//     {
-//       this->setCurveType(CURVE_BEZIER, this->currentTrackElem);
-//       this->currentTrackElem->isFresh = false;
-//     }
-//   trackElem->curve->addNode(newPoint);
-//   trackElem->nodeCount++;
+   this->curve->addNode(newPoint);
+   this->nodeCount++;
 }
 
@@ -173 +158 @@
 }
 
-Vector TrackManager::calcPos() const
-{
-  return this->currentTrackElem->curve->calcPos((this->localTime-this->currentTrackElem->startingTime)/this->currentTrackElem->duration);
-}
-
-Vector TrackManager::calcDir() const
-{
-  return this->currentTrackElem->curve->calcDir((this->localTime - this->currentTrackElem->startingTime)/this->currentTrackElem->duration);
+Vector Track::calcPos() const
+{
+  return this->curve->calcPos((this->localTime-this->startingTime)/this->duration);
+}
+
+Vector Track::calcDir() const
+{
+  return this->curve->calcDir((this->localTime - this->startingTime)/this->duration);
 }
 
@@ -222 +207 @@
  * @returns the main TrackNode
 */
-PNode* TrackManager::getTrackNode()
+PNode* Track::getTrackNode()
 {
   return this->trackNode;