Changeset 4220 in orxonox.OLD for orxonox/trunk/src/story_entities/world.cc

Timestamp:

May 18, 2005, 11:01:59 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: TrackManager prepared for loading. added new overloaded functions that read in join and fork from one single string
thanks to chris, this was pretty easy… the hard part was finding the substring class

File:

• orxonox/trunk/src/story_entities/world.cc (modified) (5 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -399 +399 @@
       trackManager->addPoint(Vector(250, -35, 5));
       trackManager->addPoint(Vector(320,-33,-.55));
-      trackManager->setDuration(2);
+      trackManager->setDuration(1);
       trackManager->setSavePoint();
 
@@ -406 +406 @@
       trackManager->addPoint(Vector(550, 20, -10));
       trackManager->addPoint(Vector(570, 20, -10));
-      trackManager->setDuration(5);
+      trackManager->setDuration(2);
       
-      int fork11, fork12;
-      trackManager->fork(2, &fork11, &fork12);
-      trackManager->workOn(fork11);
+      trackManager->forkS("testFork1,testFork2");
+      trackManager->workOn("testFork1");
       trackManager->addPoint(Vector(640, 25, -30));
       trackManager->addPoint(Vector(700, 40, -120));
@@ -419 +418 @@
       trackManager->addPoint(Vector(1050, 65, -10));
       trackManager->addPoint(Vector(1100, 65, -20));
-      trackManager->setDuration(10);
-
-      trackManager->workOn(fork12);
+      trackManager->setDuration(4);
+
+      trackManager->workOn("testFork2");
       trackManager->addPoint(Vector(640, 25, 20));
       trackManager->addPoint(Vector(670, 50, 120));
@@ -431 +430 @@
       trackManager->addPoint(Vector(970, 24, 40));
       trackManager->addPoint(Vector(1000, 40, -7));
-      trackManager->setDuration(10);
+      trackManager->setDuration(4);
       
-
-      trackManager->join(2, fork11, fork12);
-
-      trackManager->workOn(5);
+      
+      trackManager->joinS("testFork1,testFork2");
+        
       trackManager->addPoint(Vector(1200, 60, -50));
       trackManager->addPoint(Vector(1300, 50, -50));
@@ -479 +477 @@
   glNewList (objectList, GL_COMPILE);
   
-  //  trackManager->drawGraph(.01);
+  trackManager->drawGraph(.01);
   trackManager->debug(2);
   glEndList();