Changeset 3431 in orxonox.OLD

Timestamp:

Mar 1, 2005, 10:49:43 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/trackManager: fixed the timing Problem.

File:

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

orxonox/branches/trackManager/src/track_manager.cc

@@ -158 +158 @@
       this->currentTrackElem->children[i] = new TrackElement();
       this->currentTrackElem->children[i]->ID = ++trackElemCount;
-      this->currentTrackElem->children[i]->startingTime = this->currentTrackElem->endTime;
+      this->currentTrackElem->children[i]->startingTime = this->currentTrackElem->endTime + this->currentTrackElem->jumpTime;
       this->addPoint(this->currentTrackElem->curve->getNode(this->currentTrackElem->curve->getNodeCount()), this->currentTrackElem->children[i]);
     }
@@ -371 +371 @@
 void TrackManager::joinV(unsigned int count, int* trackIDs)
 {
-  printf("Joining %d tracks to Track %d\n", count, trackIDs[0]);
+  printf("Joining %d tracks and merging to Track %d\n", count, trackIDs[0]);
 
   // chanching work-on to temporary value. going back at the end.
   int tmpCurrentWorkingID = this->currentTrackElem->ID;
   this->workOn(trackIDs[0]);
-  float tmpLatestTime = 0;
-
   TrackElement* firstJoint = this->currentTrackElem;
+  float tmpLatestTime = firstJoint->endTime;
+
   Vector tmpEndPoint = firstJoint->curve->getNode(firstJoint->curve->getNodeCount());
   Vector tmpTangentPoint = firstJoint->curve->getNode(firstJoint->curve->getNodeCount()-1);
@@ -394 +394 @@
         tmpLatestTime = tmpJoinElem->endTime;
     }
+  // time the main Join.
+  firstJoint->jumpTime = tmpLatestTime - firstJoint->endTime;
+  
   // Joining:
   for (int i = 1; i < count; i++)
@@ -405 +408 @@
           this->addPoint(tmpTangentPoint, tmpJoinElem);
           this->addPoint(tmpEndPoint, tmpJoinElem);
+          // time all other Joins
           tmpJoinElem->jumpTime = tmpLatestTime - tmpJoinElem->endTime;
           
@@ -416 +420 @@
         }
     }
-  if(currentTrackElem->children)
-    for(int i = 0; i > currentTrackElem->childCount; i++)
-      currentTrackElem->children[i]->startingTime = tmpLatestTime;
+  if(firstJoint->childCount > 0)
+    for(int i = 0; i < firstJoint->childCount; i++)
+      {
+        printf("Setting startingTime of %d to %f.\n", firstJoint->children[i]->ID, tmpLatestTime);
+        firstJoint->children[i]->startingTime = tmpLatestTime;
+        firstJoint->children[i]->endTime = tmpLatestTime+firstJoint->children[i]->duration;
+      } 
 
   // returning to the TrackElement we were working on.
@@ -426 +434 @@
 /**
    \brief finalizes the TrackSystem. after this it will not be editable anymore
+
+   \todo check for any inconsistencies, output errors
 */
 void TrackManager::finalize(void)
@@ -571 +581 @@
 }
 
+/**
+   \brief outputs debug information about the trackManager
+   \param level how much debug
+*/
 void TrackManager::debug(unsigned int level) const
 {
@@ -607 +621 @@
           if(tmpElem->isFork)
             {
-              printf("    is A Fork with with %d children.", tmpElem->childCount);
+              printf("    is A Fork with with %d children.\n", tmpElem->childCount);
             }
           if(tmpElem->isJoined)