Changeset 7059 in orxonox.OLD for trunk/src/lib/graphics/importer

Timestamp:

Feb 6, 2006, 5:02:09 PM (19 years ago)

Author:

bensch

Message:

md2 model resource managed

Location:

trunk/src/lib/graphics/importer

Files:

• md2Model.cc (modified) (3 diffs)
• md2Model.h (modified) (1 diff)

trunk/src/lib/graphics/importer/md2Model.cc

@@ -77 +77 @@
 MD2Model::MD2Model(const char* modelFileName, const char* skinFileName, float scale)
 {
-  this->data->scaleFactor = scale;
-  this->scaleFactor = this->data->scaleFactor;
-
   /* this creates the data container via ressource manager */
-  this->data = (MD2Data*)ResourceManager::getInstance()->load(modelFileName, MD2, RP_GAME, skinFileName);
+  this->data = (MD2Data*)ResourceManager::getInstance()->load(modelFileName, MD2, RP_GAME, skinFileName, scale);
   if( unlikely(this->data == NULL))
     PRINTF(0)("The model was not found, MD2Model Loader finished abnormaly. Update the data-repos\n");
+
+  this->scaleFactor = scale;
 
   shadeDots = MD2Model::anormsDots[0];
@@ -338 +337 @@
   \brief simple constructor
 */
-MD2Data::MD2Data(const char* modelFileName, const char* skinFileName)
-{
+MD2Data::MD2Data(const char* modelFileName, const char* skinFileName, float scale)
+{
+  scale *= 0.1f;
+
   this->pVertices = NULL;
   this->pGLCommands = NULL;
@@ -351 +352 @@
 
 //   this->scaleFactor = 1.0f;
-  this->scaleFactor = 0.1f;
+  this->scaleFactor = scale;
 
   this->fileName = NULL;

trunk/src/lib/graphics/importer/md2Model.h

@@ -178 +178 @@
 {
  public:
-   MD2Data(const char* modelFileName, const char* skinFileName);
+   MD2Data(const char* modelFileName, const char* skinFileName, float scale = 1.0f);
   virtual ~MD2Data();