Changeset 8590 in orxonox.OLD for branches/bsp_model/src/lib/graphics

Timestamp:

Jun 19, 2006, 10:48:45 PM (18 years ago)

Author:

patrick

Message:

bsp: md3 integrated to the resource manager

Location:

branches/bsp_model/src/lib/graphics/importer/md3

Files:

• md3_data.cc (modified) (1 diff)
• md3_model.cc (modified) (3 diffs)

branches/bsp_model/src/lib/graphics/importer/md3/md3_data.cc

@@ -374 +374 @@
     std::string path1(tex[i].fileName);
     std::string fullPath( path + path1);
-    this->meshes[mesh]->material[i].setDiffuseMap(/*tex[i].fileName*/ /*fullPath.c_str()*/ "maps/yuri.tga");
+    this->meshes[mesh]->material[i].setDiffuseMap(/*tex[i].fileName*/ /*fullPath.c_str()*/ "maps/creatures/gork/gorkup.tga");
     this->meshes[mesh]->material[i].setAmbient(1, 1, 1);
   }

branches/bsp_model/src/lib/graphics/importer/md3/md3_model.cc

@@ -27 +27 @@
 #include "quaternion.h"
 
+#include "loading/resource_manager.h"
+
 #include "debug.h"
 
@@ -37 +39 @@
   MD3Model::MD3Model(std::string filename, float scaling)
   {
-
     this->autoAssemblePlayerModel(filename, scaling);
 
@@ -74 +75 @@
   /**
    * auto assemples a player model
+   * @param filename is the name to the directory of the modelzzzzzz
    */
   void MD3Model::autoAssemblePlayerModel(std::string filename, float scaling)
   {
-    this->md3Data = new MD3Data(filename, filename, scaling);
+//     this->md3Data = new MD3Data(filename, filename, scaling);
 //     MD3AnimationCfg cfg("/home/boenzlip/tmp/q3/Downloads/MOH/q3mdl-alien3/models/players/alien3/animation.cfg");
+
+
+    //first load the torso
+    std::string name(filename + "/upper.md3");
+    PRINTF(0)("data dir: %s\n", ResourceManager::getInstance()->getFullName(name).c_str());
+
+//     this->md3Data = new MD3Data(name, name, scaling);
+    this->md3Data = (MD3Data*)ResourceManager::getInstance()->load(name, MD3, RP_GAME, name, scaling);
+