Changeset 2073 for code/branches/objecthierarchy

Timestamp:

Oct 31, 2008, 1:27:44 AM (16 years ago)

Author:

landauf

Message:

renamed CameraHandler as CameraManager

Location:

code/branches/objecthierarchy/src/orxonox

Files:

• CMakeLists.txt (modified) (2 diffs)
• CameraManager.cc (moved) (moved from code/branches/objecthierarchy/src/orxonox/CameraHandler.cc) (6 diffs)
• CameraManager.h (moved) (moved from code/branches/objecthierarchy/src/orxonox/CameraHandler.h) (3 diffs)
• OrxonoxPrereqs.h (modified) (2 diffs)
• gamestates/GSLevel.cc (modified) (4 diffs)
• gamestates/GSLevel.h (modified) (1 diff)
• objects/worldentities/Camera.cc (modified) (2 diffs)
• objects/worldentities/Camera.h (modified) (1 diff)

code/branches/objecthierarchy/src/orxonox/CMakeLists.txt

@@ -1 +1 @@
 SET( ORXONOX_SRC_FILES
-  CameraHandler.cc
+  CameraManager.cc
   GraphicsEngine.cc
   LevelManager.cc
@@ -106 +106 @@
     GraphicsEngine.cc
     objects/Camera.cc
-    objects/CameraHandler.cc
+    CameraManager.cc
   )
 

code/branches/objecthierarchy/src/orxonox/CameraManager.cc

@@ -23 +23 @@
  *      Benjamin Knecht
  *   Co-authors:
- *      ...
+ *      Fabian 'x3n' Landau
  *
  */
 #include "OrxonoxStableHeaders.h"
-#include "CameraHandler.h"
+#include "CameraManager.h"
 
 #include <OgreViewport.h>
@@ -37 +37 @@
 namespace orxonox
 {
-    CameraHandler* CameraHandler::singletonRef_s = 0;
+    CameraManager* CameraManager::singletonRef_s = 0;
 
-    CameraHandler::CameraHandler(Ogre::Viewport* viewport)
+    CameraManager::CameraManager(Ogre::Viewport* viewport)
         : viewport_(viewport)
     {
@@ -46 +46 @@
     }
 
-    CameraHandler::~CameraHandler()
+    CameraManager::~CameraManager()
     {
         assert(singletonRef_s != 0);
@@ -52 +52 @@
     }
 
-    Camera* CameraHandler::getActiveCamera() const
+    Camera* CameraManager::getActiveCamera() const
     {
         if (this->cameraList_.size() > 0)
@@ -60 +60 @@
     }
 
-    void CameraHandler::requestFocus(Camera* camera)
+    void CameraManager::requestFocus(Camera* camera)
     {
         if (!Core::showsGraphics())
@@ -81 +81 @@
     }
 
-    void CameraHandler::releaseFocus(Camera* camera)
+    void CameraManager::releaseFocus(Camera* camera)
     {
         if (!Core::showsGraphics())

code/branches/objecthierarchy/src/orxonox/CameraManager.h

@@ -23 +23 @@
  *      Benjamin Knecht
  *   Co-authors:
- *      ...
+ *      Fabian 'x3n' Landau
  *
  */
 
  /**
- @file  CameraHandler.h
+ @file  CameraManager.h
  @brief Handles the instances of Camera class
  @author Benjamin Knecht <beni_at_orxonox.net>
   */
 
-#ifndef _Camera_Handler_H__
-#define _Camera_Handler_H__
+#ifndef _CameraManager_H__
+#define _CameraManager_H__
 
 #include "OrxonoxPrereqs.h"
@@ -44 +44 @@
 namespace orxonox
 {
-    class _OrxonoxExport CameraHandler
+    class _OrxonoxExport CameraManager
     {
         public:
-            CameraHandler(Ogre::Viewport* viewport);
-            ~CameraHandler();
+            CameraManager(Ogre::Viewport* viewport);
+            ~CameraManager();
 
             Camera* getActiveCamera() const;
@@ -55 +55 @@
             void releaseFocus(Camera* camera);
 
-            static CameraHandler& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
+            static CameraManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
 
         private:
-            CameraHandler(const CameraHandler&);
+            CameraManager(const CameraManager&);
 
             std::list<Camera*> cameraList_;
             Ogre::Viewport* viewport_;
 
-            static CameraHandler* singletonRef_s;
+            static CameraManager* singletonRef_s;
     };
 }
 
-#endif /* _Camera_Handler_H__ */
+#endif /* _CameraManager_H__ */

code/branches/objecthierarchy/src/orxonox/OrxonoxPrereqs.h

@@ -80 +80 @@
     class RadarListener;
 
-    class CameraHandler;
+    class CameraManager;
     class LevelManager;
 
@@ -107 +107 @@
     class Pawn;
     class SpaceShip;
+
+    class Trigger;
+    class DistanceTrigger;
+    class EventTrigger;
 
     class Controller;

code/branches/objecthierarchy/src/orxonox/gamestates/GSLevel.cc

@@ -44 +44 @@
 #include "objects/Radar.h"
 //#include "tools/ParticleInterface.h"
-#include "CameraHandler.h"
+#include "CameraManager.h"
 #include "LevelManager.h"
 #include "Settings.h"
@@ -57 +57 @@
         , radar_(0)
         , startFile_(0)
-        , cameraHandler_(0)
+        , cameraManager_(0)
         , levelManager_(0)
     {
@@ -82 +82 @@
             inputState_->setHandler(keyBinder_);
 
-            // create the global CameraHandler
+            // create the global CameraManager
             assert(viewport);
-            this->cameraHandler_ = new CameraHandler(viewport);
+            this->cameraManager_ = new CameraManager(viewport);
 
             // Start the Radar
@@ -146 +146 @@
             delete this->radar_;
 
-        if (this->cameraHandler_)
-            delete this->cameraHandler_;
+        if (this->cameraManager_)
+            delete this->cameraManager_;
 
         if (this->levelManager_)

code/branches/objecthierarchy/src/orxonox/gamestates/GSLevel.h

@@ -68 +68 @@
         Radar*                radar_;            //!< represents the Radar (not the HUD part)
         XMLFile*              startFile_;        //!< current hard coded default level
-        CameraHandler*        cameraHandler_;
+        CameraManager*        cameraManager_;
         LevelManager*         levelManager_;
 

code/branches/objecthierarchy/src/orxonox/objects/worldentities/Camera.cc

@@ -41 +41 @@
 #include "core/ConfigValueIncludes.h"
 #include "objects/Scene.h"
-#include "CameraHandler.h"
+#include "CameraManager.h"
 
 namespace orxonox
@@ -102 +102 @@
     void Camera::requestFocus()
     {
-        CameraHandler::getInstance().requestFocus(this);
+        CameraManager::getInstance().requestFocus(this);
     }
 
     void Camera::releaseFocus()
     {
-        CameraHandler::getInstance().releaseFocus(this);
+        CameraManager::getInstance().releaseFocus(this);
     }
 
     /**
         what to do when camera loses focus (do not request focus in this function!!)
-        this is called by the CameraHandler singleton class to notify the camera
+        this is called by the CameraManager singleton class to notify the camera
     */
     void Camera::removeFocus()

code/branches/objecthierarchy/src/orxonox/objects/worldentities/Camera.h

@@ -40 +40 @@
     class _OrxonoxExport Camera : public PositionableEntity, public Tickable
     {
-        friend class CameraHandler;
+        friend class CameraManager;
 
         public: