Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
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:
6 edited
2 moved

Legend:

Unmodified
Added
Removed

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

    r2071 r2073  
    11SET( ORXONOX_SRC_FILES
    2   CameraHandler.cc
     2  CameraManager.cc
    33  GraphicsEngine.cc
    44  LevelManager.cc
    … …  
    106106    GraphicsEngine.cc
    107107    objects/Camera.cc
    108     objects/CameraHandler.cc
     108    CameraManager.cc
    109109  )
    110110

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

    r2070 r2073  
    2323 *      Benjamin Knecht
    2424 *   Co-authors:
    25  *      ...
     25 *      Fabian 'x3n' Landau
    2626 *
    2727 */
    2828#include "OrxonoxStableHeaders.h"
    29 #include "CameraHandler.h"
     29#include "CameraManager.h"
    3030
    3131#include <OgreViewport.h>
    … …  
    3737namespace orxonox
    3838{
    39     CameraHandler* CameraHandler::singletonRef_s = 0;
     39    CameraManager* CameraManager::singletonRef_s = 0;
    4040
    41     CameraHandler::CameraHandler(Ogre::Viewport* viewport)
     41    CameraManager::CameraManager(Ogre::Viewport* viewport)
    4242        : viewport_(viewport)
    4343    {
    … …  
    4646    }
    4747
    48     CameraHandler::~CameraHandler()
     48    CameraManager::~CameraManager()
    4949    {
    5050        assert(singletonRef_s != 0);
    … …  
    5252    }
    5353
    54     Camera* CameraHandler::getActiveCamera() const
     54    Camera* CameraManager::getActiveCamera() const
    5555    {
    5656        if (this->cameraList_.size() > 0)
    … …  
    6060    }
    6161
    62     void CameraHandler::requestFocus(Camera* camera)
     62    void CameraManager::requestFocus(Camera* camera)
    6363    {
    6464        if (!Core::showsGraphics())
    … …  
    8181    }
    8282
    83     void CameraHandler::releaseFocus(Camera* camera)
     83    void CameraManager::releaseFocus(Camera* camera)
    8484    {
    8585        if (!Core::showsGraphics())

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

    r2070 r2073  
    2323 *      Benjamin Knecht
    2424 *   Co-authors:
    25  *      ...
     25 *      Fabian 'x3n' Landau
    2626 *
    2727 */
    2828
    2929 /**
    30  @file  CameraHandler.h
     30 @file  CameraManager.h
    3131 @brief Handles the instances of Camera class
    3232 @author Benjamin Knecht <beni_at_orxonox.net>
    3333  */
    3434
    35 #ifndef _Camera_Handler_H__
    36 #define _Camera_Handler_H__
     35#ifndef _CameraManager_H__
     36#define _CameraManager_H__
    3737
    3838#include "OrxonoxPrereqs.h"
    … …  
    4444namespace orxonox
    4545{
    46     class _OrxonoxExport CameraHandler
     46    class _OrxonoxExport CameraManager
    4747    {
    4848        public:
    49             CameraHandler(Ogre::Viewport* viewport);
    50             ~CameraHandler();
     49            CameraManager(Ogre::Viewport* viewport);
     50            ~CameraManager();
    5151
    5252            Camera* getActiveCamera() const;
    … …  
    5555            void releaseFocus(Camera* camera);
    5656
    57             static CameraHandler& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
     57            static CameraManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
    5858
    5959        private:
    60             CameraHandler(const CameraHandler&);
     60            CameraManager(const CameraManager&);
    6161
    6262            std::list<Camera*> cameraList_;
    6363            Ogre::Viewport* viewport_;
    6464
    65             static CameraHandler* singletonRef_s;
     65            static CameraManager* singletonRef_s;
    6666    };
    6767}
    6868
    69 #endif /* _Camera_Handler_H__ */
     69#endif /* _CameraManager_H__ */

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

    r2065 r2073  
    8080    class RadarListener;
    8181
    82     class CameraHandler;
     82    class CameraManager;
    8383    class LevelManager;
    8484
    … …  
    107107    class Pawn;
    108108    class SpaceShip;
     109
     110    class Trigger;
     111    class DistanceTrigger;
     112    class EventTrigger;
    109113
    110114    class Controller;

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

    r2034 r2073  
    4444#include "objects/Radar.h"
    4545//#include "tools/ParticleInterface.h"
    46 #include "CameraHandler.h"
     46#include "CameraManager.h"
    4747#include "LevelManager.h"
    4848#include "Settings.h"
    … …  
    5757        , radar_(0)
    5858        , startFile_(0)
    59         , cameraHandler_(0)
     59        , cameraManager_(0)
    6060        , levelManager_(0)
    6161    {
    … …  
    8282            inputState_->setHandler(keyBinder_);
    8383
    84             // create the global CameraHandler
     84            // create the global CameraManager
    8585            assert(viewport);
    86             this->cameraHandler_ = new CameraHandler(viewport);
     86            this->cameraManager_ = new CameraManager(viewport);
    8787
    8888            // Start the Radar
    … …  
    146146            delete this->radar_;
    147147
    148         if (this->cameraHandler_)
    149             delete this->cameraHandler_;
     148        if (this->cameraManager_)
     149            delete this->cameraManager_;
    150150
    151151        if (this->levelManager_)

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

    r2023 r2073  
    6868        Radar*                radar_;            //!< represents the Radar (not the HUD part)
    6969        XMLFile*              startFile_;        //!< current hard coded default level
    70         CameraHandler*        cameraHandler_;
     70        CameraManager*        cameraManager_;
    7171        LevelManager*         levelManager_;
    7272

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

    r2030 r2073  
    4141#include "core/ConfigValueIncludes.h"
    4242#include "objects/Scene.h"
    43 #include "CameraHandler.h"
     43#include "CameraManager.h"
    4444
    4545namespace orxonox
    … …  
    102102    void Camera::requestFocus()
    103103    {
    104         CameraHandler::getInstance().requestFocus(this);
     104        CameraManager::getInstance().requestFocus(this);
    105105    }
    106106
    107107    void Camera::releaseFocus()
    108108    {
    109         CameraHandler::getInstance().releaseFocus(this);
     109        CameraManager::getInstance().releaseFocus(this);
    110110    }
    111111
    112112    /**
    113113        what to do when camera loses focus (do not request focus in this function!!)
    114         this is called by the CameraHandler singleton class to notify the camera
     114        this is called by the CameraManager singleton class to notify the camera
    115115    */
    116116    void Camera::removeFocus()

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

    r2027 r2073  
    4040    class _OrxonoxExport Camera : public PositionableEntity, public Tickable
    4141    {
    42         friend class CameraHandler;
     42        friend class CameraManager;
    4343
    4444        public:
Note: See TracChangeset for help on using the changeset viewer.