Changeset 6034 in orxonox.OLD for trunk/src/world_entities/camera.cc

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

File:

• trunk/src/world_entities/camera.cc (modified) (4 diffs)

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);