Changeset 6001 in orxonox.OLD

Timestamp:

Dec 9, 2005, 5:25:33 PM (18 years ago)

Author:

bknecht

Message:

changes on camera so it is now dynamic

Location:

branches/spaceshipcontrol/src

Files:

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

branches/spaceshipcontrol/src/story_entities/world.cc

@@ -412 +412 @@
   }
 
-  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();
 }

branches/spaceshipcontrol/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);

branches/spaceshipcontrol/src/world_entities/camera.h

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