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

Timestamp:

Jan 7, 2006, 11:17:51 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the spaceshipcontrol branche back to the trunk

merged with command
svn merge ​https://svn.orxonox.net/orxonox/branches/spaceshipcontrol . -r6224:HEAD
small conflict in space_ship.cc fixed in favor of the control

File:

• trunk/src/world_entities/camera.cc (modified) (1 diff)

trunk/src/world_entities/camera.cc

@@ -199 +199 @@
   Vector up = this->getAbsDirV();
   Vector delay = Vector(0,0,0);
-  if( currentMode != VIEW_FRONT) delay = (this->target->getAbsDirX() * this->target->getSpeed())/30;
+  if( currentMode != VIEW_FRONT) delay = (this->target->getVelocity())/25;
 
   // Setting the Camera Eye, lookAt and up Vectors