Changeset 4436 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Jun 1, 2005, 12:50:07 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: baseObject now implements loading of objectNames

Location:

orxonox/trunk/src/world_entities

Files:

• skybox.cc (modified) (2 diffs)
• world_entity.cc (modified) (2 diffs)

orxonox/trunk/src/world_entities/skybox.cc

@@ -45 +45 @@
 }
 
-SkyBox::SkyBox(const TiXmlElement* root) : WorldEntity(root)
+SkyBox::SkyBox(const TiXmlElement* root)
 {
   this->preInit();
@@ -56 +56 @@
 void SkyBox::loadParams(const TiXmlElement* root)
 {
+  static_cast<WorldEntity*>(this)->loadParams(root);
+
   LoadParam<SkyBox>(root, "Materialset", this, &SkyBox::setTexture)
     .describe("Sets the material on the SkyBox. The string must be the path relative to the data-dir, and without a trailing .jpg");

orxonox/trunk/src/world_entities/world_entity.cc

@@ -39 +39 @@
 }
 
-void WorldEntity::loadParams(const TiXmlElement* root)
-{
-  // name setup
-  //  LoadParam<WorldEntity>(root, "name", this, &BaseObject::setName)
-  //    .describe("the name of the Object at hand");
-
-  // Model Loading      
-  LoadParam<WorldEntity>(root, "model", this, &WorldEntity::loadModel)
-    .describe("the fileName of the model, that should be loaded onto this world-entity. (must be relative to the data-dir)") ;
-}
-
 /**
    \brief standard destructor
@@ -58 +47 @@
   if (this->model)
     ResourceManager::getInstance()->unload(this->model);
+}
+
+void WorldEntity::loadParams(const TiXmlElement* root)
+{
+  static_cast<PNode*>(this)->loadParams(root);
+  // Model Loading
+  LoadParam<WorldEntity>(root, "model", this, &WorldEntity::loadModel)
+    .describe("the fileName of the model, that should be loaded onto this world-entity. (must be relative to the data-dir)") ;
 }