Changeset 6027 in orxonox.OLD

Timestamp:

Dec 10, 2005, 10:16:37 PM (18 years ago)

Author:

snellen

Message:

space_ship.cc updated

Location:

branches/spaceshipcontrol/src

Files:

• lib/sound/sound_engine.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (6 diffs)

branches/spaceshipcontrol/src/lib/sound/sound_engine.cc

@@ -284 +284 @@
   ALubyte deviceName[] =
 #else
-  ALCchar deviceName[] =
+  ALCbyte deviceName[] =
 #endif
 

branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc

@@ -118 +118 @@
   xMouse = yMouse = 0;
   mouseSensitivity = 0.001;
-  
+
   cycle = 0.0;
-  
+
 
   travelSpeed = 15.0;
@@ -264 +264 @@
 void SpaceShip::tick (float time)
 {
-     cycle += time;
+
   // spaceship controlled movement
   this->calculateVelocity(time);
@@ -271 +271 @@
 
   //orient the spaceship model in the direction of movement.
-  
+  travelSpeed = velocity.len();
+  velocity += this->getAbsDirX();
+  velocity = (velocity.getNormalized())*travelSpeed;
+
   // this is the air friction (necessary for a smooth control)
   if(velocity.len() != 0) velocity -= velocity*0.01;
-  
+
+  //hoover effect
+  cycle += time;
   this->shiftCoor(Vector(0,1,0)*cos(this->cycle*2.0)*0.02);
-  
-  if (this->getAbsDirZ().y > 0.1) this->shiftDir(Quaternion(time*0.3, Vector(1,0,0)));
-  else if (this->getAbsDirZ().y < -0.1) this->shiftDir(Quaternion(-time*0.3, Vector(1,0,0)));
-  
+
+  //readjust
+ // if (this->getAbsDirZ().y > 0.1) this->shiftDir(Quaternion(time*0.3, Vector(1,0,0)));
+  //else if (this->getAbsDirZ().y < -0.1) this->shiftDir(Quaternion(-time*0.3, Vector(1,0,0)));
+
   //SDL_WarpMouse(GraphicsEngine::getInstance()->getResolutionX()/2, GraphicsEngine::getInstance()->getResolutionY()/2);
 
@@ -313 +319 @@
    }
 
-  if( this->bLeft /* > -this->getRelCoor().z*2*/)
+  if( this->bLeft/* > -this->getRelCoor().z*2*/)
   {
     this->shiftDir(Quaternion(time, Vector(0,1,0)));
@@ -330 +336 @@
     //rotVal += .4;
   }
-  
+
+
   if( this->bRollL /* > -this->getRelCoor().z*2*/)
   {
@@ -388 +395 @@
 void SpaceShip::process(const Event &event)
 {
-  
-  
+
+
   if( event.type == SDLK_a)
       this->bRollL = event.bPressed;