Changeset 10379 in orxonox.OLD for trunk/src/util/state.h

Timestamp:

Jan 26, 2007, 10:58:31 AM (18 years ago)

Author:

patrick

Message:

merged branche camera to trunk. resolved many conflicts as in the other projects too

File:

• trunk/src/util/state.h (modified) (3 diffs)

trunk/src/util/state.h

@@ -18 +18 @@
 class ObjectManager;
 class GameRules;
-
+class CameraMan;
 class ScriptManager;
 
@@ -42 +42 @@
   /** @returns a Pointer to the CameraTarget */
   static inline PNode* getCameraTargetNode() { return State::cameraTargetNode; };
+
+
+
+  /////////////////////
+  /// CAMERAMANAGER ///
+  /////////////////////
+  /** @param CameraMan the PNode to the cameraManagerager,*/
+  static void setCameraman(CameraMan*);
+  static inline CameraMan* getCameraman() { return State::cameraManager; };
+
 
   ////////////////
@@ -123 +133 @@
   static Camera*                camera;             //!< The current Camera.
   static CameraTarget*          cameraTarget;       //!< The Camera Target.
+  static CameraMan*             cameraManager;
   static PNode*                 cameraNode;         //!< A reference to the camera
   static PNode*                 cameraTargetNode;   //!< A reference to the cameraTarget