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

Timestamp:

Dec 20, 2005, 3:24:14 PM (19 years ago)

Author:

patrick

Message:

christmas: the texture gets loaded now and is loadable

File:

• branches/christmas_branche/src/subprojects/importer/importer.cc (modified) (2 diffs)

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

@@ -45 +45 @@
       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)
@@ -51 +54 @@
     if( strstr(argv[1], ".obj") != NULL)
       obj = new OBJModel(argv[1]);
-    else if( strstr(argv[1], ".md2") != NULL)
+    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