Changeset 3279 in orxonox.OLD for orxonox/branches/old.dave

Timestamp:

Dec 25, 2004, 3:03:04 PM (19 years ago)

Author:

dave

Message:

branches/old.dave: Die Neigung des Raumschiffes ist jetzt nicht mehr so stark, und jetzt kann man auch 2 Tasten aufs mal drücken, ohne dass das Raumschiffsche jedes mal anhält:)

Location:

orxonox/branches/old.dave/src

Files:

• camera.cc (modified) (1 diff)
• command_node.cc (modified) (2 diffs)
• message_structures.h (modified) (1 diff)
• orxonox.cc (modified) (1 diff)
• player.cc (modified) (3 diffs)
• player.h (modified) (1 diff)
• track.cc (modified) (1 diff)
• world.cc (modified) (2 diffs)

orxonox/branches/old.dave/src/camera.cc

@@ -206 +206 @@
   // view
   // TO DO: implement options for frustum generation
-  glFrustum(-1.0, 1.0, -1.0, 1.0, 1.5, 250.0);
+  glFrustum(-1.0, 1.0, -1.0, 1.0, 1.5, 400.0);
   //Vector up(0,0,1);
   //Vector dir(1,0,0);

orxonox/branches/old.dave/src/command_node.cc

@@ -183 +183 @@
           strcpy (cmd.cmd, aliases->keys[event.key.keysym.sym]);
           cmd.bUp = false;
-         
+          cmd.NumPressed+=1;
           
           if( strlen (cmd.cmd) > 0) relay (&cmd);
@@ -190 +190 @@
           strcpy( cmd.cmd, aliases->keys[event.key.keysym.sym]);
           cmd.bUp = true;
+          cmd.NumPressed-=1;
           
          

orxonox/branches/old.dave/src/message_structures.h

@@ -11 +11 @@
 //! structure that contains a command message
 typedef struct
-{       float tottime;
+{       int NumPressed;
+        float tottime;
         float rottime;
         float angle;

orxonox/branches/old.dave/src/orxonox.cc

@@ -135 +135 @@
   SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
   
-  int bpp = 16;
-  int width = 640;
-  int height = 480;
+  int bpp = 32;
+  int width = 1024;
+  int height = 768;
   Uint32 flags = SDL_HWSURFACE | SDL_OPENGL | SDL_GL_DOUBLEBUFFER;
   

orxonox/branches/old.dave/src/player.cc

@@ -28 +28 @@
 
   obj = new Object ("reaplow.obj");
+  numPressed=0;
   tottime=0.0f;
+  numPressed=0;
   movfinishright=movfinishleft=movfinishup=movfinishdown=false;
   angleturn=false;
@@ -95 +97 @@
 {
   //printf("Player|recieved command [%s]\n", cmd->cmd);
- 
-  tottime=cmd->tottime;
+  numPressed=cmd->NumPressed;
+  
   rottime=cmd->rottime;
-  angleturn=cmd->angleturn;
+  if(numPressed<1){
+        tottime=cmd->tottime;
+        angleturn=cmd->angleturn;
+  }
+  
   
   
@@ -208 +214 @@
   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;}
+        if(angle>-20.0f){
+          angle=angle-rottime*20.0f;}
         movfinishleft=true;
         tottimecopy=tottime;}
   if( bRight ) { accel = accel - (orthDirection*acceleration*pow(tottime,2.0f));
-        if(angle<40.0f){
-          angle=angle+rottime*40.0f;}
+        if(angle<20.0f){
+          angle=angle+rottime*20.0f;}
           movfinishright=true;
           tottimecopy=tottime;

orxonox/branches/old.dave/src/player.h

@@ -44 +44 @@
   float rottime;
   float angle;
+  int numPressed;
   bool angleturn;
   bool movfinishright,movfinishleft,movfinishup,movfinishdown;

orxonox/branches/old.dave/src/track.cc

@@ -76 +76 @@
   //    camplc->w = Quaternion (trace.a, Vector(0,0,1));
   float r = (lookat->dist)*PI / l;
-  camplc->r = trace.r + (trace.a * ((lookat->dist-10.0) / l)) + Vector(0,0,5.0);
+  camplc->r = trace.r + (trace.a * ((lookat->dist-18.0) / l)) + Vector(0,0,12.0);
   
   Vector w(0.0,0.0,0.0);

orxonox/branches/old.dave/src/world.cc

@@ -343 +343 @@
       
     }
-  */  
+    
   //draw track
   glBegin(GL_LINES);
@@ -352 +352 @@
       glVertex3f(pathnodes[(i+1)%tracklen].x,pathnodes[(i+1)%tracklen].y,pathnodes[(i+1)%tracklen].z);
     }
-  glEnd();
+  glEnd();*/
   glEndList();
+  
 }