Changeset 6184 in orxonox.OLD for branches/christmas_branche/src/subprojects

Timestamp:

Dec 20, 2005, 1:44:21 PM (18 years ago)

Author:

patrick

Message:

christmas: importer now supports also md2 models

Location:

branches/christmas_branche/src/subprojects/importer

Files:

• Makefile.am (modified) (2 diffs)
• importer.cc (modified) (2 diffs)

branches/christmas_branche/src/subprojects/importer/Makefile.am

@@ -24 +24 @@
                   $(MAINSRCDIR)/lib/math/vector.cc \
                   $(MAINSRCDIR)/util/loading/resource_manager.cc \
-                  $(MAINSRCDIR)/lib/util/ini_parser.cc \
+                  $(MAINSRCDIR)/lib/parser/ini_parser/ini_parser.cc \
                   $(MAINSRCDIR)/lib/coord/p_node.cc \
-                  $(MAINSRCDIR)/lib/coord/null_parent.cc \
                   $(MAINSRCDIR)/util/loading/load_param.cc \
                   $(MAINSRCDIR)/util/loading/load_param_description.cc \
@@ -52 +51 @@
                   $(MAINSRCDIR)/lib/math/vector.cc \
                   $(MAINSRCDIR)/util/loading/resource_manager.cc \
-                  $(MAINSRCDIR)/lib/util/ini_parser.cc \
+                  $(MAINSRCDIR)/lib/parser/ini_parser/ini_parser.cc \
                   $(MAINSRCDIR)/lib/coord/p_node.cc \
-                  $(MAINSRCDIR)/lib/coord/null_parent.cc \
                   $(MAINSRCDIR)/util/loading/load_param.cc \
                   $(MAINSRCDIR)/util/loading/load_param_description.cc \

branches/christmas_branche/src/subprojects/importer/importer.cc

@@ -21 +21 @@
 
 #include "objModel.h"
+#include "md2Model.h"
 #include "primitive_model.h"
 #include <stdlib.h>
@@ -40 +41 @@
 
   if (argc>=3)
-    obj = new OBJModel (argv[1], atof(argv[2]));
+  {
+    if( strstr(argv[1], ".obj") != NULL)
+      obj = new OBJModel (argv[1], atof(argv[2]));
+    else if( strstr(argv[1], ".md2") != NULL)
+      obj = new MD2Model(argv[1], argv[2]);
+  }
   else if (argc>=2)
-    obj = new OBJModel(argv[1]);
+  {
+    if( strstr(argv[1], ".obj") != NULL)
+      obj = new OBJModel(argv[1]);
+    else if( strstr(argv[1], ".md2") != NULL)
+      obj = new MD2Model(argv[1], "fake_texture.bad");
+  }
   else
     obj = new PrimitiveModel(PRIM_CYLINDER);