Changeset 3519 in orxonox.OLD for orxonox/branches/trackManager/src/story_entities

Timestamp:

Mar 12, 2005, 1:26:46 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/trackManager: merged trunk back to trackManager (again)
merged with command:
svn merge ../trunk/ trackManager/ -r 3498:HEAD
no conflicts

File:

• orxonox/branches/trackManager/src/story_entities/world.cc (modified) (6 diffs)

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

@@ -73 +73 @@
   this->localCamera->destroy();
   this->nullParent->destroy();  
-  delete this->skySphere;
+  //delete this->skySphere;
 
   //delete this->trackManager;
@@ -116 +116 @@
       trackManager->addPoint(Vector(30,0,5));
       trackManager->addPoint(Vector(40,0,5));
-      trackManager->setDuration(20);
+      trackManager->setDuration(4);
       int fork11, fork12, fork13;
       trackManager->fork(3, &fork11, &fork12, &fork13);
@@ -123 +123 @@
       trackManager->addPoint(Vector(100, 0, -15));
       trackManager->addPoint(Vector(300, 0, -15));
-      trackManager->setDuration(4);
+      trackManager->setDuration(10);
       trackManager->workOn(fork12);
       trackManager->addPoint(Vector(70,  0, 0));
@@ -191 +191 @@
             this->localCamera->bind (myPlayer);
             //this->localPlayer->addChild (this->localCamera);
+            /*monitor progress*/
+            this->glmis->step();            
 
             // Create SkySphere
             skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
+            this->localPlayer->addChild(this->skySphere);
 
             /*monitor progress*/
@@ -240 +243 @@
             // Create SkySphere
             skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
+            this->localPlayer->addChild(this->skySphere);
 
             break;
@@ -731 +735 @@
           entity = entities->nextElement();
         }
-      skySphere->updatePosition(localCamera->absCoordinate);
+      //skySphere->updatePosition(localCamera->absCoordinate);
       
       /* update tick the rest */