Changeset 3698 in orxonox.OLD for orxonox/branches/shadows/src/player.cc

Timestamp:

Mar 31, 2005, 9:04:45 PM (19 years ago)

Author:

dave

Message:

branches/shadows: so jetzt ist die Ausgangslage geschaffen

File:

• orxonox/branches/shadows/src/player.cc (modified) (6 diffs)

orxonox/branches/shadows/src/player.cc

@@ -66 +66 @@
   bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
   bFire = false;
-  acceleration = 10.0;
+  acceleration = 20.0;
   setCollision(new CollisionCluster(1.0, Vector(0,0,0)));
 }
@@ -103 +103 @@
   glLoadIdentity();
   float matrix[4][4];
-  
+  //glRotatef(90.0f,1.0f,0.0f,0.0f); 
   /* translate */
   glTranslatef (this->getAbsCoor ().x, 
@@ -111 +111 @@
   this->getAbsDir ().matrix (matrix);
   glMultMatrixf((float*)matrix);
-  
+  glRotatef(angle,1.0f,0.0f,0.0f);
   glMatrixMode(GL_MODELVIEW);
   this->model->draw();
@@ -132 +132 @@
 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();
@@ -138 +140 @@
   /* calculate the direction in which the craft is heading  */
   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( bUp) { accel = accel+(direction*acceleration);accelSlipDirection=accel; }
+  if( bDown) { accel = accel-(direction*acceleration);accelSlipDirection=accel; }
+  if( bLeft ) {if(angle<0) {accel = accel-(orthDirection*acceleration);}rotate(time);accelSlip=accel; }
+  if( bRight ) { if(angle>0){accel = accel+(orthDirection*acceleration);}rotate(time);accelSlip=accel;}
   if( bAscend ) { /* not yet implemented but just: (0,0,1)*acceleration */}
   if( bDescend) {/* FIXME */} /* \todo up and down player movement */
+  if((int)angle!=0&&!bLeft&&!bRight){backRotate(time);accelSlip=accelSlip-slip(time,accelSlip);}
+  if(!bUp&&!bDown){accelSlipDirection=accelSlipDirection-slip(time,accelSlipDirection);}
 
   //Location* l = getLocation();
@@ -159 +167 @@
   //l->dist = l->dist + travelSpeed * time;
   
-  Vector* shift = new Vector (this->travelSpeed * time, 0, 0);
-  this->shiftCoor (shift);
+  //Vector* shift = new Vector (this->travelSpeed * time, 0, 0);
+  Vector shift(this->travelSpeed*time,0,0);
+  
+  this->shiftCoor (&shift);
   
   /* this updates the player position on the track - user interaction */
   //l->pos = l->pos + accel*time;
+  
   Vector move = accel * time;
   this->shiftCoor (&move);
-}
+  
+}
+void Player::rotate(float time){
+    if(bLeft&&angle>-40.0f){
+        angle=angle-time*200.0f;
+                
+    }
+    if(bRight&&angle<40.0f){
+        angle=angle+time*200.0f;
+                
+    }
+}
+
+void Player::backRotate(float time){
+    if(angle<0){
+    angle=angle+3.0f*(exp(angle*.0015f*time));
+    
+    
+    }
+    if(angle>0){
+    angle=angle-3.0f*(exp(-angle*.0015f*time));
+    
+    
+    }
+
+}
+//When the sidewords movement is finished, the ship will still slip untill it stands still
+Vector Player::slip(float time,Vector accel){
+        Vector move= accel*time;
+        this->shiftCoor(&move);
+        return accel*time*3.0f;
+    
+}
+
+
+
+
+