Changeset 5057 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Aug 16, 2005, 11:46:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: model scaleable

Location:

orxonox/trunk/src/world_entities

Files:

• weapons/test_bullet.cc (modified) (1 diff)
• world_entity.cc (modified) (3 diffs)
• world_entity.h (modified) (1 diff)

orxonox/trunk/src/world_entities/weapons/test_bullet.cc

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

orxonox/trunk/src/world_entities/world_entity.cc

@@ -64 +64 @@
  * loads a Model onto a WorldEntity
  * @param fileName the name of the model to load
-*/
-void WorldEntity::loadModel(const char* fileName)
+ * @param scaling the Scaling of the model
+*/
+void WorldEntity::loadModelWithScale(const char* fileName, float scaling)
 {
   if (this->model)
@@ -72 +73 @@
   {
     PRINTF(4)("loading %s\n", fileName);
-    this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN);
+    if (scaling == 1.0)
+      this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN);
+    else
+      this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, &scaling);
+
     PRINTF(4)("creating obb tree\n");
     this->obbTree = new OBBTree(4, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
@@ -79 +84 @@
     this->model = NULL;
 }
+
+
 
 /**

orxonox/trunk/src/world_entities/world_entity.h

@@ -30 +30 @@
 
   void loadParams(const TiXmlElement* root);
-  void loadModel(const char* fileName);
+
+  /** @see loadModelWithScale(const char*, float) @param fileName the File to load */
+  void loadModel(const char* fileName) { this->loadModelWithScale(fileName, 1.0); };
+  void loadModelWithScale(const char* fileName, float scaling);