Changeset 3838 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Apr 15, 2005, 6:30:08 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: finished reworking of trackManager. Now we have to find the Bug…

File:

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

orxonox/trunk/src/track_manager.cc

@@ -615 +615 @@
    \param trackIDs A Pointer to an Array of ints which will hold the trackID's (the user will have to reserve space for this).
    \param trackElem The TrackElement to appy this to. (if NULL chose this->currentTrackElement)
+   \see TrackManager::fork(unsigned int count, ...)
 */
 void TrackManager::forkV(unsigned int count, int* trackIDs, TrackElement* trackElem)
@@ -684 +685 @@
 }
 
-
 /**
    \brief joins some tracks together again. 
@@ -720 +720 @@
   TrackElement* tmpTrackElem = this->firstTrackElem->findByID(trackIDs[0]);
   if (!tmpTrackElem->backLoopCheck(tmpTrackElem))
-    PRINTF(2)("Backloop connection detected at joining trackElements\n");
-
-  // chanching work-on to temporary value. going back at the end.
-  int tmpCurrentWorkingID = this->currentTrackElem->ID;
-  this->workOn(trackIDs[0]);
-  TrackElement* firstJoint = this->currentTrackElem;
+    {
+      PRINTF(2)("Backloop connection detected at joining trackElements\n -> TRACK WILL NOT BE JOINED\n");
+      return;
+    }
+
+  TrackElement* firstJoint =   this->firstTrackElem->findByID(trackIDs[0]);
   float tmpLatestTime = firstJoint->endTime;
 
@@ -734 +734 @@
   //  firstJoint->mainJoin = true;
   if(!firstJoint->isHotPoint)
-    this->setSavePoint();
+    this->setSavePoint(firstJoint);
   // Timing:
   for (int i = 0; i < count; i++)
@@ -769 +769 @@
         }
     }
-  if(firstJoint->childCount > 0)
+  if(firstJoint->children)
     {
       //TrackElement* enumElem = firstJoint->children->enumerate();
@@ -776 +776 @@
       while (enumElem)
         {
-          PRINTF(4)("Setting startingTime of %d to %f.\n", enumElem->ID, tmpLatestTime);
+          PRINTF(5)("Setting startingTime of %d to %f.\n", enumElem->ID, tmpLatestTime);
           enumElem->startingTime = tmpLatestTime;
           enumElem->endTime = tmpLatestTime + enumElem->duration;
@@ -784 +784 @@
       delete iterator;
     }
-  // returning to the TrackElement we were working on.
-  this->workOn(tmpCurrentWorkingID);
 }
 
@@ -828 +826 @@
         }
     }
-  for (int i = 1; i <=trackElemCount;i++)
+  for (int i = 1; i <= trackElemCount;i++)
     if (this->firstTrackElem->findByID(i)->endTime > this->maxTime)
       this->maxTime = this->firstTrackElem->findByID(i)->endTime; // very bad implemented :/