Changeset 3530 in orxonox.OLD for orxonox/branches/levelloader/src/story_entities/world.cc

Timestamp:

Mar 13, 2005, 10:40:25 PM (19 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Got the system to compile, the basic backbone now runs. What remains to be done is implementing all necessary functions to load all vital classes into a world

File:

• orxonox/branches/levelloader/src/story_entities/world.cc (modified) (11 diffs)

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

@@ -30 +30 @@
 #include "fontset.h"
 #include "factory.h"
+#include "game_loader.h"
 
 using namespace std;
 
+CREATE_FACTORY(World);
 
 World::World( TiXmlElement* root)
 {
-        char *string, *name;
+        const char *string;
+        char *name;
         int id;
 
         // identifier
         string = grabParameter( root, "identifier");
-        if( string == NULL || if( sscanf(string, "%d", &id) != 1))
-        {
-                PRINTF(ERR)("World is missing a proper 'identifier'\n");
-                setStoryId( -1);
-        }
-        else setStoryId( id);
+        if( string == NULL || sscanf(string, "%d", &id) != 1)
+        {
+                PRINTF(1)("World is missing a proper 'identifier'\n");
+                this->setStoryID( -1);
+        }
+        else setStoryID( id);
         
         // path
@@ -52 +55 @@
         if( string == NULL)
         {
-                PRINTF(ERR)("World is missing a proper 'path'\n");
-                setPath( NULL);
+                PRINTF(1)("World is missing a proper 'path'\n");
+                this->setPath( NULL);
         }
         else
@@ -59 +62 @@
                 name = new char[strlen(string + 2)];
                 strcpy( name, string);
-                setPath( name);
+                this->setPath( name);
         }
         
@@ -105 +108 @@
   this->nullParent->destroy();  
   delete this->skySphere;
+  if( this->worldName) delete this->worldName;
+  if( this->path) delete this->path;
 
   //delete this->trackManager;
@@ -137 +142 @@
   if( getPath() == NULL)
   {
-                PRINTF(ERR)("World has no path specified for loading");
+                PRINTF(1)("World has no path specified for loading");
                 return (ErrorMessage){213,"Path not specified","World::load()"};
   }
   
-        TiXmlDocument* XMLDoc = new TiXmlDocument( name);
+        TiXmlDocument* XMLDoc = new TiXmlDocument( path);
         // load the campaign document
-        if( !XMLDoc.LoadFile())
+        if( !XMLDoc->LoadFile())
         {
                 // report an error
-                PRINTF(ERR)("Error loading XML File: %s @ %d:%d\n", XMLDoc.ErrorDesc(), XMLDoc.ErrorRow(), XMLDoc.ErrorCol());
+                PRINTF(1)("Error loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
                 delete XMLDoc;
                 return (ErrorMessage){213,"XML File parsing error","World::load()"};
@@ -152 +157 @@
         
         // check basic validity
-        TiXmlElement* root = XMLDoc.RootElement();
+        TiXmlElement* root = XMLDoc->RootElement();
         assert( root != NULL);
         
-        element = root->FirstChildElement( "WorldDataFile");
+        TiXmlElement* element = root->FirstChildElement( "WorldDataFile");
         
         if( root == NULL )
         {
                 // report an error
-                PRINTF(ERR)("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()"};
@@ -167 +172 @@
         // load the parameters
                 // name
-        TiXmlElement* element;
         char* temp;
-        char* string = grabParameter( root, "name");
+        const char* string = grabParameter( root, "name");
         if( string == NULL)
         {
-                PRINTF(ERR)("World is missing a proper 'name'\n");
-                setStoryId( -1);
+                PRINTF(1)("World is missing a proper 'name'\n");
+                this->setStoryID( -1);
         }
         else
         {
                 temp = new char[strlen(string + 2)];
-                worldName = temp;
+                this->worldName = temp;
         }
         
@@ -187 +191 @@
   if( element == NULL)
   {
-                PRINTF(ERR)("World is missing 'WorldEntities'\n");
+                PRINTF(1)("World is missing 'WorldEntities'\n");
   }
   else
@@ -197 +201 @@
                         WorldEntity* created = (WorldEntity*) loader->fabricate( element);
                         if( created != NULL) spawn( created);
-                        element = element->nextSiblingElement();
+                        element = element->NextSiblingElement();
                 }
         }
@@ -205 +209 @@
   if( element == NULL)
   {
-                PRINTF(ERR)("World is missing a 'Track'\n");
+                PRINTF(1)("World is missing a 'Track'\n");
   }
   else
@@ -225 +229 @@
       testFont->buildFont("../data/pictures/font.tga");
 
-      // 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->setDuration(2);
-      trackManager->setSavePoint();
-      trackManager->addPoint(Vector(50,10,10));
-      trackManager->addPoint(Vector(60,0, 10));
-      trackManager->addPoint(Vector(70,0, 10));
-      trackManager->addPoint(Vector(80,0,-10));
-      trackManager->addPoint(Vector(90,0,-10));
-      trackManager->setDuration(5);
-      trackManager->setSavePoint();
-      trackManager->addPoint(Vector(110,0,5));
-      trackManager->addPoint(Vector(120,0, 10));
-      trackManager->addPoint(Vector(130,0, 10));
-      trackManager->addPoint(Vector(140,0,-10));
-      trackManager->addPoint(Vector(150,0,-10));
-      trackManager->setDuration(3);
-      int fork11, fork12, fork13, fork14;
-      trackManager->fork(4, &fork11, &fork12, &fork13, &fork14);
-      trackManager->workOn(fork11);
-      trackManager->addPoint(Vector(170, 0, -15));
-      trackManager->addPoint(Vector(180, 0, -15));
-      trackManager->setDuration(3);
-      trackManager->workOn(fork12);
-      trackManager->addPoint(Vector(170, 0, 10));
-      trackManager->addPoint(Vector(180, 0, 10));
-      trackManager->addPoint(Vector(190,2,5));
-      trackManager->addPoint(Vector(200,2,5));
-      trackManager->setDuration(7);
-      int fork21, fork22;
-      trackManager->fork(2, &fork21, &fork22);
-      trackManager->workOn(fork21);
-      trackManager->addPoint(Vector(220, 10,-10));
-      trackManager->addPoint(Vector(230, 0,-10));
-      trackManager->addPoint(Vector(240, 0, 2));
-      trackManager->addPoint(Vector(250, 0, 0));
-      trackManager->addPoint(Vector(260, 0, 5));
-      trackManager->setDuration(3);
-      trackManager->join(2, fork12, fork11);
-      trackManager->workOn(fork22);
-      trackManager->addPoint(Vector(220, -10,10));
-      trackManager->addPoint(Vector(230, 0, 10));
-      trackManager->addPoint(Vector(240, 0, 10));
-      trackManager->addPoint(Vector(250, 0, 5));
-      trackManager->setDuration(6);
-      trackManager->workOn(fork13);
-      trackManager->addPoint(Vector(200,-10,5));
-      trackManager->addPoint(Vector(250,-10,5));
-      trackManager->setDuration(3);
-      trackManager->workOn(fork14);
-      trackManager->addPoint(Vector(200,15,0));
-      trackManager->addPoint(Vector(210,0,10));
-      trackManager->setDuration(1);
-      trackManager->join(4, fork21, fork22, fork13, fork14);
-      trackManager->workOn(10);
-      trackManager->addPoint(Vector(250,-10,5));
-      trackManager->addPoint(Vector(260,-10,5));
-      trackManager->finalize();
-      
       /*monitor progress*/
       this->glmis->step();