Changeset 3567 in orxonox.OLD

Timestamp:

Mar 16, 2005, 12:52:41 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: new Grounds for new Territory. and new track

Location:

orxonox/trunk/src

Files:

• lib/coord/p_node.cc (modified) (3 diffs)
• story_entities/world.cc (modified) (4 diffs)

orxonox/trunk/src/lib/coord/p_node.cc

@@ -414 +414 @@
   if(this->mode & PNODE_MOVEMENT )
     {
-      printf("4\n");
       if( this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
         {
@@ -434 +433 @@
   if( this->mode & PNODE_LOCAL_ROTATE)
     {
-      printf("1\n");
       if( this->bAbsDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
         {
@@ -449 +447 @@
   if( this->mode & PNODE_ROTATE_MOVEMENT)
     {
-      printf("2\n");
       if( this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
         {

orxonox/trunk/src/story_entities/world.cc

@@ -125 +125 @@
       // initializing the TrackManager
       trackManager = TrackManager::getInstance();
-      trackManager->addPoint(Vector(0,-5,0));
-      trackManager->addPoint(Vector(10,0,5));
-      trackManager->addPoint(Vector(20,0,-5));
-      trackManager->addPoint(Vector(30,0,5));
-      trackManager->addPoint(Vector(40,0,5));
+      trackManager->addPoint(Vector(0,0,0));
+      trackManager->addPoint(Vector(100, -40, 5));
+      trackManager->addPoint(Vector(200,-40,-8));
+      trackManager->addPoint(Vector(250, -35, -2));
+      trackManager->addPoint(Vector(320,-33,-.55));
+      trackManager->setDuration(1);
+      trackManager->setSavePoint();
+      trackManager->addPoint(Vector(410, 0, 0));
+      trackManager->addPoint(Vector(510, 20, -10));
+      trackManager->addPoint(Vector(550, 20, -10));
+      trackManager->addPoint(Vector(570, 20, -10));
+      trackManager->setDuration(1);
+      
+      int fork11, fork12;
+      trackManager->fork(2, &fork11, &fork12);
+      trackManager->workOn(fork11);
+      trackManager->addPoint(Vector(640, 25, -30));
+      trackManager->addPoint(Vector(700, 40, -120));
+      trackManager->addPoint(Vector(800, 50, -150));
+      trackManager->addPoint(Vector(900, 60, -100));
+      trackManager->addPoint(Vector(900, 60, -70));
+      trackManager->addPoint(Vector(990, 65, -15));
+      trackManager->addPoint(Vector(1050, 65, -10));
+      trackManager->addPoint(Vector(1100, 65, -20));
       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->addPoint(Vector(640, 25, 20));
+      trackManager->addPoint(Vector(670, 50, 120));
+      trackManager->addPoint(Vector(700, 70, 80));
+      trackManager->addPoint(Vector(800, 70, 65));
+      trackManager->addPoint(Vector(850, 65, 65));
+      trackManager->addPoint(Vector(920, 35, 40));
+      trackManager->addPoint(Vector(945, 40, 40));
+      trackManager->addPoint(Vector(970, 24, 40));
+      trackManager->addPoint(Vector(1000, 40, -7));
+      trackManager->setDuration(4);
+      
+
+      trackManager->join(2, fork11, fork12);
 
       trackManager->workOn(5);
-      trackManager->addPoint(Vector(250, 20, 10));
-      trackManager->addPoint(Vector(290, 20, 10));
-      trackManager->setDuration(5);
-      trackManager->setSavePoint();
-      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->addPoint(Vector(1200, 60, -50));
+      trackManager->addPoint(Vector(1300, 50, -50));
+      trackManager->addPoint(Vector(1400, 40, -50));
+      trackManager->addPoint(Vector(1500, 40, -60));
+      trackManager->addPoint(Vector(1600, 35, -55));
+      trackManager->addPoint(Vector(1700, 45, -40));
+      trackManager->addPoint(Vector(1750, 60, -40));
+      trackManager->addPoint(Vector(1770, 80, -40));
+      trackManager->addPoint(Vector(1800, 100, -40));
+      trackManager->setDuration(4);
 
       trackManager->finalize();
@@ -246 +258 @@
             Vector* cameraOffset = new Vector (-10, 5, 0);
             this->localCamera->setRelCoor (cameraOffset);
-            trackManager->condition(1, NEAREST, myPlayer);
+            trackManager->condition(2, NEAREST, myPlayer);
 
             break;
@@ -294 +306 @@
   glEndList();
 
-  terrain = new Terrain("nGround.obj");
+  terrain = new Terrain("../data/worlds/newGround.obj");
   terrain->setRelCoor(&Vector(0,-10,0));
   this->spawn(terrain);
@@ -303 +315 @@
   light->setAttenuation(CONSTANT, 2.0);
   light->setAttenuation(QUADRATIC, 1.0);
-  light->setPosition(10.0, 10.0, 50.0);
+  light->setPosition(10.0, 30.0, 10.0);
   light->setDiffuseColor(1,1,1);
   //  light->addLight(1);