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

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

File:

• trunk/src/util/state.cc (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;
+}