Changeset 4283 in orxonox.OLD for orxonox/branches/physics/src/world_entities/world_entity.cc

Timestamp:

May 24, 2005, 10:32:34 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to branches/physics
merged with command
svn merge -r 4223:HEAD ../../trunk/ .
conflicts additively included

File:

• orxonox/branches/physics/src/world_entities/world_entity.cc (modified) (2 diffs)

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

@@ -23 +23 @@
 #include "vector.h"
 
-//#include "stdincl.h"
-//#include "collision.h"
-
 using namespace std;
 
 /**
-   \brief standard constructor
-*/
-WorldEntity::WorldEntity ()
+   \brief Loads the WordEntity-specific Part of any derived Class
+*/
+WorldEntity::WorldEntity(const TiXmlElement* root)
 {
   this->setClassName ("WorldEntity");
+  this->model = NULL;
+
+  if (root)
+    this->loadParams(root);
+
   this->bDraw = true;
-  this->model = NULL;
-  //  collisioncluster = NULL;
-}
-
-/**
-   \brief Loads the WordEntity-specific Part of any derived Class
-*/
-WorldEntity::WorldEntity(TiXmlElement* root)
-{
-  // Name Setup
-  char* temp;
-  const char* string;
-  string = grabParameter( root, "name");
-  if( string == NULL)
-    {
-      PRINTF(2)("WorldEntity is missing a proper 'name'\n");
-      string = "Unknown";
-      temp = new char[strlen(string + 2)];
-      strcpy( temp, string);
-      this->setName( temp);
-    }
-  else
-    {
-      temp = new char[strlen(string + 2)];
-      strcpy( temp, string);
-      this->setName( temp);
-    }
+}
+
+void WorldEntity::loadParams(const TiXmlElement* root)
+{
+  // name setup
+  LoadParam<WorldEntity>(root, "name", this, &WorldEntity::setName)
+    .describe("the name of the Object at hand");
+
   // Model Loading      
-  this->model = NULL;
-  string = grabParameter( root, "model");
-  if( string != NULL)
-    this->model = (Model*)ResourceManager::getInstance()->load(string, OBJ, RP_CAMPAIGN);
-  else
-    {
-      PRINTF(2)("WorldEntity is missing a proper 'model'\n");
-      this->model = NULL;
-    }
-  if( this->model == NULL)
-    {
-      PRINTF(2)("WorldEntity model '%s' could not be loaded\n", string);
-    }
-  this->bDraw = true;
+  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)") ;
 }
 
@@ -87 +58 @@
   if (this->model)
     ResourceManager::getInstance()->unload(this->model);
+}
+
+/**
+   \brief loads a Model onto a WorldEntity
+   \param fileName the name of the model to load
+*/
+void WorldEntity::loadModel(const char* fileName)
+{
+  if (this->model)
+    ResourceManager::getInstance()->unload(this->model, RP_LEVEL);
+  this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN);
 }