Changeset 4251 in orxonox.OLD for orxonox/branches/levelLoader/src/world_entities

Timestamp:

May 21, 2005, 11:17:18 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/levelLoader: some issues, to be able to describe what is loadable

Location:

orxonox/branches/levelLoader/src/world_entities

Files:

• skybox.cc (modified) (2 diffs)
• skybox.h (modified) (1 diff)
• world_entity.cc (modified) (1 diff)
• world_entity.h (modified) (1 diff)

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

@@ -49 +49 @@
   this->preInit();
 
+  this->load(root);
+
+  this->postInit();
+}
+
+void SkyBox::load(TiXmlElement* root)
+{
   LoadParam<SkyBox>(root, "Materialset", this, &SkyBox::setTexture);
-
-  this->postInit();
 }
 
@@ -208 +213 @@
   this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 0,0,0, 1,1,0, 3,2,0, 2,3,0); // right
   this->skyModel->setMaterial(material[4]);
-  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,0,5, 7,1,5, 5,2,5, 3,3,6); // front
+  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,0,5, 7,1,5, 5,2,5, 3,3,5); // front
   this->skyModel->setMaterial(material[5]);
   this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,0,4, 0,1,4, 2,2,4, 4,3,4); // back

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

@@ -26 +26 @@
   virtual ~SkyBox();
 
+  void load(TiXmlElement* root);
+
   void preInit(void);
   void postInit(void);

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

@@ -26 +26 @@
 
 /**
-   \brief standard constructor
-*/
-WorldEntity::WorldEntity ()
+   \brief Loads the WordEntity-specific Part of any derived Class
+*/
+WorldEntity::WorldEntity(TiXmlElement* root)
 {
   this->setClassName ("WorldEntity");
+  this->model = NULL;
+
+  if (root)
+    this->load(root);
+
   this->bDraw = true;
-  this->model = NULL;
-  //  collisioncluster = NULL;
-}
-
-/**
-   \brief Loads the WordEntity-specific Part of any derived Class
-*/
-WorldEntity::WorldEntity(TiXmlElement* root)
-{
-  this->setClassName ("WorldEntity");
-  // Name Setup
+}
+
+void WorldEntity::load(TiXmlElement* root)
+{
+  // name setup
   LoadParam<WorldEntity>(root, "name", this, &WorldEntity::setName);
+
   // Model Loading      
-  this->model = NULL;
   LoadParam<WorldEntity>(root, "model", this, &WorldEntity::loadModel);
-
-  this->bDraw = true;
 }
 

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

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