Changeset 4246 in orxonox.OLD for orxonox

Timestamp:

May 21, 2005, 11:24:31 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: md2_sloppy data-dir-fix

Location:

orxonox/trunk/src

Files:

• lib/graphics/importer/md2Model.cc (modified) (2 diffs)
• world_entities/test_entity.cc (modified) (1 diff)

orxonox/trunk/src/lib/graphics/importer/md2Model.cc

@@ -17 +17 @@
 #include "md2Model.h"
 #include "material.h"
+
+#include "resource_manager.h"
 
 #include <fstream>
@@ -81 +83 @@
   MD2Loader* md2loader = new MD2Loader();
   this->model = new t3DModel;
-  md2loader->importMD2(this->model, "../data/models/tris.md2");
+  md2loader->importMD2(this->model, ResourceManager::getFullName("models/tris.md2"));
   delete md2loader;
 }

orxonox/trunk/src/world_entities/test_entity.cc

@@ -31 +31 @@
 
   this->md2Model2 = new MD2Model2();
-  this->md2Model2->loadModel("../data/models/tris.md2");
-  this->md2Model2->loadSkin("../data/models/tris.pcx");
+  this->md2Model2->loadModel(ResourceManager::getFullName("models/tris.md2"));
+  this->md2Model2->loadSkin(ResourceManager::getFullName("../data/models/tris.pcx"));
 
   this->md2Model2->debug();