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

Timestamp:

Feb 3, 2006, 2:14:22 PM (18 years ago)

Author:

bensch

Message:

trunk: new algorithm for the Camera-Distance

File:

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

trunk/src/util/state.h

@@ -10 +10 @@
 // FORWARD DECLARATION
 class PNode;
+class Camera;
+class CameraTarget;
 class WorldEntity;
 class Player;
@@ -30 +32 @@
    //////////////
   /** @param camera the PNode to the Camera, @param cameraTarget the PNode to the Camera's target */
-  static void setCamera(PNode* camera, PNode* cameraTarget);
+  static void setCamera(Camera* camera, CameraTarget* cameraTarget);
+  static inline Camera* getCamera() { return State::camera; };
+  static inline CameraTarget* getCameraTarget() { return State::cameraTarget; };
   /** @returns a Pointer to the PNode of the Camera */
-  static inline PNode* getCamera() { return State::camera; };
+  static inline PNode* getCameraNode() { return State::cameraNode; };
   /** @returns a Pointer to the CameraTarget */
-  static inline PNode* getCameraTarget() { return State::cameraTarget; };
+  static inline PNode* getCameraTargetNode() { return State::cameraTargetNode; };
 
   ////////////////
@@ -95 +99 @@
   State();
 
-  static PNode*                 camera;             //!< A reference to the camera
-  static PNode*                 cameraTarget;       //!< A reference to the cameraTarget
+  static Camera*                camera;             //!< The current Camera.
+  static CameraTarget*          cameraTarget;       //!< The Camera Target.
+  static PNode*                 cameraNode;         //!< A reference to the camera
+  static PNode*                 cameraTargetNode;   //!< A reference to the cameraTarget
   static PNode*                 nullParent;         //!< A reference to the Null-PNode.
   static ObjectManager*         objectManager;      //!< A reference to the current ObjectManager