Changeset 3588 in orxonox.OLD for orxonox/trunk/src/track_manager.cc

Timestamp:

Mar 17, 2005, 2:47:16 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: name-fix for TrackManager and minor fix in Curve.
There has also been a little fix in the light-class: light is a BaseObject not a World-Entity

File:

• orxonox/trunk/src/track_manager.cc (modified) (6 diffs)

orxonox/trunk/src/track_manager.cc

@@ -37 +37 @@
   this->mainJoin = false;
   this->ID = -1;
-  this->startingTime = 0; //!< \todo eventually set this to the max time of TrackManager.
-  this->duration = 1;
+  this->startingTime = 0;
+  this->duration = TMAN_DEFAULT_DURATION;
   this->endTime = 1;
   this->jumpTime = 0;
-  this->curveType = BEZIERCURVE;
   this->nodeCount = 0;
   this->childCount = 0;
@@ -115 +114 @@
 
 /**
+   \param name the Name to set.
+*/
+void TrackElement::setName(const char* name)
+{
+  //  delete the old name
+  if (this->name)
+    delete []this->name;
+  // if a name was given already.
+  if (name)
+    {
+      this->name = new char[strlen(name)+1];
+      strcpy(this->name, name);
+    }
+  else 
+    this->name = NULL;
+}
+
+/**
+   \returns The name of this TrackElement
+*/
+char* TrackElement::getName(void) const
+{
+  return this->name;
+}
+
+
+/**
    \brief CONDITION that chooses the first child for the decision (static)
    \param nothing Nothing in this function
@@ -266 +292 @@
       this->addPoint(this->currentTrackElem->curve->getNode(this->currentTrackElem->curve->getNodeCount()), this->currentTrackElem->children[i]);
     }
+  if (childCount == 1)
+    this->currentTrackElem->children[0]->setName(this->currentTrackElem->getName());
 }
 
@@ -307 +335 @@
       return;
     }
-  trackElem->curveType = curveType;
+  this->curveType = curveType;
   switch (curveType)
     {
@@ -348 +376 @@
   if (trackElem->isFresh)
     {
-      this->setCurveType(BEZIERCURVE, trackElem);
+      this->setCurveType(TMAN_DEFAULT_CURVETYPE, trackElem);
       trackElem->isFresh = false;
     }
@@ -757 +785 @@
           TrackElement* tmpElem = this->findTrackElementByID(i);
           PRINT(0)("--== TrackElement:%i ==--", tmpElem->ID);
-          if(tmpElem->name)
-            PRINT(0)("Name: %s::", tmpElem->name);
+          if(tmpElem->getName())
+            PRINT(0)("Name: %s::", tmpElem->getName());
           if(tmpElem->isFresh)
             PRINT(0)("  -- has not jet eddited in any way --\n");