Changeset 8590 in orxonox.OLD for branches

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

Files:

• lib/graphics/importer/md3/md3_data.cc (modified) (1 diff)
• lib/graphics/importer/md3/md3_model.cc (modified) (3 diffs)
• lib/util/loading/resource_manager.cc (modified) (5 diffs)
• lib/util/loading/resource_manager.h (modified) (1 diff)
• world_entities/npcs/generic_npc.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)

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);
+
 
 

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

@@ -28 +28 @@
 #include "primitive_model.h"
 #include "md2/md2Model.h"
+#include "md3/md3_data.h"
 #endif /* NO_MODEL */
 #ifndef NO_TEXTURES
@@ -201 +202 @@
   else if (!strncmp(fileName.c_str()+(fileName.size()-4), ".md2", 4))
     tmpType = MD2;
+  else if (!strncmp(fileName.c_str()+(fileName.size()-4), ".md3", 4))
+    tmpType = MD3;
   else if (!strcasecmp(fileName.c_str(), "cube") ||
             !strcasecmp(fileName.c_str(), "sphere") ||
@@ -400 +403 @@
       }
       break;
+    case MD3:
+      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;
 #endif /* NO_MODEL */
 #ifndef NO_TEXT
@@ -624 +636 @@
             match = true;
           break;
+        case MD3:
+          if (param0 == MT_NULL && ((*resource)->param[0] == "") && param1 == MT_NULL && ((*resource)->param[0] == 1.0f))
+            match = true;
+          else if ((*resource)->param[0] == ((MultiType)param0).getString() && (*resource)->param[1] == ((MultiType)param1).getFloat())
+            match = true;
+          break;
+
 #endif /* NO_MODEL */
 #ifndef NO_TEXT
@@ -863 +882 @@
     "PrimitiveModel",
     "MD2-Data",
+    "MD3-Data",
 #endif
 #ifndef NO_TEXT

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

@@ -33 +33 @@
   PRIM,                 //!< loading primitive model
   MD2,                  //!< loading md2-file
+  MD3,                  //!< loading md3-file
 #endif /* NO_MODEL */
 #ifndef NO_TEXT

branches/bsp_model/src/world_entities/npcs/generic_npc.cc

@@ -127 +127 @@
  * @param coordinate: coordinate to go to
  */
-bool GenericNPC::walkTo(const Vector& coordinate)
+bool GenericNPC::walkTo(const Vector& coordinate, float time)
+{
+
+  return true;
+}
+
+
+/**
+ * walt to
+ * @param coordinate: coordinate to go to
+ */
+bool GenericNPC::walkTo(float x, float y, float z, float time)
 {
 

branches/bsp_model/src/world_entities/world_entity.cc

@@ -204 +204 @@
         this->buildObbTree(obbTreeDepth);
     }
-    else if(fileName.find(".md3") != std::string::npos)
+    else /*if(fileName.find(".md3") != std::string::npos)*/
     {
       PRINTF(4)("fetching MD3 file: %s\n", fileName.c_str());