Changeset 10313 in orxonox.OLD for branches/mount_points/src/world_entities/world_entity.cc

Timestamp:

Jan 24, 2007, 12:18:01 AM (18 years ago)

Author:

patrick

Message:

file is now loadable over the world xml file, including loading of model details

File:

• branches/mount_points/src/world_entities/world_entity.cc (modified) (4 diffs)

branches/mount_points/src/world_entities/world_entity.cc

@@ -145 +145 @@
   .defaultValues("", 1.0f, 0);
 
+  LoadParam(root, "mountpoints", this, WorldEntity, loadMountPoints)
+  .describe("the fileName of the object information file (optional)");
+
   LoadParam(root, "maxHealth", this, WorldEntity, setHealthMax)
   .describe("The Maximum health that can be loaded onto this entity")
@@ -216 +219 @@
         {
           this->buildObbTree(obbTreeDepth);
-
-          // now get the object information file for this model, if any
-          std::string oifName = fileName.substr(0, fileName.length() - 4) + ".oif";
-          this->loadMountPoints( model, oifName);
         }
       }
@@ -277 +276 @@
  * @param fileName the name of the file
  */
-void WorldEntity::loadMountPoints( Model* model, const std::string& fileName)
+void WorldEntity::loadMountPoints(const std::string& fileName)
 {
   PRINTF(5)("loading the oif File: %s\n", fileName.c_str());
@@ -283 +282 @@
   // now load the object information file
   this->oiFile = new ObjectInformationFile(fileName);
+
+  // get the model to load
+  Model* model = this->getModel();
 
   // extract the mount points