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

Timestamp:

Oct 11, 2004, 12:53:43 AM (21 years ago)

Author:

patrick

Message:

orxonox/trunk: minor changes - enhanced sc controll, fixed uncontrolled rotation effect, added some debug outputs for testing purposes, reformatted some src files from win style but not all

File:

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

orxonox/trunk/src/player.cc

@@ -28 +28 @@
 
 Player::~Player () 
+
 {
 }
@@ -33 +34 @@
 void Player::post_spawn ()
 {
-        travel_speed = 10.0;
+        travel_speed = 15.0;
         velocity = Vector();
         bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
@@ -71 +72 @@
 void Player::draw ()
 {
-        glMatrixMode(GL_MODELVIEW);
-        glLoadIdentity();
-        float matrix[4][4];
-
-        glTranslatef(get_placement()->r.x,get_placement()->r.y,get_placement()->r.z);
+  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,0,0);
-        glVertex3f(0,0,0.5);
-        glColor3f(0,1,0);
-        glVertex3f(-0.5,0,-1);
-        glColor3f(0,0,1);
-        glVertex3f(0.5,0,-1);
-        glEnd();
-        
-        printf("Player@%f/%f/%f\n", get_placement()->r.x, get_placement()->r.y, get_placement()->r.z);
+  
+  glBegin(GL_TRIANGLES);
+  glColor3f(1,1,1);
+  glVertex3f(0,0,0.5);
+  glVertex3f(-0.5,0,-1);
+  glVertex3f(0.5,0,-1);
+
+  glVertex3f(0,0,0.5);
+  glVertex3f(0,0.5,-1);
+  glVertex3f(0,-0.5,-1);
+  glEnd();
+    
+  glBegin(GL_QUADS);
+  glColor3f(0,0,1);
+  glVertex3f(0.5,0.5,-1);
+  glVertex3f(0.5,-0.5,-1);
+  glVertex3f(-0.5,-0.5,-1);
+  glVertex3f(-0.5,0.5,-1);
+  glEnd();
+  
+  //printf("Player@%f/%f/%f\n", get_placement()->r.x, get_placement()->r.y, get_placement()->r.z);
 }
 
@@ -103 +114 @@
 void Player::move (float time)
 {
-        float xAccel, yAccel, zAccel;
-        xAccel = yAccel = zAccel = 0;
-        if( bUp) xAccel += acceleration;
-        if( bDown) xAccel -= acceleration;
-        if( bLeft) yAccel += acceleration;
-        if( bRight) yAccel -= acceleration;
-        if( bAscend) zAccel += acceleration;
-        if( bDescend) zAccel -= acceleration;
-        
-        Vector accel( xAccel, yAccel, zAccel);
-        
-        Location* l = get_location();
-        
-        // r(t) = r(0) + v(0)*t + 1/2*a*t^2
-        // r = position
-        // v = velocity
-        // a = acceleration
-        
-        l->pos = l->pos + velocity*time + (accel*(0.5*time*time));
-        l->dist += travel_speed * time;
-        
-        velocity = velocity + (accel * time);
-        printf("Player|velocity %f/%f/%f\n", velocity.x, velocity.y, velocity.z);
+  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();
+  /* 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);
+
+  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( bAscend ) { /* not yet implemented but just: (0,0,1)*acceleration */}
+  if( bDescend) {/* FIXME */}
+
+  Location* l = get_location();
+  
+  // r(t) = r(0) + v(0)*t + 1/2*a*t^2
+  // r = position
+  // v = velocity
+  // a = acceleration
+
+  /* this the base-speed of the player: determines how fast and how the player follows the track*/
+  l->dist = l->dist + travel_speed * time;
+
+  /* this updates the player position on the track - user interaction */
+  l->pos = l->pos + accel*time;
 }