Changeset 4223 in orxonox.OLD for orxonox/branches/physics/src/story_entities

Timestamp:

May 19, 2005, 7:45:28 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged back the Trunk into the Physics-branche
merged with command:
svn merge -r 4178:HEAD ../trunk/ physics
no conflicts in relevant files

File:

• orxonox/branches/physics/src/story_entities/world.cc (modified) (9 diffs)

orxonox/branches/physics/src/story_entities/world.cc

@@ -365 +365 @@
   
   // find Track
-  /*element = root->FirstChildElement( "Track");
+  element = root->FirstChildElement( "Track");
   if( element == NULL)
     {
@@ -375 +375 @@
       PRINTF0("============>>>>>>>>>>>>>>>>Loading Track\n");
 
-      trackManager->loadTrack( element);
+      trackManager->load( element);
       trackManager->finalize();
       PRINTF0("============>>>>>>>>>>>>>>>>Done loading Track\n");
-    }*/
+    }
   
   // free the XML data
@@ -395 +395 @@
   
   // stuff beyond this point remains to be loaded properly
- 
+  /*
       // initializing the TrackManager
   this->trackManager = TrackManager::getInstance();
@@ -403 +403 @@
       trackManager->addPoint(Vector(250, -35, 5));
       trackManager->addPoint(Vector(320,-33,-.55));
-      trackManager->setDuration(2);
+      trackManager->setDuration(1);
       trackManager->setSavePoint();
 
@@ -410 +410 @@
       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));
@@ -423 +422 @@
       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));
@@ -435 +434 @@
       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));
@@ -451 +449 @@
       trackManager->addPoint(Vector(1800, 100, -40));
       trackManager->setDuration(10);
-
+  */
       trackManager->finalize();
 
@@ -483 +481 @@
   glNewList (objectList, GL_COMPILE);
   
-  //  trackManager->drawGraph(.01);
+  trackManager->drawGraph(.01);
   trackManager->debug(2);
   glEndList();