Changeset 3335 in orxonox.OLD for orxonox

Timestamp:

Jan 5, 2005, 1:49:13 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/parenting: added TrackManager to world.cc. (just the constructor), and moved some functions.

Location:

orxonox/branches/parenting/src

Files:

• track_manager.cc (modified) (8 diffs)
• track_manager.h (modified) (2 diffs)
• world.cc (modified) (2 diffs)
• world.h (modified) (2 diffs)

orxonox/branches/parenting/src/track_manager.cc

@@ -64 +64 @@
 
 /**
-   \brief reserves Space for childCount children
-   \param childCount The Count of children to make space for.
-*/
-void TrackElement::initChildren(unsigned int childCount)
-{
-  this->childCount = childCount;
-  this->children = new TrackElement*[childCount];
-  for (int i=0; i<childCount; i++)
-    this->children[i] = new TrackElement();
-}
-
-/**
    \brief Searches through all the TrackElements for trackID.
    \param trackID The ID to search for.
@@ -108 +96 @@
    \brief standard constructor
 
-   \todo this constructor is not jet implemented - do it
 */
 TrackManager::TrackManager () 
@@ -115 +102 @@
 
   PRINTF(3)("Initializing the TrackManager\n");
-  this->firstTrackElem = NULL;
+  this->firstTrackElem = new TrackElement;
   this->currentTrackElem = firstTrackElem;
   this->localTime = 0;
@@ -126 +113 @@
    \brief standard destructor
 
-   \todo this deconstructor is not jet implemented - do it
 */
 TrackManager::~TrackManager () 
@@ -134 +120 @@
   PRINTF(3)("Deleting all the TrackElements\n");
   delete this->firstTrackElem;
+
   // we do not have a TrackManager anymore
   singletonRef = NULL;
@@ -151 +138 @@
   else
     return singletonRef = new TrackManager();
+}
+
+/**
+   \brief reserves Space for childCount children
+   \param childCount The Count of children to make space for.
+*/
+void TrackManager::initChildren(unsigned int childCount)
+{
+  trackElemCount = 0;
+  this->currentTrackElem->childCount = childCount;
+  this->currentTrackElem->children = new TrackElement*[childCount];
+  for (int i=0; i<childCount; i++)
+    this->currentTrackElem->children[i] = new TrackElement();
 }
 
@@ -251 +251 @@
   this->currentTrackElem->isSavePoint = true;
 
-  this->currentTrackElem->initChildren(1);
+  this->initChildren(1);
 }
 
@@ -290 +290 @@
   this->currentTrackElem->isFork = true;
 
-  this->currentTrackElem->initChildren(count);
+  this->initChildren(count);
 }
 

orxonox/branches/parenting/src/track_manager.h

@@ -32 +32 @@
   TrackElement(void);
   ~TrackElement(void);
-
-  void initChildren(unsigned int childCount);
 
   TrackElement* findByID(unsigned int trackID);
@@ -103 +101 @@
   int trackElemCount;                 //!< The count of TrackElements that exist.
   
+  void initChildren(unsigned int childCount);
 
   TrackElement* findTrackElementByID(unsigned int trackID) const;

orxonox/branches/parenting/src/world.cc

@@ -18 +18 @@
 #include "world_entity.h"
 #include "collision.h"
+#include "track_manager.h"
 #include "track.h"
 #include "player.h"
@@ -143 +144 @@
   if(this->debugWorldNr != -1)
     {
+      trackManager = TrackManager::getInstance();
       switch(this->debugWorldNr)
         {

orxonox/branches/parenting/src/world.h

@@ -11 +11 @@
 
 
-
+class TrackManager;
 class Track;
 class WorldEntity;
@@ -61 +61 @@
   
   // base level data
+  TrackManager* trackManager;
   Track* track;
   Uint32 tracklen;   // number of Tracks the World consist of