Changeset 6034 in orxonox.OLD

Timestamp:

Dec 10, 2005, 11:41:18 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the spaceshipcontroll branche back to the trunk
merged with command
svn merge branche/spaceshipcontroll trunk -r5978:HEAD
confilcs:
space_ship.cc: favor of controll, but Draw from trunk
rest: space_ship.h and sound_engine. in favor of the spaceshipcontroll branche

Location:

trunk/src

Files:

• story_entities/world.cc (modified) (1 diff)
• world_entities/camera.cc (modified) (4 diffs)
• world_entities/camera.h (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (8 diffs)
• world_entities/space_ships/space_ship.h (modified) (2 diffs)

trunk/src/story_entities/world.cc

@@ -415 +415 @@
   }
 
-  this->music = NULL;//(OggPlayer*)ResourceManager::getInstance()->load("sound/00-luke_grey_-_hypermode.ogg", OGG, RP_LEVEL);
+  this->music = NULL;
+  //(OggPlayer*)ResourceManager::getInstance()->load("sound/00-luke_grey_-_hypermode.ogg", OGG, RP_LEVEL);
   //music->playback();
 }

trunk/src/world_entities/camera.cc

@@ -1 @@
-
-
 /*
    orxonox - the future of 3D-vertical-scrollers
@@ -115 +113 @@
 void Camera::setViewMode(ViewMode mode)
 {
+  currentMode = mode;
   switch (mode)
     {
@@ -180 +179 @@
 {
   float tmpFovy = (this->toFovy - this->fovy) ;
-  if (tmpFovy > .01)
+  if (tmpFovy > 0.01)
     this->fovy += tmpFovy * fabsf(dt);
 }
@@ -207 +206 @@
   Vector targetPosition = this->target->getAbsCoor();
   Vector up = this->getAbsDirV();
+  Vector delay = Vector(0,0,0);
+  if( currentMode != VIEW_FRONT) delay = (this->target->getAbsDirX() * this->target->getSpeed())/30;
 
   // Setting the Camera Eye, lookAt and up Vectors
-  gluLookAt(cameraPosition.x, cameraPosition.y, cameraPosition.z,
+  gluLookAt(cameraPosition.x - delay.x, cameraPosition.y - delay.y, cameraPosition.z - delay.z,
             targetPosition.x, targetPosition.y, targetPosition.z,
             up.x, up.y, up.z);

trunk/src/world_entities/camera.h

@@ -58 +58 @@
 
   float             toFovy;          //!< The fovy-mode to iterate to.
+  ViewMode          currentMode;     //!< The ViewMode the camera is in
 };
 

trunk/src/world_entities/space_ships/space_ship.cc

@@ -11 +11 @@
 ### File Specific:
    main-programmer: Benjamin Knecht
-   co-programmer: ...
+   co-programmer: Silvan Nellen
 
 */
@@ -20 +20 @@
 #include "space_ship.h"
 
+#include "objModel.h"
 #include "resource_manager.h"
 
@@ -111 +112 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
-  EventHandler::getInstance()->grabEvents(false);
+  EventHandler::getInstance()->grabEvents(true);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;
@@ -117 +118 @@
   xMouse = yMouse = 0;
   mouseSensitivity = 0.001;
+  airViscosity = 1.0;
 
   cycle = 0.0;
@@ -253 +255 @@
 void SpaceShip::tick (float time)
 {
-     cycle += time;
+
   // spaceship controlled movement
   this->calculateVelocity(time);
@@ -259 +261 @@
   Vector move = (velocity)*time;
 
-  //orient the spaceship model in the direction of movement.
+  //orient the velocity in the direction of the spaceship.
+  travelSpeed = velocity.len();
+  velocity += ((this->getAbsDirX())*travelSpeed-velocity)*airViscosity;
+  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);
+
+  //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);
@@ -299 +310 @@
    }
 
-  if( this->bLeft /* > -this->getRelCoor().z*2*/)
+  if( this->bLeft/* > -this->getRelCoor().z*2*/)
   {
     this->shiftDir(Quaternion(time, Vector(0,1,0)));
@@ -316 +327 @@
     //rotVal += .4;
   }
+
 
   if( this->bRollL /* > -this->getRelCoor().z*2*/)

trunk/src/world_entities/space_ships/space_ship.h

@@ -1 @@
-
 /*!
  * @file space_ship.h
@@ -69 +68 @@
     float                 acceleration;       //!< the acceleration of the player.
 
+    float                 airViscosity;
+
 };