Changeset 5499 in orxonox.OLD for trunk/src

Timestamp:

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

Author:

bensch

Message:

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

Location:

trunk/src

Files:

• util/loading/load_param.h (modified) (2 diffs)
• world_entities/npc.cc (modified) (1 diff)
• world_entities/npc2.cc (modified) (1 diff)
• world_entities/power_ups/laser_power_up.cc (modified) (1 diff)
• world_entities/power_ups/turret_power_up.cc (modified) (1 diff)
• world_entities/weapons/rocket.cc (modified) (1 diff)
• world_entities/weapons/test_bullet.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (2 diffs)
• world_entities/world_entity.h (modified) (1 diff)

trunk/src/util/loading/load_param.h

@@ -169 +169 @@
  * @param type1 The type of the first functionParameter
  * @param type2 The type of the second functionParameter
+ *
+ * @TODO DEFAULT VALUES HACK
  */
 #define LoadParam2(type1, type2) \
@@ -178 +180 @@
 { \
           SubString subLoads(loadString); \
-          if (subLoads.getCount() == 2) \
+          if (subLoads.getCount() >= 1) \
             (*pt2Object.*function)(type1##_FUNC(subLoads.getString(0), default1), type2##_FUNC(subLoads.getString(1), default2)); \
           else \

trunk/src/world_entities/npc.cc

@@ -34 +34 @@
   this->setClassID(CL_NPC, "NPC");
 
-  this->loadModelWithScale("models/ships/bolido.obj", 2);
+  this->loadModel("models/ships/bolido.obj", 2);
 
   this->randomRotAxis =  VECTOR_RAND(1);

trunk/src/world_entities/npc2.cc

@@ -33 +33 @@
   this->setClassID(CL_NPC, "NPC");
 
-  this->loadModelWithScale("models/ships/bolido.obj", 3);
+  this->loadModel("models/ships/bolido.obj", 3);
   this->shader = NULL;
   if (likely(Shader::checkShaderAbility()))

trunk/src/world_entities/power_ups/laser_power_up.cc

@@ -50 +50 @@
 {
   this->setClassID(CL_LASER_POWER_UP, "LaserPowerUp");
-  this->loadModelWithScale("models/guns/test_gun.obj", 2.0);
+  this->loadModel("models/guns/test_gun.obj", 2.0);
 
   this->sphereModel = new PrimitiveModel(PRIM_SPHERE, 7, 5);

trunk/src/world_entities/power_ups/turret_power_up.cc

@@ -50 +50 @@
 {
   this->setClassID(CL_TURRET_POWER_UP, "TurretPowerUp");
-  this->loadModelWithScale("models/guns/turret1.obj", 2.0);
+  this->loadModel("models/guns/turret1.obj", 2.0);
 
   this->sphereModel = new PrimitiveModel(PRIM_SPHERE, 7, 5);

trunk/src/world_entities/weapons/rocket.cc

@@ -41 +41 @@
 
   float modelSize = .3;
-  this->loadModelWithScale("models/projectiles/orx-rocket.obj", .3);
+  this->loadModel("models/projectiles/orx-rocket.obj", .3);
 
   this->energyMin = 1;

trunk/src/world_entities/weapons/test_bullet.cc

@@ -41 +41 @@
 
   float modelSize = .3;
-  this->loadModelWithScale("models/projectiles/orx-rocket.obj", .3);
+  this->loadModel("models/projectiles/orx-rocket.obj", .3);
 
   this->energyMin = 1;

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)

trunk/src/world_entities/world_entity.h

@@ -28 +28 @@
 
   /** @see loadModelWithScale(const char*, float) @param fileName the File to load */
-  void loadModel(const char* fileName) { this->loadModelWithScale(fileName, 1.0f); };
-
-  void loadModelWithScale(const char* fileName, float scaling);
+  void loadModel(const char* fileName, float scaling = 1.0f);
 
   bool buildObbTree(unsigned int depth);