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

Timestamp:

Dec 20, 2004, 2:42:54 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches: updated branches: buerli, nico, sound. And moved bezierTrack to old.bezierTrack. Conflicts resolved in a usefull order.
Conflics mostly resolved in favor of trunk
merge.

File:

• orxonox/branches/nico/src/camera.h (modified) (5 diffs)

orxonox/branches/nico/src/camera.h

@@ -4 +4 @@
 */ 
 
-#ifndef CAMERA_H
-#define CAMERA_H
+#ifndef _CAMERA_H
+#define _CAMERA_H
 
 #include "stdincl.h"
@@ -26 +26 @@
  private:
   WorldEntity* bound;           //!< the WorldEntity the Camera is bound to
-  Placement actual_place;               //!< the Camera's current position
-  Placement desired_place;        //!< where the Camera should be according to calculations
+  Placement actualPlace;                //!< the Camera's current position
+  Placement desiredPlace;        //!< where the Camera should be according to calculations
   World* world;
   
@@ -54 +54 @@
   CAMERA_MODE cameraMode; //!< saves the camera mode: how the camera follows the entity
   
-  void update_desired_place ();
+  void updateDesiredPlace ();
   
  public:
@@ -60 +60 @@
   ~Camera ();
   
-  void time_slice (Uint32 deltaT);
+  void timeSlice (Uint32 deltaT);
   void apply ();
   void bind (WorldEntity* entity);
   void jump (Placement* plc);
+  void destroy();
 
   void setWorld(World* world);  
@@ -69 +70 @@
 };
 
-#endif
+#endif /* _CAMERA_H */