Changeset 4139 in orxonox.OLD for orxonox/branches/md2_loader/src/story_entities

Timestamp:

May 10, 2005, 10:39:01 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/md2_loader: merged trunk into branche using: svn merge ../trunk/ md2_loader -r 4063:HEAD

Location:

orxonox/branches/md2_loader/src/story_entities

Files:

• campaign.cc (modified) (3 diffs)
• world.cc (modified) (20 diffs)

orxonox/branches/md2_loader/src/story_entities/campaign.cc

@@ -41 +41 @@
   int id;
   
-  PRINTF0("Loading Campaign...\n");
+  PRINTF(3)("Loading Campaign...\n");
   
   assert( root != NULL);
@@ -53 +53 @@
   if( string == NULL || sscanf(string, "%d", &id) != 1)
     {
-      PRINTF0("Campaign is missing a proper 'identifier'\n");
+      PRINTF(2)("Campaign is missing a proper 'identifier'\n");
       this->setStoryID( -1);
     }
@@ -62 +62 @@
   if( element == NULL)
     {
-      PRINTF0("Campaign is missing a proper 'WorldList'\n");
+      PRINTF(2)("Campaign is missing a proper 'WorldList'\n");
     }
   else

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

@@ -124 +124 @@
 {
   this->constuctorInit("", -1);
-
+  this->path = NULL;
   const char *string;
   char *name;
@@ -172 +172 @@
 World::World (char* name)
 {
+  this->path = NULL;
   this->constuctorInit(name, -1);
   //NullParent* np = NullParent::getInstance();
@@ -182 +183 @@
 World::World (int worldID)
 {
+  this->path = NULL;
   this->constuctorInit(NULL, worldID);
 }
@@ -198 +200 @@
   cn->reset();
 
-  //ResourceManager::getInstance()->debug();
   ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
-  //ResourceManager::getInstance()->debug();
-
   delete WorldInterface::getInstance();
-
   delete this->nullParent;
   delete this->entities;
@@ -209 +207 @@
   delete this->trackManager;
   TextEngine::getInstance()->flush();
-
-  //AnimationPlayer::getInstance()->debug();
   delete AnimationPlayer::getInstance(); // this should be at the end of the unloading sequence.
-  //delete garbagecollecor
-  //delete animator
-
-
+  ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
 }
 
@@ -271 +264 @@
 ErrorMessage World::load()
 {       
-  PRINTF0("> Loading world: '%s'\n", getPath());
-  
+  PRINTF(3)("> Loading world: '%s'\n", getPath());
+  TiXmlElement* element;
   GameLoader* loader = GameLoader::getInstance();
   
   if( getPath() == NULL)
     {
-      PRINTF0("World has no path specified for loading");
+      PRINTF(1)("World has no path specified for loading");
       return (ErrorMessage){213,"Path not specified","World::load()"};
     }
@@ -283 +276 @@
   TiXmlDocument* XMLDoc = new TiXmlDocument( path);
   // load the campaign document
-  if( !XMLDoc->LoadFile())
-    //this->glmis->step();
-  
+  if( !XMLDoc->LoadFile())  
   {
     // report an error
-    PRINTF0("Error loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
+    PRINTF(1)("loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
     delete XMLDoc;
     return (ErrorMessage){213,"XML File parsing error","World::load()"};
@@ -300 +291 @@
     {
       // report an error
-      PRINTF0("Specified XML File is not an orxonox world data file (WorldDataFile element missing)\n");
+      PRINTF(1)("Specified XML File is not an orxonox world data file (WorldDataFile element missing)\n");
       delete XMLDoc;
       return (ErrorMessage){213,"Path not a WorldDataFile","World::load()"};
@@ -311 +302 @@
   if( string == NULL)
     {
-      PRINTF0("World is missing a proper 'name'\n");
+      PRINTF(2)("World is missing a proper 'name'\n");
       string = "Unknown";
       temp = new char[strlen(string + 2)];
@@ -323 +314 @@
       this->worldName = temp;
     }
-  
-  
+  ////////////////
+  // LOADSCREEN //
+  ////////////////
+  element = root->FirstChildElement("LoadScreen");
+  if (element == NULL)
+    {
+      PRINTF(2)("no LoadScreen specified, loading default\n");
+
+      glmis->setBackgroundImage("pictures/load_screen.jpg");
+      this->glmis->setMaximum(8);
+      this->glmis->draw();
+    }
+  else
+    {
+      this->glmis->load(element);
+      this->glmis->draw();
+    }
+  this->glmis->draw();
   // find WorldEntities
-  TiXmlElement* element = root->FirstChildElement( "WorldEntities");
+  element = root->FirstChildElement("WorldEntities");
   
   if( element == NULL)
     {
-      PRINTF0("World is missing 'WorldEntities'\n");
+      PRINTF(1)("World is missing 'WorldEntities'\n");
     }
   else
@@ -336 +343 @@
       element = element->FirstChildElement();
       // load Players/Objects/Whatever
-      PRINTF0("Loading WorldEntities\n");
+      PRINTF(4)("Loading WorldEntities\n");
       while( element != NULL)
         {
@@ -346 +353 @@
           if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox")) sky = (SkyBox*) created;
           element = element->NextSiblingElement();
+          glmis->step(); //! \todo temporary
         }
-      PRINTF0("Done loading WorldEntities\n");
+      PRINTF(4)("Done loading WorldEntities\n");
     }
   
@@ -458 +466 @@
   tn->addChild(this->localCamera);
   localCamera->lookAt(tn);
+  localCamera->setMode(PNODE_MOVEMENT);
   this->localPlayer->setMode(PNODE_ALL);
   Vector* cameraOffset = new Vector (0, 5, -10);
@@ -472 +481 @@
   glEndList();
 
-  terrain = new Terrain("../data/worlds/newGround.obj");
+  terrain = new Terrain("worlds/newGround.obj");
   terrain->setRelCoor(Vector(0,-10,0));
   this->spawn(terrain);
@@ -604 +613 @@
 
         // Create SkySphere
-        sky = new Skysphere("../data/pictures/sky-replace.jpg");
+        sky = new Skysphere("pictures/sky-replace.jpg");
         this->localPlayer->addChild(this->sky);
         this->spawn(this->sky);
@@ -649 +658 @@
 
         // Create SkySphere
-        this->sky = new Skysphere("../data/pictures/sky-replace.jpg");
+        this->sky = new Skysphere("pictures/sky-replace.jpg");
         this->sky->setName("SkySphere");
         this->spawn(this->sky);
@@ -838 +847 @@
   
   //GLMenuImageScreen* 
-  this->glmis = GLMenuImageScreen::getInstance();
+  this->glmis = new GLMenuImageScreen();
   this->glmis->init();
   this->glmis->setMaximum(8);
-  this->glmis->draw();
+  //  this->glmis->draw();
  
   PRINTF(3)("World::displayLoadScreen - end\n"); 
@@ -855 +864 @@
   PRINTF(3)("World::releaseLoadScreen - start\n"); 
   this->glmis->setValue(this->glmis->getMaximum());
-  //SDL_Delay(500);
   PRINTF(3)("World::releaseLoadScreen - end\n"); 
+  delete this->glmis;
 }
 
@@ -1242 +1251 @@
 bool World::command(Command* cmd)
 {
-  if( !strcmp( cmd->cmd, "view0")) this->localCamera->setViewMode(VIEW_NORMAL);
-  else if( !strcmp( cmd->cmd, "view1")) this->localCamera->setViewMode(VIEW_BEHIND);
-  else if( !strcmp( cmd->cmd, "view2")) this->localCamera->setViewMode(VIEW_FRONT);
-  else if( !strcmp( cmd->cmd, "view3")) this->localCamera->setViewMode(VIEW_LEFT);
-  else if( !strcmp( cmd->cmd, "view4")) this->localCamera->setViewMode(VIEW_RIGHT);
-  else if( !strcmp( cmd->cmd, "view5")) this->localCamera->setViewMode(VIEW_TOP);
+  if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW0)) this->localCamera->setViewMode(VIEW_NORMAL);
+  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW1)) this->localCamera->setViewMode(VIEW_BEHIND);
+  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW2)) this->localCamera->setViewMode(VIEW_FRONT);
+  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW3)) this->localCamera->setViewMode(VIEW_LEFT);
+  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW4)) this->localCamera->setViewMode(VIEW_RIGHT);
+  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW5)) this->localCamera->setViewMode(VIEW_TOP);
 
   return false;
@@ -1254 +1263 @@
 void World::setPath( const char* name)
 {
-  this->path = new char[strlen(name)+1];
-  strcpy(this->path, name);
+  if (this->path)
+    delete this->path;
+  if (ResourceManager::isFile(name))
+  {
+    this->path = new char[strlen(name)+1];
+    strcpy(this->path, name);
+  }
+  else
+    {
+      this->path = new char[strlen(ResourceManager::getInstance()->getDataDir()) + strlen(name) +1];
+      sprintf(this->path, "%s%s", ResourceManager::getInstance()->getDataDir(), name);
+    }
 }