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

Timestamp:

Mar 1, 2005, 9:50:30 AM (19 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/player.cc (modified) (3 diffs)

orxonox/branches/trackManager/src/player.cc

@@ -19 +19 @@
 #include "stdincl.h"
 #include "collision.h"
-#include "importer/model.h"
+#include "importer/objModel.h"
 
 using namespace std;
@@ -27 +27 @@
 {
 
-  this->model = new Model("reaplow.obj");
+  this->model = new OBJModel("../data/models/reaplow.obj");
   /*
   objectList = glGenLists(1);
@@ -104 +104 @@
   float matrix[4][4];
   
-  glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
-  //rotate
+  /* translate */
+  glTranslatef (this->getAbsCoor ().x, 
+                this->getAbsCoor ().y, 
+                this->getAbsCoor ().z);
+  /* rotate */
   this->getAbsDir ().matrix (matrix);
   glMultMatrixf((float*)matrix);