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

Timestamp:

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

Author:

patrick

Message:

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

Location:

trunk/src/util

Files:

• state.cc (modified) (3 diffs)
• state.h (modified) (3 diffs)

trunk/src/util/state.cc

@@ -20 +20 @@
 
 #include "camera.h"
+#include "cameraman.h"
 
 #ifndef NULL
@@ -31 +32 @@
 Camera* State::camera = NULL;
 CameraTarget* State::cameraTarget = NULL;
+
+CameraMan* State::cameraManager = NULL;
 
 PNode* State::cameraNode = NULL;
@@ -63 +66 @@
   State::cameraTargetNode = cameraTarget;
 }
+
+
+void State::setCameraman(CameraMan* cm)
+
+{
+  State::cameraManager=cm;
+}

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