Changeset 6222 in orxonox.OLD for trunk/src/subprojects

Timestamp:

Dec 21, 2005, 1:49:06 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the christmas branche to the trunk
merged with command:
svn merge -r6165:HEAD christmas_branche/ ../trunk/
no conflicts

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/subprojects (modified) (1 prop)
• src/subprojects/collision_detection (modified) (1 prop)
• src/subprojects/importer (modified) (1 prop)
• src/subprojects/importer/Makefile.am (modified) (2 diffs)
• src/subprojects/importer/importer.cc (modified) (2 diffs)
• src/subprojects/network (modified) (1 prop)
• src/subprojects/particles (modified) (1 prop)
• src/subprojects/testmain (modified) (1 prop)

trunk/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 \

trunk/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]);
+      ((MD2Model*)obj)->tick(0.1f);
+    }
+  }
   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");
+      obj = new MD2Model(argv[1], argv[2]);
+      ((MD2Model*)obj)->tick(0.1f);
+    }
+  }
   else
     obj = new PrimitiveModel(PRIM_CYLINDER);