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

Timestamp:

Jan 7, 2005, 1:14:33 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/parenting back to the.
merged with command:
svn merge branches/parenting trunk -r 3247:HEAD
resolved all conflicts in favor of parenting.

File:

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

orxonox/trunk/src/player.cc

@@ -19 +19 @@
 #include "stdincl.h"
 #include "collision.h"
+#include "importer/model.h"
 
 using namespace std;
@@ -26 +27 @@
 {
 
-  this->obj = new Object("reaplow.obj");
+  this->model = new Model("reaplow.obj");
   /*
   objectList = glGenLists(1);
@@ -54 +55 @@
 }
 
-Player::~Player()
+Player::~Player ()
 {
-  delete this->obj;
+  delete this->model;
 }
 
-void Player::postSpawn()
+void Player::postSpawn ()
 {
   travelSpeed = 15.0;
@@ -69 +70 @@
 }
 
-void Player::tick(float time)
+void Player::tick (float time)
 {
   // movement
-  move (time);
+  this->move (time);
 }
 
-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 +98 @@
 }
 
-void Player::draw()
+void Player::draw ()
 { 
   glMatrixMode(GL_MODELVIEW);
@@ -103 +104 @@
   float matrix[4][4];
   
-  glTranslatef(getPlacement()->r.x, getPlacement()->r.y, getPlacement()->r.z);
-  getPlacement()->w.matrix (matrix);
+  glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
+  //rotate
+  this->getAbsDir ().matrix (matrix);
   glMultMatrixf((float*)matrix);
   
   glMatrixMode(GL_MODELVIEW);
-  glRotatef(-90, 0,1,0);
-  obj->draw();
+  this->model->draw();
   // glCallList(objectList);
-
-  
-  
 }
 
+
+/*PN
 void Player::getLookat(Location* locbuf)
 {
@@ -121 +121 @@
   //locbuf->dist += 5.0;
 }
+*/
 
-void Player::leftWorld()
+void Player::leftWorld ()
 {
 }
 
-void Player::move(float time)
+void Player::move (float time)
 {
   Vector accel(0.0, 0.0, 0.0);
   /* FIXME: calculating the direction and orthDirection every timeSlice is redundant! save it somewhere */
-  Placement *pos = getPlacement();
+  //Placement *pos = getPlacement();
+  
   /* calculate the direction in which the craft is heading  */
-  Vector direction(0.0, 0.0, 1.0);
-  direction = pos->w.apply(direction);
-  Vector orthDirection(0.0, 0.0, 1.0);
-  orthDirection = orthDirection.cross(direction);
+  Vector direction (1.0, 0.0, 0.0);
+  //direction = this->absDirection.apply (direction);
+  Vector orthDirection (0.0, 0.0, 1.0);
+  //orthDirection = orthDirection.cross (direction);
 
   if( bUp) { accel = accel+(direction*acceleration); }
   if( bDown) { accel = accel-(direction*acceleration); }
-  if( bLeft ) { accel = accel + (orthDirection*acceleration); }
-  if( bRight ) { accel = accel - (orthDirection*acceleration); }
+  if( bLeft ) { accel = accel - (orthDirection*acceleration); }
+  if( bRight ) { accel = accel + (orthDirection*acceleration); }
   if( bAscend ) { /* not yet implemented but just: (0,0,1)*acceleration */}
   if( bDescend) {/* FIXME */} /* \todo up and down player movement */
 
-  Location* l = getLocation();
+  //Location* l = getLocation();
   
   // r(t) = r(0) + v(0)*t + 1/2*a*t^2
@@ -152 +154 @@
 
   /* this the base-speed of the player: determines how fast and how the player follows the track*/
-  l->dist = l->dist + travelSpeed * time;
-
+  //l->dist = l->dist + travelSpeed * time;
+  
+  Vector* shift = new Vector (this->travelSpeed * time, 0, 0);
+  this->shiftCoor (shift);
+  
   /* this updates the player position on the track - user interaction */
-  l->pos = l->pos + accel*time;
+  //l->pos = l->pos + accel*time;
+  Vector move = accel * time;
+  this->shiftCoor (&move);
 }