Changeset 3399 in orxonox.OLD for orxonox/branches/nico/src/camera.h

Timestamp:

Feb 6, 2005, 11:27:25 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/nico: merged trunk into branches/nico
merged with command:
svn merge ../trunk/ nico/ -r 3238:HEAD
resolved conflict in favor of branches/nico.

Location:

orxonox/branches/nico

Files:

• . (modified) (1 prop)
• src/camera.h (modified) (4 diffs)

orxonox/branches/nico/src/camera.h

@@ -8 +8 @@
 
 #include "stdincl.h"
+#include "world_entity.h"
 
-class WorldEntity;
+
 class World;
 
@@ -23 +24 @@
 enum CAMERA_MODE {NORMAL, SMOTH_FOLLOW, STICKY, ELLIPTICAL};
 
-class Camera {
+class Camera : public WorldEntity {
  private:
   WorldEntity* bound;           //!< the WorldEntity the Camera is bound to
-  Placement actualPlace;                //!< the Camera's current position
-  Placement desiredPlace;        //!< where the Camera should be according to calculations
   World* world;
   
@@ -37 +36 @@
   
   /* elliptical camera mode variables */
-  Placement plLastBPlace;
   float cameraOffset;
   float cameraOffsetZ;
@@ -63 +61 @@
   void apply ();
   void bind (WorldEntity* entity);
-  void jump (Placement* plc);
   void destroy();