Changeset 5499 in orxonox.OLD for trunk/src/world_entities/world_entity.cc

Timestamp:

Nov 7, 2005, 10:56:58 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Load_Param2 changed, to load Models with, or without scale.

File:

• trunk/src/world_entities/world_entity.cc (modified) (2 diffs)

trunk/src/world_entities/world_entity.cc

@@ -75 +75 @@
 
   // Model Loading
-  LoadParam<WorldEntity>(root, "model", this, &WorldEntity::loadModel)
+  LoadParam<WorldEntity>(root, "model", this, &WorldEntity::loadModel, false, NULL, 1.0f)
       .describe("the fileName of the model, that should be loaded onto this world-entity. (must be relative to the data-dir)") ;
 
-  // HACK
-  LoadParam<WorldEntity>(root, "scaled-model", this, &WorldEntity::loadModelWithScale)
-      .describe("the fileName of the model, that should be loaded onto this world-entity. (must be relative to the data-dir)") ;
 }
 
@@ -90 +87 @@
  * @todo fix this, so it only has one loadModel-Function.
 */
-void WorldEntity::loadModelWithScale(const char* fileName, float scaling)
+void WorldEntity::loadModel(const char* fileName, float scaling)
 {
   if (this->model)