Ticket #178: Track.patch

src/lib/math/curve.h

@@ -71 +71 @@
   Curve*                dirCurve;        //!< The derivation-curve of this Curve.
 
   std::list<PathNode>   nodeList;        //!< A list of all the Nodes of a Curve.
-  std::list<PathNode>::iterator   nodeIterator;    //!< An iterator that should point to the current Node
   PathNode*             firstNode;       //!< First node of the curve.
   PathNode*             currentNode;     //!< The node we are working with (the Last node).
 

src/world_entities/world_entity.cc

@@ -184 +184 @@
 void WorldEntity::addTrack(const TiXmlElement* root)
 {
   // The problem we have is most likely here. The track should be constructed WITH the XML-Code
-/*  this->entityTrack = new Track(root);
+  this->entityTrack = new Track(root);
   this->setParent(this->entityTrack->getTrackNode());
-  this->entityTrack->getTrackNode()->setParentMode(PNODE_ALL);*/
+  this->entityTrack->getTrackNode()->setParentMode(PNODE_ALL);
   /*LOAD_PARAM_START_CYCLE(root, element);
   {
     PRINTF(4)("element is: %s\n", element->Value());
@@ -199 +199 @@
 
 void WorldEntity::pauseTrack(bool stop)
 {
-/*     if(this->entityTrack)
-       this->entityTrack->pauseTrack(stop);*/ 
+     if(this->entityTrack)
+       this->entityTrack->pauseTrack(stop);
 }
 
 

src/world_entities/test_entity.cc

@@ -85 +85 @@
   this->toList(OM_GROUP_00);
 
  //add to track
-//   if(this->entityTrack)
-//     this->setParent(this->entityTrack->getTrackNode());
+  if(this->entityTrack)
+    this->setParent(this->entityTrack->getTrackNode());
 
 }
 
@@ -137 +137 @@
   glPopAttrib();
 
 
-// if( this->entityTrack != NULL)
-//     this->entityTrack->drawGraph();
+if( this->entityTrack != NULL)
+    this->entityTrack->drawGraph();
 
 }
 
@@ -147 +147 @@
  */
 void TestEntity::tick (float time)
 {
-//  if(this->entityTrack)
-//     this->entityTrack->tick(time);
+ if(this->entityTrack)
+    this->entityTrack->tick(time);
 
 
 }

src/world_entities/space_ships/space_ship.cc

@@ -493 +493 @@
 */
 void SpaceShip::draw () const
 {
-//   if( this->entityTrack != NULL && this->isDrawTrack())
-//     this->entityTrack->drawGraph();
+  if( this->entityTrack != NULL && this->isDrawTrack())
+    this->entityTrack->drawGraph();
 
   WorldEntity::draw();
 
@@ -550 +550 @@
     this->secWeaponMan.releaseFire();
 
   // Tracktick
-//   if(this->entityTrack)
-//     this->entityTrack->tick(time);
+  if(this->entityTrack)
+    this->entityTrack->tick(time);
 
 
   // Shield Regeneration and other regular calculations on the ship
@@ -867 +867 @@
 
         this->isTravelDistanceInit = false;
 
-//         if(this->entityTrack)
-//            this->travelNode->setParent(this->entityTrack->getTrackNode());
+        if(this->entityTrack)
+           this->travelNode->setParent(this->entityTrack->getTrackNode());
 
         this->setParent(this->travelNode);
         this->setRelCoor(0,0,0);

src/world_entities/npcs/npc.cc

@@ -152 +152 @@
   this->bFire = false;
   if( this->entityTrack)
   {
-/*      this->setParent(this->entityTrack->getTrackNode());*/
+      this->setParent(this->entityTrack->getTrackNode());
       this->setRelCoor(0,0,0);
   }
 
@@ -426 +426 @@
   }
   this->bFire = false;
 
-//  if(this->entityTrack)
-//     this->entityTrack->tick(dt);
+ if(this->entityTrack)
+    this->entityTrack->tick(dt);
 
 }
 
 void NPC::draw() const
 {
-//  if( this->entityTrack != NULL && this->isDrawTrack())
-//   this->entityTrack->drawGraph();
+ if( this->entityTrack != NULL && this->isDrawTrack())
+  this->entityTrack->drawGraph();
 
  WorldEntity::draw();
 }

src/world_entities/camera.cc

@@ -101 +101 @@
   this->eventHandling = true;
 
   //add to track
-/*  if(this->entityTrack)
+  if(this->entityTrack)
    {
     this->setParent(this->entityTrack->getTrackNode());
     //this->setRelCoor(0,0,0);
-   }*/
+   }
 }
 
 /**
@@ -226 +226 @@
   if(this->entityTrack)
   {
     //PRINTF(0)("tickytackytucky\n");
-/*    this->entityTrack->tick(dt);*/
+    this->entityTrack->tick(dt);
     //this->setAbsCoor(this->entityTrack->getTrackNode()->getAbsCoor());
   } 
 
@@ -239 +239 @@
 
 void Camera::draw() const
 {
-/*  if( this->entityTrack != NULL && this->isDrawTrack())
-    this->entityTrack->drawGraph();*/
+  if( this->entityTrack != NULL && this->isDrawTrack())
+    this->entityTrack->drawGraph();
 }
 
 

src/util/Makefile.am

@@ -23 +23 @@
                         \
                         animation/animation3d.cc \
                         animation/animation.cc \
-                        animation/animation_player.cc
+                        animation/animation_player.cc \
+                        \
+                        track/pilot_node.cc \
+                        track/track.cc \
+                        track/track_manager.cc \
+                        track/track_node.cc
 
 noinst_HEADERS =        \
                         object_manager.h \
@@ -44 +49 @@
                         animation/animation3d.h \
                         animation/animation.h \
                         animation/animation_player.h \
-                        animation/t_animation.h
+                        animation/t_animation.h \
+                        \
+                        track/pilot_node.h \
+                        track/track.h \
+                        track/track_manager.h \
+                        track/track_node.h
+