Changeset 3604 in orxonox.OLD

Timestamp:

Mar 18, 2005, 10:49:55 AM (19 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Found the bug that prevented the loaded world from running. Something is missing however, I am only getting a black screen…

Location:

orxonox/branches/levelloader/src

Files:

• story_entities/world.cc (modified) (5 diffs)
• world_entities/player.cc (modified) (2 diffs)

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

@@ -212 +212 @@
                         if( created != NULL) this->spawn( created);
                                 // if we load a 'Player' we use it as localPlayer
-                        // if( element->Value() != NULL && !strcmp( element->Value(), "Player")) localPlayer = (Player*) created;
+                                //todo do this more elegant 
+                         if( element->Value() != NULL && !strcmp( element->Value(), "Player")) localPlayer = (Player*) created;
                         element = element->NextSiblingElement();
                 }
@@ -722 +723 @@
 {
   this->lastFrame = SDL_GetTicks ();
-  printf("World::mainLoop() - Entering main loop\n");
+  printf("World::mainLoop() - Entering main loop of '%s'\n", this->worldName);
   while( !this->bQuitOrxonox && !this->bQuitCurrentGame) /* \todo implement pause */
     {
@@ -735 +736 @@
         }
       // Process time
-      this->timeSlice ();
+     this->timeSlice ();
       // Process collision
-      this->collide ();
+     this->collide ();
       // Draw
-      this->display ();
+     this->display ();
   
       for( int i = 0; i < 5000000; i++) {}
@@ -805 +806 @@
       /* function to let all entities tick (iterate through list) */
       WorldEntity* entity;
-      float seconds = dt / 1000.0;      
+      float seconds = dt / 1000.0;  
+      assert( this->nullParent != NULL); 
       this->nullParent->update (seconds);
       entity = entities->enumerate(); 
@@ -813 +815 @@
           entity = entities->nextElement();
         }
-      skySphere->updatePosition(localCamera->absCoordinate);
+      //assert( skySphere != NULL); 
+      //skySphere->updatePosition(localCamera->absCoordinate);
       
       /* update tick the rest */
+      assert( this->localCamera != NULL); 
+      assert( this->trackManager != NULL); 
       this->localCamera->timeSlice(dt);
       this->trackManager->tick(dt);

orxonox/branches/levelloader/src/world_entities/player.cc

@@ -73 +73 @@
         if( string == NULL)
         {
-                PRINTF(1)("Player is missing a proper 'name'\n");
+                PRINTF0("Player is missing a proper 'name'\n");
                 string = "Unknown";
                 temp = new char[strlen(string + 2)];
@@ -92 +92 @@
         else
         {
-                PRINTF(1)("Player is missing a proper 'model'\n");
+                PRINTF0("Player is missing a proper 'model'\n");
                 this->model = new OBJModel( "../data/models/reaplow.obj");
         }
         if( this->model == NULL)
         {
-                PRINTF(1)("Player model '%s' could not be loaded\n", string);
+                PRINTF0("Player model '%s' could not be loaded\n", string);
         }
 }