Changeset 3430 in orxonox.OLD for orxonox/branches/trackManager/src/world.cc

Timestamp:

Mar 1, 2005, 9:50:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/trackManager: merged trunk back to trackManager
merged with command
svn merge -r 3369:HEAD trunk/ branches/trackManager
resoloved conflicts in favor of the trunk.

Location:

orxonox/branches/trackManager

Files:

• . (modified) (1 prop)
• src/world.cc (modified) (8 diffs)

orxonox/branches/trackManager/src/world.cc

@@ -27 +27 @@
 #include "helper_parent.h"
 #include "glmenu_imagescreen.h"
+#include "skysphere.h"
 
 using namespace std;
@@ -65 +66 @@
   this->localCamera->destroy();
 
-  this->nullParent->destroy ();
+  this->nullParent->destroy();
+  
+  delete this->skySphere;
 
   //delete this->trackManager;
@@ -148 +151 @@
   
   //GLMenuImageScreen* 
-  glmis = new GLMenuImageScreen();
-  glmis->init();
-  glmis->draw();
+  this->glmis = GLMenuImageScreen::getInstance();
+  this->glmis->init();
+  this->glmis->setMaximum(10);
+  this->glmis->draw();
  
   printf ("World::displayLoadScreen - end\n"); 
@@ -159 +163 @@
 {
   printf ("World::releaseLoadScreen - start\n"); 
-
+  this->glmis->setValue(this->glmis->getMaximum());
+  SDL_Delay(500);
   printf ("World::releaseLoadScreen - end\n"); 
 }
@@ -278 +283 @@
             
 
+            // Create SkySphere
+            skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
+
+            /*monitor progress*/
+            this->glmis->step();
+
             Vector* es = new Vector (50, 2, 0);
             Quaternion* qs = new Quaternion ();
@@ -329 +340 @@
             this->getCamera()->bind (myPlayer); 
             this->localPlayer->addChild (this->localCamera);
+
+            // Create SkySphere
+            skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
+
             break;
+
+
           }
         default:
@@ -592 +609 @@
   // draw debug coord system
   glCallList (objectList);
+
+  //! \todo skysphere is a WorldEntity and should be inside of the world-entity-list.
+  skySphere->draw();
 
 }
@@ -673 +693 @@
     }
 
+  skySphere->updatePosition(localCamera->absCoordinate);
   //for( int i = 0; i < tracklen; i++) track[i].tick (seconds);
 }