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

Timestamp:

Jun 19, 2006, 11:03:58 PM (19 years ago)

Author:

patrick

Message:

bsp: md3_config is loaded correctly via resource manager

Location:

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

Files:

• md3_animation_cfg.h (modified) (2 diffs)
• md3_model.cc (modified) (1 diff)
• md3_model.h (modified) (2 diffs)

branches/bsp_model/src/lib/graphics/importer/md3/md3_animation_cfg.h

@@ -10 +10 @@
 
 #include "vector.h"
+
+#include "base_object.h"
 
 #include <string>
@@ -27 +29 @@
    * a class with metadata describing an MD3 model animation
    */
-  class MD3AnimationCfg
+  class MD3AnimationCfg : public BaseObject
   {
 

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

@@ -79 +79 @@
   void MD3Model::autoAssemblePlayerModel(std::string filename, float scaling)
   {
-//     this->md3Data = new MD3Data(filename, filename, scaling);
-//     MD3AnimationCfg cfg("/home/boenzlip/tmp/q3/Downloads/MOH/q3mdl-alien3/models/players/alien3/animation.cfg");
+    std::string cfgName(filename + "/animation.cfg");
+    this->config = (MD3AnimationCfg*)ResourceManager::getInstance()->load(cfgName, MD3_CONFIG, RP_GAME);
 
 
     //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);
 

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

@@ -21 +21 @@
 class MD3Mesh;
 class MD3Tag;
+class MD3AnimationCfg;
 
 struct MD3Normal;
@@ -65 +66 @@
     float**             tmpMatrix;         //!< a temporary matrix
 
+    MD3AnimationCfg*    config;            //!< the config file parsed
 };