Changeset 2860 in orxonox.OLD for orxonox/branches/dave/src/player.cc

Timestamp:

Nov 15, 2004, 11:13:21 PM (20 years ago)

Author:

dave

Message:

orxonox/branches/dave: das level hat jetzt form angenommen, stand:nach der Convention vom Samstag….

File:

• orxonox/branches/dave/src/player.cc (modified) (4 diffs)

orxonox/branches/dave/src/player.cc

@@ -25 +25 @@
 Player::Player(bool isFree) : WorldEntity(isFree)
 {
+
+  obj = new Object ("reaphigh.obj");
+  /*
   objectList = glGenLists(1);
   glNewList (objectList, GL_COMPILE);
@@ -48 +51 @@
   
   glEndList ();
-
+  */
 }
 
@@ -58 +61 @@
 void Player::post_spawn ()
 {
-        travel_speed = 15.0;
-        velocity = Vector();
-        bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
-        bFire = false;
-        acceleration = 10.0;
-        set_collision (new CollisionCluster (1.0, Vector(0,0,0)));
+  travel_speed = 15.0;
+  velocity = Vector();
+  bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
+  bFire = false;
+  acceleration = 10.0;
+  set_collision (new CollisionCluster (1.0, Vector(0,0,0)));
 }
 
@@ -104 +107 @@
   glMultMatrixf ((float*)matrix);
   
-  glCallList (objectList);
+  glMatrixMode (GL_MODELVIEW);
+  glRotatef (-90, 0,1,0);
+  obj->draw();
+  //  glCallList (objectList);
 
+  
   
   //printf("Player@%f/%f/%f\n", get_placement()->r.x, get_placement()->r.y, get_placement()->r.z);