Changeset 3238 in orxonox.OLD for orxonox/branches/sound/src/player.cc

Timestamp:

Dec 20, 2004, 2:42:54 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches: updated branches: buerli, nico, sound. And moved bezierTrack to old.bezierTrack. Conflicts resolved in a usefull order.
Conflics mostly resolved in favor of trunk
merge.

File:

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

orxonox/branches/sound/src/player.cc

@@ -25 +25 @@
 Player::Player(bool isFree) : WorldEntity(isFree)
 {
-}
 
-Player::~Player () 
+  this->obj = new Object("reaplow.obj");
+  /*
+  objectList = glGenLists(1);
+  glNewList (objectList, GL_COMPILE);
 
-{
-}
-
-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)));
-}
-
-void Player::tick (float time)
-{
-        // movement
-        move (time);
-}
-
-void Player::hit (WorldEntity* weapon, Vector loc)
-{
-}
-
-void Player::destroy ()
-{
-}
-
-void Player::collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags)
-{
-}
-
-void Player::command (Command* cmd)
-{
-  //printf("Player|recieved command [%s]\n", cmd->cmd);
-  if( !strcmp( cmd->cmd, "up")) bUp = !cmd->bUp;
-  else if( !strcmp( cmd->cmd, "down")) bDown = !cmd->bUp;
-  else if( !strcmp( cmd->cmd, "left")) bLeft = !cmd->bUp;
-  else if( !strcmp( cmd->cmd, "right")) bRight = !cmd->bUp;
-  else if( !strcmp( cmd->cmd, "fire")) bFire = !cmd->bUp;
-}
-
-void Player::draw ()
-{ 
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
-  float matrix[4][4];
-  
-  glTranslatef(get_placement()->r.x,get_placement()->r.y,get_placement()->r.z);
-  get_placement()->w.matrix (matrix);
-  glMultMatrixf ((float*)matrix);
-  
   glBegin(GL_TRIANGLES);
   glColor3f(1,1,1);
@@ -99 +50 @@
   glEnd();
   
-  //printf("Player@%f/%f/%f\n", get_placement()->r.x, get_placement()->r.y, get_placement()->r.z);
+  glEndList ();
+  */
 }
 
-void Player::get_lookat (Location* locbuf)
+Player::~Player()
 {
-        *locbuf = *get_location();
-        //locbuf->dist += 5.0;
+  delete this->obj;
 }
 
-void Player::left_world ()
+void Player::postSpawn()
+{
+  travelSpeed = 15.0;
+  velocity = Vector();
+  bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
+  bFire = false;
+  acceleration = 10.0;
+  setCollision(new CollisionCluster(1.0, Vector(0,0,0)));
+}
+
+void Player::tick(float time)
+{
+  // movement
+  move (time);
+}
+
+void Player::hit(WorldEntity* weapon, Vector loc)
 {
 }
 
-void Player::move (float time)
+void Player::destroy()
+{
+}
+
+void Player::collide(WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags)
+{
+}
+
+void Player::command(Command* cmd)
+{
+  //printf("Player|recieved command [%s]\n", cmd->cmd);
+  if( !strcmp( cmd->cmd, "up")) bUp = !cmd->bUp;
+  else if( !strcmp( cmd->cmd, "down")) bDown = !cmd->bUp;
+  else if( !strcmp( cmd->cmd, "left")) bLeft = !cmd->bUp;
+  else if( !strcmp( cmd->cmd, "right")) bRight = !cmd->bUp;
+  else if( !strcmp( cmd->cmd, "fire")) bFire = !cmd->bUp;
+}
+
+void Player::draw()
+{ 
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
+  float matrix[4][4];
+  
+  glTranslatef(getPlacement()->r.x, getPlacement()->r.y, getPlacement()->r.z);
+  getPlacement()->w.matrix (matrix);
+  glMultMatrixf((float*)matrix);
+  
+  glMatrixMode(GL_MODELVIEW);
+  glRotatef(-90, 0,1,0);
+  obj->draw();
+  // glCallList(objectList);
+
+  
+  
+}
+
+void Player::getLookat(Location* locbuf)
+{
+  *locbuf = *getLocation();
+  //locbuf->dist += 5.0;
+}
+
+void Player::leftWorld()
+{
+}
+
+void Player::move(float time)
 {
   Vector accel(0.0, 0.0, 0.0);
-  /* FIXME: calculating the direction and orthDirection every time_slice is redundant! save it somewhere */
-  Placement *pos = get_placement();
+  /* FIXME: calculating the direction and orthDirection every timeSlice is redundant! save it somewhere */
+  Placement *pos = getPlacement();
   /* calculate the direction in which the craft is heading  */
   Vector direction(0.0, 0.0, 1.0);
@@ -128 +142 @@
   if( bRight ) { accel = accel - (orthDirection*acceleration); }
   if( bAscend ) { /* not yet implemented but just: (0,0,1)*acceleration */}
-  if( bDescend) {/* FIXME */}
+  if( bDescend) {/* FIXME */} /* \todo up and down player movement */
 
-  Location* l = get_location();
+  Location* l = getLocation();
   
   // r(t) = r(0) + v(0)*t + 1/2*a*t^2
@@ -138 +152 @@
 
   /* this the base-speed of the player: determines how fast and how the player follows the track*/
-  l->dist = l->dist + travel_speed * time;
+  l->dist = l->dist + travelSpeed * time;
 
   /* this updates the player position on the track - user interaction */
   l->pos = l->pos + accel*time;
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-