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

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.h (modified) (1 diff)

trunk/src/world_entities/camera.h

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