Changeset 3430 in orxonox.OLD for orxonox/branches/trackManager/src/environment.cc

Timestamp:

Mar 1, 2005, 9:50:30 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/trackManager: merged trunk back to trackManager
merged with command
svn merge -r 3369:HEAD trunk/ branches/trackManager
resoloved conflicts in favor of the trunk.

Location:

orxonox/branches/trackManager

Files:

• . (modified) (1 prop)
• src/environment.cc (modified) (2 diffs)

orxonox/branches/trackManager/src/environment.cc

@@ -21 +21 @@
 #include "world_entity.h"
 #include "vector.h"
-#include "importer/model.h"
+#include "importer/objModel.h"
 
 using namespace std;
@@ -29 +29 @@
 Environment::Environment () : WorldEntity()
 {
-  this->model = new Model("fighter.obj", .3);
+  this->model = new OBJModel("../data/models/fighter.obj");
 }