Changeset 4261 in orxonox.OLD for orxonox/trunk/src/story_entities

Timestamp:

May 22, 2005, 3:19:57 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the levelLoader-branche back into the trunk, because it seems to be stable.
merged with command:
svn merge -r 4230:HEAD levelLoader ../trunk
no conflicts of any interesst

Location:

orxonox/trunk/src/story_entities

Files:

• campaign.cc (modified) (2 diffs)
• campaign.h (modified) (1 diff)
• story_entity.h (modified) (1 diff)
• world.cc (modified) (6 diffs)
• world.h (modified) (3 diffs)

orxonox/trunk/src/story_entities/campaign.cc

@@ -27 +27 @@
 #include "list.h"
 
+#include "load_param.h"
+
 using namespace std;
 
@@ -35 +37 @@
   this->isInit = false;
 }
+
 Campaign::Campaign ( TiXmlElement* root) 
 {

orxonox/trunk/src/story_entities/campaign.h

@@ -8 +8 @@
 
 class World;
+class TiXmlElement;
 template<class T> class tList;
 

orxonox/trunk/src/story_entities/story_entity.h

@@ -11 +11 @@
 #include "story_def.h"
 #include "error.h"
-
 
 //! A class that represents something to play in orxonox. it is a container for worlds, movies, mission briefings, etc...

orxonox/trunk/src/story_entities/world.cc

@@ -53 +53 @@
 #include "substring.h"
 
-
+#include "factory.h"
 
 using namespace std;
@@ -123 +123 @@
 CREATE_FACTORY(World);
 
-World::World( TiXmlElement* root)
+World::World(const TiXmlElement* root)
 {
   this->constuctorInit("", -1);
   this->path = NULL;
-  const char *string;
-  char *name;
-  int id;
-  
-  PRINTF0("Creating a World\n");
-  
-  // identifier
-  string = grabParameter( root, "identifier");
-  if( string == NULL || sscanf(string, "%d", &id) != 1)
-    {
-      PRINTF0("World is missing a proper 'identifier'\n");
-      this->setStoryID( -1);
-    }
-  else setStoryID( id);
-
-  // next id
-  string = grabParameter( root, "nextid");
-  if( string == NULL || sscanf(string, "%d", &id) != 1)
-    {
-      PRINTF0("World is missing a proper 'nextid'\n");
-      this->setStoryID( -1);
-    }
-  else setNextStoryID( id);
-  
-
-  // path
-  string = grabParameter( root, "path");
-  if( string == NULL)
-    {
-      PRINTF0("World is missing a proper 'path'\n");
-      this->setPath( NULL);
-    }
-  else
-    {
-      name = new char[strlen(string + 2)];
-      strcpy( name, string);
-      this->setPath( name);
-    }
+  
+  this->loadParams(root);
 }
 
@@ -213 +177 @@
   //delete animator
 
+  LoadClassDescription::printAll();
+
   ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
 }
@@ -234 +200 @@
   this->debugWorldNr = worldID;
   this->entities = new tList<WorldEntity>();
+}
+
+void World::loadParams(const TiXmlElement* root)
+{
+  const char *string;
+  char *name;
+  int id;
+
+  PRINTF0("Creating a World\n");
+
+  LoadParam<World>(root, "identifier", this, &World::setStoryID)
+    .describe("Sets the StoryID of this world");
+  LoadParam<World>(root, "nextid", this, &World::setNextStoryID)
+    .describe("Sets the ID of the next world");
+  LoadParam<World>(root, "path", this, &World::setPath)
+    .describe("The Filename of this World (relative from the data-dir)");
+
+
+  /*  
+  // identifier
+  string = grabParameter( root, "identifier");
+  if( string == NULL || sscanf(string, "%d", &id) != 1)
+  {
+  PRINTF0("World is missing a proper 'identifier'\n");
+  this->setStoryID( -1);
+  }
+  else setStoryID( id);
+
+  // next id
+  string = grabParameter( root, "nextid");
+  if( string == NULL || sscanf(string, "%d", &id) != 1)
+  {
+  PRINTF0("World is missing a proper 'nextid'\n");
+  this->setStoryID( -1);
+  }
+  else setNextStoryID( id);
+  
+
+  // path
+  string = grabParameter( root, "path");
+  if( string == NULL)
+  {
+  PRINTF0("World is missing a proper 'path'\n");
+  this->setPath( NULL);
+  }
+  else
+  {
+  name = new char[strlen(string + 2)];
+  strcpy( name, string);
+  this->setPath( name);
+  }
+  */
 }
 
@@ -334 +352 @@
   else
     {
-      this->glmis->load(element);
+      this->glmis->loadParams(element);
       this->glmis->draw();
     }
@@ -421 +439 @@
   glNewList (objectList, GL_COMPILE);
   
-
   //trackManager->drawGraph(.01);
   //trackManager->debug(2);

orxonox/trunk/src/story_entities/world.h

@@ -11 +11 @@
 #include "story_entity.h"
 #include "p_node.h"
-#include "xmlparser/tinyxml.h"
 
 class World;
@@ -24 +23 @@
 class GarbageCollector;
 class Text;
+class TiXmlElement;
 
 //! The game world Interface
@@ -56 +56 @@
   World (char* name);
   World (int worldID);
-  World (TiXmlElement* root);
+  World (const TiXmlElement* root = NULL);
   virtual ~World ();
+
+  void loadParams(const TiXmlElement* root);
 
   double getGameTime();