Changeset 3503 in orxonox.OLD

Timestamp:

Mar 11, 2005, 6:44:55 PM (19 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Implemented loadability of worlds and campaigns from files. Theoretically any Story_Entity and World_Entity can now be loaded from the files if somebody adjusts the classes to be loadable. System still needs testing

Location:

orxonox/branches/levelloader/src

Files:

• game_loader.cc (modified) (2 diffs)
• game_loader.h (modified) (1 diff)
• story_entities/campaign.cc (modified) (3 diffs)
• story_entities/world.cc (modified) (4 diffs)
• story_entities/world.h (modified) (2 diffs)

orxonox/branches/levelloader/src/game_loader.cc

@@ -25 +25 @@
 #include "command_node.h"
 #include "vector.h"
+#include "factory.h"
 
 #include <string.h>
@@ -162 +163 @@
   {
                 PRINTF(ERR)("No filename specified for loading");
+                return NULL;
   }
   

orxonox/branches/levelloader/src/game_loader.h

@@ -35 +35 @@
   
   void registerFactory( Factory* factory);
-  StoryEntity* fabricate( TiXMLElement* data);
+  BaseObject* fabricate( TiXMLElement* data);
   
  private:

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

@@ -21 +21 @@
 #include "camera.h"
 #include "story_entity.h"
+#include "factory.h"
 
 using namespace std;
@@ -36 +37 @@
 {
         TiXMLElement* element;
+        char string;
+        int id;
         
         assert( root != NULL);
@@ -44 +47 @@
   
   // grab all the necessary parameters
-  
+        string = grabParameter( root, "identifier");
+        if( string == NULL || if( sscanf(string, "%d", &id) != 1))
+        {
+                PRINTF(ERR)("Campaign is missing a proper 'identifier'\n");
+                setStoryId( -1);
+        }
+        else setStoryId( id);
+        
   // find WorldList
   element = root->FirstChildElement( "WorldList");
   
-  // load Worlds
+  // load Worlds/Subcampaigns/Whatever
         while( element != NULL)
         {
-                StoryEntity created = loader->fabricate( element);
+                StoryEntity* created = (StoryEntity*) loader->fabricate( element);
                 if( created != NULL) addEntity( created);
                 element = element->nextSiblingElement();

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

@@ -29 +29 @@
 #include "light.h"
 #include "fontset.h"
+#include "factory.h"
 
 using namespace std;
@@ -35 +36 @@
 World::World( TiXMLElement* root)
 {
-        TiXMLElement* element;
-        // load parameters
-                // identifier
-        element = FirstChildrenElement("identifier");
-        if( element == NULL)
-        {
-                PRINTF(ERR)("World created with missing identifier\n");
-                setStoryID( -1);
-        }
-                // file
+        char *string, *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);
+        
+        // path
+        string = grabParameter( root, "path");
+        if( string == NULL)
+        {
+                PRINTF(ERR)("World is missing a proper 'path'\n");
+                setPath( NULL);
+        }
+        else
+        {
+                name = new char[strlen(string + 2)];
+                strcpy( name, string);
+                setPath( name);
+        }
+        
+        
 }
 
@@ -115 +133 @@
 ErrorMessage World::load()
 {
+        if( 0)  // temporary until we really load from files
+        {
+                        GameLoader* loader = GameLoader::getInstance();
+                        
+                  if( getPath() == NULL)
+                  {
+                                PRINTF(ERR)("World has no path specified for loading");
+                                return (ErrorMessage){213,"Path not specified","World::load()"};
+                  }
+                  
+                        TiXMLDocument* XMLDoc = new TiXMLDocument( name);
+                        // load the campaign document
+                        if( !XMLDoc.LoadFile())
+                        {
+                                // report an error
+                                PRINTF(ERR)("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()"};
+                        }
+                        
+                        // check basic validity
+                        TiXMLElement* element = XMLDoc.RootElement();
+                        assert( element != NULL);
+                        
+                        element = element->FirstChildElement( "WorldDataFile");
+                        
+                        if( element == NULL )
+                        {
+                                // report an error
+                                PRINTF(ERR)("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()"};
+                        }
+                        
+                        // load the parameters
+                                // name
+                        char* temp;
+                        char* string = grabParameter( root, "name");
+                        if( string == NULL)
+                        {
+                                PRINTF(ERR)("World is missing a proper 'name'\n");
+                                setStoryId( -1);
+                        }
+                        else
+                        {
+                                temp = new char[strlen(string + 2)];
+                                worldName = temp;
+                        }
+                        
+                        
+                        // find WorldEntities
+                  element = root->FirstChildElement( "WorldEntities");
+                  
+                  // load Players/Objects/Whatever
+                        while( element != NULL)
+                        {
+                                WorldEntity* created = (WorldEntity*) loader->fabricate( element);
+                                if( created != NULL) spawn( created);
+                                element = element->nextSiblingElement();
+                        }
+                        
+                        // find Track
+                                // TODO: load the track somehow
+                        
+                        // free the XML data
+                        delete XMLDoc;
+        }
+        
   //  BezierCurve* tmpCurve = new BezierCurve();
   if(this->debugWorldNr != -1)
@@ -916 +1002 @@
 }
 
+void World::setPath( char* name)
+{
+        path = name;
+}
+
+char* World::getPath()
+{
+        return path;
+}

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

@@ -52 +52 @@
   void spawn (WorldEntity* entity);
   void spawn (WorldEntity* entity, Vector* absCoor, Quaternion* absDir);
-
+        
+        void setPath( char* name);
+        char* getPath();
 
 
@@ -65 +67 @@
 
   char* worldName;              //!< The name of this World
+  char* path;                                                                           //!< The path to the data file used by this World
   int debugWorldNr;             //!< The Debug Nr. needed, if something goes wrong