Changeset 4253 in orxonox.OLD for orxonox/branches

Timestamp:

May 21, 2005, 11:58:49 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/levelLoader: constifization

Location:

orxonox/branches/levelLoader/src

Files:

• glmenu/glmenu_imagescreen.cc (modified) (2 diffs)
• glmenu/glmenu_imagescreen.h (modified) (1 diff)
• story_entities/world.cc (modified) (3 diffs)
• story_entities/world.h (modified) (1 diff)
• util/loading/factory.cc (modified) (1 diff)
• util/loading/factory.h (modified) (3 diffs)
• util/loading/load_param.h (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)
• world_entities/player.h (modified) (1 diff)
• world_entities/skybox.cc (modified) (1 diff)
• world_entities/skybox.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (2 diffs)
• world_entities/world_entity.h (modified) (1 diff)

orxonox/branches/levelLoader/src/glmenu/glmenu_imagescreen.cc

@@ -38 +38 @@
    \param root The Element to load the GLMenu from
 */
-GLMenuImageScreen::GLMenuImageScreen (TiXmlElement* root)
+GLMenuImageScreen::GLMenuImageScreen(const TiXmlElement* root)
 {
   this->init();
-  this->load(root);
-
+  this->loadParams(root);
 }
 
@@ -56 +55 @@
    \li ElementCount: INT: how many elements will be loaded
 */
-void GLMenuImageScreen::load(TiXmlElement* root)
+void GLMenuImageScreen::loadParams(const TiXmlElement* root)
 {
   LoadParam<GLMenuImageScreen>(root, "BackgroundImage", this, &GLMenuImageScreen::setBackgroundImage);

orxonox/branches/levelLoader/src/glmenu/glmenu_imagescreen.h

@@ -17 +17 @@
  public:
   GLMenuImageScreen ();
-  GLMenuImageScreen (TiXmlElement* root);
-  void load(TiXmlElement* root);
+  GLMenuImageScreen (const TiXmlElement* root);
+  void loadParams(const TiXmlElement* root);
   virtual ~GLMenuImageScreen ();
 

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

@@ -121 +121 @@
 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);
 }
 
@@ -234 +198 @@
   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");
+  
+  // 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);
+    }
 }
 
@@ -332 +338 @@
   else
     {
-      this->glmis->load(element);
+      this->glmis->loadParams(element);
       this->glmis->draw();
     }

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

@@ -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();

orxonox/branches/levelLoader/src/util/loading/factory.cc

@@ -65 +65 @@
    \brief generates the associated object from data
 */
-BaseObject* Factory::fabricate( TiXmlElement* data)
+BaseObject* Factory::fabricate(const TiXmlElement* data)
 {
   return NULL;

orxonox/branches/levelLoader/src/util/loading/factory.h

@@ -46 +46 @@
   
 
-  virtual BaseObject* fabricate( TiXmlElement* root);
+  virtual BaseObject* fabricate(const TiXmlElement* root);
   void initialize();
   void registerFactory( Factory* factory);
@@ -67 +67 @@
   
   private:
-  BaseObject* fabricate( TiXmlElement* root);
+  BaseObject* fabricate(const TiXmlElement* root);
 };
 
@@ -82 +82 @@
 
 template<class T>
-BaseObject* tFactory<T>::fabricate( TiXmlElement* root) 
+BaseObject* tFactory<T>::fabricate(const TiXmlElement* root) 
 { 
   if(!strcmp(root->Value(), getFactoryName()))

orxonox/branches/levelLoader/src/util/loading/load_param.h

@@ -157 +157 @@
 
 #define CREATE_LOAD_DOC(CLASS_NAME) \
-
-/*  void documentLoadClass(void) \
+  void documentLoadClass##CLASS_NAME(void) \
     { \
       if(LoadClassDescription::parametersDescription) \
         { \
           CLASS_NAME docuClass; \
-          docuClass.load(NULL); \
-        } \
-    } \
-  documentLoadClass();
-*/
+          docuClass.loadParams(NULL); \
+        } \
+    } 
+//  documentLoadClass();
+
 
 class LoadParamDescription

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

@@ -80 +80 @@
    \todo add more parameters to load
 */
-Player::Player(TiXmlElement* root) : WorldEntity(root)
+Player::Player(const TiXmlElement* root) : WorldEntity(root)
 {
   this->weapons = new tList<Weapon>();

orxonox/branches/levelLoader/src/world_entities/player.h

@@ -22 +22 @@
  public:
   Player();
-  Player(TiXmlElement* root);
+  Player(const TiXmlElement* root);
   virtual ~Player();
 

orxonox/branches/levelLoader/src/world_entities/skybox.cc

@@ -45 +45 @@
 }
 
-SkyBox::SkyBox(TiXmlElement* root) : WorldEntity(root)
+SkyBox::SkyBox(const TiXmlElement* root) : WorldEntity(root)
 {
   this->preInit();
 
-  this->load(root);
+  this->loadParams(root);
 
   this->postInit();
 }
 
-void SkyBox::load(TiXmlElement* root)
+void SkyBox::loadParams(const TiXmlElement* root)
 {
   LoadParam<SkyBox>(root, "Materialset", this, &SkyBox::setTexture);

orxonox/branches/levelLoader/src/world_entities/skybox.h

@@ -22 +22 @@
  public:
   SkyBox(const char* fileName = NULL);
-  SkyBox(TiXmlElement* root);
+  SkyBox(const TiXmlElement* root);
 
   virtual ~SkyBox();
 
-  void load(TiXmlElement* root);
+  void loadParams(const TiXmlElement* root);
 
   void preInit(void);

orxonox/branches/levelLoader/src/world_entities/world_entity.cc

@@ -28 +28 @@
    \brief Loads the WordEntity-specific Part of any derived Class
 */
-WorldEntity::WorldEntity(TiXmlElement* root)
+WorldEntity::WorldEntity(const TiXmlElement* root)
 {
   this->setClassName ("WorldEntity");
@@ -34 +34 @@
 
   if (root)
-    this->load(root);
+    this->loadParams(root);
 
   this->bDraw = true;
 }
 
-void WorldEntity::load(TiXmlElement* root)
+void WorldEntity::loadParams(const TiXmlElement* root)
 {
   // name setup

orxonox/branches/levelLoader/src/world_entities/world_entity.h

@@ -23 +23 @@
 
  public:
-  WorldEntity(TiXmlElement* root = NULL);
+  WorldEntity(const TiXmlElement* root = NULL);
   virtual ~WorldEntity ();
 
-  void load(TiXmlElement* root);
+  void loadParams(const TiXmlElement* root);
   void loadModel(const char* fileName);