Changeset 8591 in orxonox.OLD

Timestamp:

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

Author:

patrick

Message:

bsp: md3_config is loaded correctly via resource manager

Location:

branches/bsp_model/src/lib

Files:

• graphics/importer/md3/md3_animation_cfg.h (modified) (2 diffs)
• graphics/importer/md3/md3_model.cc (modified) (1 diff)
• graphics/importer/md3/md3_model.h (modified) (2 diffs)
• util/loading/resource_manager.cc (modified) (5 diffs)
• util/loading/resource_manager.h (modified) (1 diff)

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
 };
 

branches/bsp_model/src/lib/util/loading/resource_manager.cc

@@ -29 +29 @@
 #include "md2/md2Model.h"
 #include "md3/md3_data.h"
+#include "md3/md3_animation_cfg.h"
 #endif /* NO_MODEL */
 #ifndef NO_TEXTURES
@@ -204 +205 @@
   else if (!strncmp(fileName.c_str()+(fileName.size()-4), ".md3", 4))
     tmpType = MD3;
+  else if (!strncmp(fileName.c_str()+(fileName.size()-4), ".cfg", 4))
+    tmpType = MD3_CONFIG;
   else if (!strcasecmp(fileName.c_str(), "cube") ||
             !strcasecmp(fileName.c_str(), "sphere") ||
@@ -406 +409 @@
       if(File(fullName).isFile())
       {
-        PRINTF(0)("md3 load\n");
         tmpResource->param[0] = param0;
         tmpResource->param[1] = param1;
         tmpResource->pointer = new md3::MD3Data(fullName, tmpResource->param[0].getCString(), tmpResource->param[1].getFloat());
+      }
+      break;
+    case MD3_CONFIG:
+      if(File(fullName).isFile())
+      {
+        tmpResource->param[0] = param0;
+        tmpResource->param[1] = param1;
+        tmpResource->pointer = new md3::MD3AnimationCfg(fullName);
       }
       break;
@@ -640 +650 @@
             match = true;
           else if ((*resource)->param[0] == ((MultiType)param0).getString() && (*resource)->param[1] == ((MultiType)param1).getFloat())
+            match = true;
+          break;
+        case MD3_CONFIG:
+          if (param0 == MT_NULL && ((*resource)->param[0] == ""))
+            match = true;
+          else if ((*resource)->param[0] == ((MultiType)param0).getString())
             match = true;
           break;
@@ -883 +899 @@
     "MD2-Data",
     "MD3-Data",
+    "MD3-Config"
 #endif
 #ifndef NO_TEXT

branches/bsp_model/src/lib/util/loading/resource_manager.h

@@ -34 +34 @@
   MD2,                  //!< loading md2-file
   MD3,                  //!< loading md3-file
+  MD3_CONFIG,           //!< the md3 config file
 #endif /* NO_MODEL */
 #ifndef NO_TEXT