Changeset 3522 in orxonox.OLD for orxonox/trunk/src/story_entities

Timestamp:

Mar 13, 2005, 12:05:07 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the important files of the trackManager to the trunk
It was not anymore possible to merge.

this is not so big a problem, as I only coded inside the track_manager, track_node files. But it will be if we try to merge other branches back to the trunk

File:

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

orxonox/trunk/src/story_entities/world.cc

@@ -116 +116 @@
       trackManager->addPoint(Vector(30,0,5));
       trackManager->addPoint(Vector(40,0,5));
-      trackManager->setDuration(2);
-      trackManager->setSavePoint();
-      trackManager->addPoint(Vector(50,10,10));
-      trackManager->addPoint(Vector(60,0, 10));
-      trackManager->addPoint(Vector(70,0, 10));
-      trackManager->addPoint(Vector(80,0,-10));
-      trackManager->addPoint(Vector(90,0,-10));
+      trackManager->setDuration(4);
+      int fork11, fork12, fork13;
+      trackManager->fork(3, &fork11, &fork12, &fork13);
+      trackManager->workOn(fork11);
+      trackManager->addPoint(Vector(70, 0, -10));
+      trackManager->addPoint(Vector(100, 0, -15));
+      trackManager->addPoint(Vector(300, 0, -15));
+      trackManager->setDuration(10);
+      trackManager->workOn(fork12);
+      trackManager->addPoint(Vector(70,  0, 0));
+      trackManager->addPoint(Vector(100, 0, 0));
+      trackManager->addPoint(Vector(120,10, 0));
+      trackManager->addPoint(Vector(150,10, 0));
+      trackManager->addPoint(Vector(180,15, 0));
+      trackManager->addPoint(Vector(200,10, 0));
+      trackManager->setDuration(7);
+      trackManager->workOn(fork13);
+      trackManager->addPoint(Vector(70,  0, 10));
+      trackManager->addPoint(Vector(100, 0, 30));
+      trackManager->addPoint(Vector(120,-10, 30));
+      trackManager->addPoint(Vector(150,-10, 30));
+      trackManager->setDuration(10);
+      trackManager->join(2, fork12, fork13);
+
+      trackManager->workOn(5);
+      trackManager->addPoint(Vector(250, 20, 10));
+      trackManager->addPoint(Vector(290, 20, 10));
       trackManager->setDuration(5);
       trackManager->setSavePoint();
-      trackManager->addPoint(Vector(110,0,5));
-      trackManager->addPoint(Vector(120,0, 10));
-      trackManager->addPoint(Vector(130,0, 10));
-      trackManager->addPoint(Vector(140,0,-10));
-      trackManager->addPoint(Vector(150,0,-10));
-      trackManager->setDuration(3);
-      int fork11, fork12, fork13, fork14;
-      trackManager->fork(4, &fork11, &fork12, &fork13, &fork14);
-      trackManager->workOn(fork11);
-      trackManager->addPoint(Vector(170, 0, -15));
-      trackManager->addPoint(Vector(180, 0, -15));
-      trackManager->setDuration(3);
-      trackManager->workOn(fork12);
-      trackManager->addPoint(Vector(170, 0, 10));
-      trackManager->addPoint(Vector(180, 0, 10));
-      trackManager->addPoint(Vector(190,2,5));
-      trackManager->addPoint(Vector(200,2,5));
-      trackManager->setDuration(7);
-      int fork21, fork22;
-      trackManager->fork(2, &fork21, &fork22);
-      trackManager->workOn(fork21);
-      trackManager->addPoint(Vector(220, 10,-10));
-      trackManager->addPoint(Vector(230, 0,-10));
-      trackManager->addPoint(Vector(240, 0, 2));
-      trackManager->addPoint(Vector(250, 0, 0));
-      trackManager->addPoint(Vector(260, 0, 5));
-      trackManager->setDuration(3);
-      trackManager->join(2, fork12, fork11);
-      trackManager->workOn(fork22);
-      trackManager->addPoint(Vector(220, -10,10));
-      trackManager->addPoint(Vector(230, 0, 10));
-      trackManager->addPoint(Vector(240, 0, 10));
-      trackManager->addPoint(Vector(250, 0, 5));
-      trackManager->setDuration(6);
-      trackManager->workOn(fork13);
-      trackManager->addPoint(Vector(200,-10,5));
-      trackManager->addPoint(Vector(250,-10,5));
-      trackManager->setDuration(3);
-      trackManager->workOn(fork14);
-      trackManager->addPoint(Vector(200,15,0));
-      trackManager->addPoint(Vector(210,0,10));
-      trackManager->setDuration(1);
-      trackManager->join(4, fork21, fork22, fork13, fork14);
-      trackManager->workOn(10);
-      trackManager->addPoint(Vector(250,-10,5));
-      trackManager->addPoint(Vector(260,-10,5));
+      trackManager->addPoint(Vector(350, 20, 10));
+      trackManager->addPoint(Vector(360, 20, 10));
+      trackManager->addPoint(Vector(370, 20, 10));
+      trackManager->setDuration(5);
+
+      trackManager->join(2, 6, fork11);
+
       trackManager->finalize();
+
       
       /*monitor progress*/
@@ -249 +231 @@
             this->glmis->step();
 
+            trackManager->setBindSlave(env);
+            trackManager->condition(1, NEAREST, myPlayer);
+
             break;
           }