Changeset 3226 in orxonox.OLD for orxonox/trunk/src/player.cc

Timestamp:

Dec 20, 2004, 12:27:51 AM (21 years ago)

Author:

bensch

Message:

orxonox/trunk: world fixed (still unstable)

File:

• orxonox/trunk/src/player.cc (modified) (9 diffs)

orxonox/trunk/src/player.cc

@@ -26 +26 @@
 {
 
-  this->obj = new Object ("reaplow.obj");
+  this->obj = new Object("reaplow.obj");
   /*
   objectList = glGenLists(1);
@@ -54 +54 @@
 }
 
-Player::~Player () 
+Player::~Player()
 {
   delete this->obj;
 }
 
-void Player::post_spawn ()
+void Player::postSpawn()
 {
   travel_speed = 15.0;
@@ -66 +66 @@
   bFire = false;
   acceleration = 10.0;
-  set_collision (new CollisionCluster (1.0, Vector(0,0,0)));
+  setSollision(new CollisionCluster(1.0, Vector(0,0,0)));
 }
 
-void Player::tick (float time)
+void Player::tick(float time)
 {
   // movement
@@ -75 +75 @@
 }
 
-void Player::hit (WorldEntity* weapon, Vector loc)
+void Player::hit(WorldEntity* weapon, Vector loc)
 {
 }
 
-void Player::destroy ()
+void Player::destroy()
 {
 }
 
-void Player::collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags)
+void Player::collide(WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags)
 {
 }
 
-void Player::command (Command* cmd)
+void Player::command(Command* cmd)
 {
   //printf("Player|recieved command [%s]\n", cmd->cmd);
@@ -97 +97 @@
 }
 
-void Player::draw ()
+void Player::draw()
 { 
   glMatrixMode(GL_MODELVIEW);
@@ -103 +103 @@
   float matrix[4][4];
   
-  glTranslatef(get_placement()->r.x,get_placement()->r.y,get_placement()->r.z);
+  glTranslatef(get_placement()->r.x, get_placement()->r.y, get_placement()->r.z);
   get_placement()->w.matrix (matrix);
-  glMultMatrixf ((float*)matrix);
+  glMultMatrixf((float*)matrix);
   
-  glMatrixMode (GL_MODELVIEW);
-  glRotatef (-90, 0,1,0);
+  glMatrixMode(GL_MODELVIEW);
+  glRotatef(-90, 0,1,0);
   obj->draw();
-  // glCallList (objectList);
+  // glCallList(objectList);
 
   
@@ -117 +117 @@
 }
 
-void Player::get_lookat (Location* locbuf)
+void Player::getLookat(Location* locbuf)
 {
   *locbuf = *get_location();
@@ -123 +123 @@
 }
 
-void Player::left_world ()
+void Player::leftWorld()
 {
 }
 
-void Player::move (float time)
+void Player::move(float time)
 {
   Vector accel(0.0, 0.0, 0.0);
@@ -158 +158 @@
   l->pos = l->pos + accel*time;
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-