Changeset 8724 in orxonox.OLD for trunk/src/lib/util

Timestamp:

Jun 22, 2006, 3:14:58 PM (19 years ago)

Author:

bensch

Message:

merged the bsp-model-stuff back here

Location:

trunk/src/lib/util

Files:

• Makefile.am (modified) (2 diffs)
• loading/resource_manager.cc (modified) (5 diffs)
• loading/resource_manager.h (modified) (1 diff)
• tokenizer.cc (copied) (copied from branches/bsp_model/src/lib/util/tokenizer.cc)
• tokenizer.h (copied) (copied from branches/bsp_model/src/lib/util/tokenizer.h)

trunk/src/lib/util/Makefile.am

@@ -6 +6 @@
 libORXlibutil_a_SOURCES = \
                 substring.cc \
+                tokenizer.cc \
                 color.cc \
                 helper_functions.cc \
@@ -28 +29 @@
                 timer.cc
 
+
 noinst_HEADERS = \
                 substring.h \
+                tokenizer.h \
                 multi_type.h \
                 color.h \

trunk/src/lib/util/loading/resource_manager.cc

@@ -28 +28 @@
 #include "primitive_model.h"
 #include "md2/md2Model.h"
+#include "md3/md3_data.h"
+#include "md3/md3_animation_cfg.h"
 #endif /* NO_MODEL */
 #ifndef NO_TEXTURES
@@ -201 +203 @@
   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 (!strncmp(fileName.c_str()+(fileName.size()-4), ".cfg", 4))
+    tmpType = MD3_CONFIG;
   else if (!strcasecmp(fileName.c_str(), "cube") ||
             !strcasecmp(fileName.c_str(), "sphere") ||
@@ -400 +406 @@
       }
       break;
+    case MD3:
+      if(File(fullName).isFile())
+      {
+        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;
 #endif /* NO_MODEL */
 #ifndef NO_TEXT
@@ -624 +646 @@
             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;
+        case MD3_CONFIG:
+          if (param0 == MT_NULL && ((*resource)->param[0] == ""))
+            match = true;
+          else if ((*resource)->param[0] == ((MultiType)param0).getString())
+            match = true;
+          break;
+
 #endif /* NO_MODEL */
 #ifndef NO_TEXT
@@ -863 +898 @@
     "PrimitiveModel",
     "MD2-Data",
+    "MD3-Data",
+    "MD3-Config"
 #endif
 #ifndef NO_TEXT

trunk/src/lib/util/loading/resource_manager.h

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