Changeset 3172 in orxonox.OLD for orxonox/branches/dave/src/player.cc

Timestamp:

Dec 14, 2004, 11:36:07 PM (21 years ago)

Author:

bensch

Message:

orxonox/branches/dave: (commit from dave) now the fighter banks while moving. really cool stuff

File:

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

orxonox/branches/dave/src/player.cc

@@ -29 +29 @@
   obj = new Object ("reaplow.obj");
   tottime=0.0f;
+  movfinishright=movfinishleft=movfinishup=movfinishdown=false;
+  angleturn=false;
  
   /*
@@ -93 +95 @@
 {
   //printf("Player|recieved command [%s]\n", cmd->cmd);
+ 
   tottime=cmd->tottime;
+  rottime=cmd->rottime;
+  angleturn=cmd->angleturn;
+  
+  
   if( !strcmp( cmd->cmd, "up")) bUp = !cmd->bUp;
   else if( !strcmp( cmd->cmd, "down")) bDown = !cmd->bUp;
@@ -106 +113 @@
   glLoadIdentity();
   float matrix[4][4];
-  
+  float a[3];
+  a[0]=.8f;
+  a[1]=.8f;
+  a[2]=.8f;
+  glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
   glTranslatef(get_placement()->r.x,get_placement()->r.y,get_placement()->r.z);
   get_placement()->w.matrix (matrix);
   glMultMatrixf ((float*)matrix);
-  
+ 
   glMatrixMode (GL_MODELVIEW);
+  glRotatef (angle,0,0,1);
   glRotatef (-90, 0,1,0);
+  
   obj->draw();
   //  glCallList (objectList);
@@ -141 +154 @@
   Vector orthDirection(0.0, 0.0, 1.0);
   orthDirection = orthDirection.cross(direction);
+  
+  if(rottime<1.0f)
+          rottime=rottime+2.5f*time;
+  else
+          rottime=1.0f;
   if(tottime<1.5f)
           tottime=tottime+4.0f*time;
   else
           tottime=1.5f;
-  if( bUp) { accel = accel+(direction*acceleration*pow(tottime,2.0f)); }
-  if( bDown) { accel = accel-(direction*acceleration*pow(tottime,2.0f)); }
-  if( bLeft ) { accel = accel + (orthDirection*acceleration*pow(tottime,2.0f)); }
-  if( bRight ) { accel = accel - (orthDirection*acceleration*pow(tottime,2.0f));}
+  
+  //Langsam zurückdrehen    ->anlgeturn ist für das Zurückdrehen verantwortlich!
+  if((angleturn||bLeft&&bRight)&&angle<=0.0f){
+          if(!bLeft)
+          angle=angle+rottime*10.0f;
+          if(angle>0.0f){
+                  
+                  angleturn=false;
+                  angle=0.0f;}
+          }
+  
+  if((angleturn||bLeft&&bRight)&&angle>=0.0f){
+          if(!bRight)
+          angle=angle-rottime*10.0f;
+          if(angle<0.0f){
+                  angleturn=false;
+                  angle=0.0f;}
+                }
+  //Bewegung lansam abbremsen    **************
+  if(movfinishleft&&!bLeft){
+          accel=accel+(orthDirection*acceleration*(tottimecopy-pow(tottime,1.5f)+.5f));
+          if(tottime>tottimecopy)
+                  movfinishleft=false;
+  }
+  if(movfinishright&&!bRight){
+        accel=accel-(orthDirection*acceleration*(tottimecopy-pow(tottime,1.5f)+.5f));
+        if(tottime>tottimecopy)
+                movfinishright=false;
+  }
+  if(movfinishup&&!bUp){
+        accel=accel+(direction*acceleration*(tottimecopy-pow(tottime,1.5f)+.5f));
+        if(tottime>tottimecopy)
+                movfinishup=false;
+  }
+  
+  if(movfinishdown&&!bDown){
+        accel=accel-(direction*acceleration*(tottimecopy-pow(tottime,1.5f)+.5f));
+        if(tottime>tottimecopy)
+                movfinishdown=false;
+  }  
+  //                            **************
+  
+  if( bUp) { accel = accel+(direction*acceleration*pow(tottime,2.0f));movfinishup=true;tottimecopy=tottime;}
+  if( bDown) { accel = accel-(direction*acceleration*pow(tottime,2.0f));movfinishdown=true;tottimecopy=tottime; }
+  if( bLeft ) { accel = accel + (orthDirection*acceleration*pow(tottime,2.0f));
+        if(angle>-40.0f){
+          angle=angle-rottime*40.0f;}
+        movfinishleft=true;
+        tottimecopy=tottime;}
+  if( bRight ) { accel = accel - (orthDirection*acceleration*pow(tottime,2.0f));
+        if(angle<40.0f){
+          angle=angle+rottime*40.0f;}
+          movfinishright=true;
+          tottimecopy=tottime;
+  }
   if( bAscend ) { /* not yet implemented but just: (0,0,1)*acceleration */}
   if( bDescend) {/* FIXME */}