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

Timestamp:

May 20, 2005, 1:37:47 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/levelLoader: loading through Functors.
This should make our lives much more simple, if they are implemented real good.
This will take some time, and i would like you to comment on this.

Location:

orxonox/branches/levelLoader/src/world_entities

Files:

• world_entity.cc (modified) (4 diffs)
• world_entity.h (modified) (1 diff)

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

@@ -23 +23 @@
 #include "vector.h"
 
-//#include "stdincl.h"
-//#include "collision.h"
+#include "load_param.h"
 
 using namespace std;
@@ -51 +50 @@
     {
       PRINTF(2)("WorldEntity is missing a proper 'name'\n");
-      string = "Unknown";
-      temp = new char[strlen(string + 2)];
-      strcpy( temp, string);
-      this->setName( temp);
+      this->setName("unknown");
     }
   else
     {
-      temp = new char[strlen(string + 2)];
-      strcpy( temp, string);
-      this->setName( temp);
+      LoadParam<WorldEntity> (string, this, &WorldEntity::setName);
     }
   // Model Loading      
@@ -66 +60 @@
   string = grabParameter( root, "model");
   if( string != NULL)
-    this->model = (Model*)ResourceManager::getInstance()->load(string, OBJ, RP_CAMPAIGN);
+    LoadParam<WorldEntity>(string, this, &WorldEntity::loadModel);
   else
     {
@@ -87 +81 @@
   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)
+{
+  this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN);
 }
 

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

@@ -27 +27 @@
   virtual ~WorldEntity ();
 
+  void loadModel(const char* fileName);
 
   //void setCollision (CollisionCluster* newhull);