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

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: model scaleable

File:

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

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;
 }
+
+
 
 /**