Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3131


Ignore:
Timestamp:
Jun 9, 2009, 8:37:42 PM (15 years ago)
Author:
rgrieder
Message:

Clean up in files in src/orxonox and src/orxonox/tools.

Location:
code/branches/pch/src/orxonox
Files:
24 edited

Legend:

Unmodified
Added
Removed

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

    r3110 r3131  
    3030#include <OgreSceneManager.h>
    3131#include <OgreViewport.h>
    32 #include <OgreCamera.h>
    3332#include <OgreCompositorManager.h>
    34 #include <OgreResource.h>
    3533
     34#include "util/String.h"
    3635#include "core/GameMode.h"
    3736#include "core/Iterator.h"
     37#include "tools/Shader.h"
    3838#include "objects/worldentities/Camera.h"
    3939#include "objects/Scene.h"
    40 #include "tools/Shader.h"
    41 #include "util/String.h"
    4240#include "gui/GUIManager.h"
    4341

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

    r3068 r3131  
    5555            void releaseFocus(Camera* camera);
    5656
     57            void useCamera(Ogre::Camera* camera);
     58
    5759            static CameraManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
    5860            static CameraManager* getInstancePtr() { return singletonRef_s; }
    5961
    60             void useCamera(Ogre::Camera* camera);
     62        private:
     63            CameraManager(const CameraManager&); // don't use
    6164
    62         private:
    63             CameraManager(const CameraManager&);
    64 
    65             std::list<Camera*> cameraList_;
    66             Ogre::Viewport* viewport_;
    67             Ogre::Camera* fallbackCamera_;
     65            std::list<Camera*>    cameraList_;
     66            Ogre::Viewport*       viewport_;
     67            Ogre::Camera*         fallbackCamera_;
    6868
    6969            static CameraManager* singletonRef_s;

  • code/branches/pch/src/orxonox/GraphicsManager.cc

    r3110 r3131  
    8888        , viewport_(0)
    8989        , ogreWindowEventListener_(0)
    90         , avgTickTime_(0.0f)
    91         , avgFramesPerSecond_(0.0f)
    9290    {
    9391        RegisterObject(GraphicsManager);

  • code/branches/pch/src/orxonox/GraphicsManager.h

    r2896 r3131  
    3939#include "OrxonoxPrereqs.h"
    4040
     41#include <cassert>
    4142#include <string>
    42 #include <cassert>
    4343#include <OgreLog.h>
    44 
    4544#include "core/OrxonoxClass.h"
    4645
    … …  
    6665            { return this->detailLevelParticle_; }
    6766
    68         inline Ogre::Viewport* getViewport() const
     67        inline Ogre::Viewport* getViewport()
    6968            { return this->viewport_; }
    7069        inline Ogre::RenderWindow* getRenderWindow()
    … …  
    7372        void setCamera(Ogre::Camera* camera);
    7473
    75         static GraphicsManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
     74        inline static GraphicsManager& getInstance()
     75            { assert(singletonRef_s); return *singletonRef_s; }
    7676
    7777    private:
    … …  
    101101        OgreWindowEventListener* ogreWindowEventListener_;
    102102
    103         // stats (Hack)
    104         float               avgTickTime_;              //!< time in ms to tick() one frame
    105         float               avgFramesPerSecond_;       //!< number of frames processed in one second
    106 
    107103        // config values
    108104        unsigned int        detailLevelParticle_;      //!< Detail level of particle effects (0: off, 1: low, 2: normal, 3: high)

  • code/branches/pch/src/orxonox/LevelManager.cc

    r3110 r3131  
    2929#include "LevelManager.h"
    3030
     31#include <map>
    3132#include "PlayerManager.h"
    3233#include "objects/Level.h"

  • code/branches/pch/src/orxonox/LevelManager.h

    r2171 r3131  
    3232#include "OrxonoxPrereqs.h"
    3333
     34#include <cassert>
    3435#include <list>
    35 #include <map>
    36 #include <cassert>
    3736
    3837namespace orxonox
    … …  
    5756
    5857            std::list<Level*> levels_s;
     58
    5959            static LevelManager* singletonRef_s;
    6060    };

  • code/branches/pch/src/orxonox/PawnManager.cc

    r3110 r3131  
    3131#include "core/CoreIncludes.h"
    3232#include "objects/worldentities/pawns/Pawn.h"
    33 
    3433
    3534namespace orxonox

  • code/branches/pch/src/orxonox/PlayerManager.cc

    r3110 r3131  
    2929#include "PlayerManager.h"
    3030
    31 #include "LevelManager.h"
     31#include "core/CoreIncludes.h"
    3232#include "core/GameMode.h"
    33 #include "core/CoreIncludes.h"
    3433#include "objects/Level.h"
    3534#include "objects/infos/HumanPlayer.h"
     35#include "LevelManager.h"
    3636
    3737namespace orxonox

  • code/branches/pch/src/orxonox/PlayerManager.h

    r2662 r3131  
    4444            virtual ~PlayerManager();
    4545
    46             static PlayerManager& getInstance()
    47             { assert(singletonRef_s); return *singletonRef_s; }
     46            inline static PlayerManager& getInstance()
     47                { assert(singletonRef_s); return *singletonRef_s; }
    4848
    4949            PlayerInfo* getClient(unsigned int clientID) const;

  • code/branches/pch/src/orxonox/tools/BillboardSet.cc

    r3110 r3131  
    3131#include <sstream>
    3232#include <cassert>
    33 
    3433#include <OgreSceneManager.h>
    3534#include <OgreBillboardSet.h>
    3635#include <OgreBillboard.h>
    3736
     37#include "util/Convert.h"
     38#include "util/Math.h"
     39#include "util/String.h"
    3840#include "core/GameMode.h"
    39 #include "util/Convert.h"
    40 #include "util/String.h"
    4141
    4242namespace orxonox

  • code/branches/pch/src/orxonox/tools/BillboardSet.h

    r2662 r3131  
    3434#include <string>
    3535#include <OgrePrerequisites.h>
    36 
    37 #include "util/Math.h"
     36#include "util/UtilPrereqs.h"
    3837
    3938namespace orxonox
    … …  
    5251            inline Ogre::BillboardSet* getBillboardSet()
    5352                { return this->billboardSet_; }
    54             inline Ogre::SceneManager* getSceneManager()
     53            inline Ogre::SceneManager* getSceneManager() const
    5554                { return this->scenemanager_; }
    5655
    … …  
    6968            void destroyBillboardSet();
    7069
    71             static unsigned int billboardSetCounter_s;
    7270            Ogre::BillboardSet* billboardSet_;
    7371            Ogre::SceneManager* scenemanager_;
     72
     73            static unsigned int billboardSetCounter_s;
    7474    };
    7575}

  • code/branches/pch/src/orxonox/tools/CMakeLists.txt

    r3089 r3131  
    11ADD_SOURCE_FILES(ORXONOX_SRC_FILES
    22  BillboardSet.cc
     3  DynamicLines.cc
     4  DynamicRenderable.cc
    35  Mesh.cc
    46  ParticleInterface.cc
    … …  
    810  Timer.cc
    911  WindowEventListener.cc
    10   DynamicLines.cpp
    11   DynamicRenderable.cpp
    1212)

  • code/branches/pch/src/orxonox/tools/Mesh.cc

    r3110 r3131  
    2929#include "Mesh.h"
    3030
     31#include <cassert>
    3132#include <sstream>
    3233#include <OgreEntity.h>
    3334#include <OgreSceneManager.h>
    34 #include <cassert>
    3535
    36 #include "core/GameMode.h"
    3736#include "util/Convert.h"
    3837#include "util/String.h"
     38#include "core/GameMode.h"
    3939
    4040namespace orxonox

  • code/branches/pch/src/orxonox/tools/Mesh.h

    r2662 r3131  
    5858
    5959        private:
    60             static unsigned int meshCounter_s;
    6160            Ogre::Entity* entity_;
    6261            bool bCastShadows_;
    6362            Ogre::SceneManager* scenemanager_;
     63
     64            static unsigned int meshCounter_s;
    6465    };
    6566}

  • code/branches/pch/src/orxonox/tools/ParticleInterface.cc

    r3110 r3131  
    3434#include "ParticleInterface.h"
    3535
     36#include <cassert>
    3637#include <OgreParticleSystem.h>
    3738#include <OgreParticleEmitter.h>
    3839#include <OgreSceneManager.h>
    39 #include <cassert>
    40 
     40
     41#include "util/Convert.h"
     42#include "util/Math.h"
     43#include "core/CoreIncludes.h"
     44#include "core/GameMode.h"
    4145#include "GraphicsManager.h"
    42 #include "core/GameMode.h"
    43 #include "core/CoreIncludes.h"
    44 #include "util/Convert.h"
    4546
    4647namespace orxonox
    … …  
    132133            return 0;
    133134    }
    134     Ogre::ParticleAffector* ParticleInterface::getAffector(unsigned int affectorNr) const
     135    Ogre::ParticleAffector* ParticleInterface::getAffector(unsigned int affectorNr)
    135136    {
    136137        if (this->particleSystem_ && (affectorNr < this->particleSystem_->getNumAffectors()))

  • code/branches/pch/src/orxonox/tools/ParticleInterface.h

    r2896 r3131  
    3434#include <string>
    3535#include <OgrePrerequisites.h>
    36 
    37 #include "core/OrxonoxClass.h"
    38 #include "util/Math.h"
    3936#include "tools/TimeFactorListener.h"
    4037
    … …  
    5249            virtual ~ParticleInterface();
    5350
    54             inline Ogre::ParticleSystem* getParticleSystem() const
     51            inline Ogre::ParticleSystem* getParticleSystem()
    5552                { return this->particleSystem_; }
    5653
    … …  
    6259
    6360            Ogre::ParticleAffector* addAffector(const std::string& name);
    64             Ogre::ParticleAffector* getAffector(unsigned int affectorNr) const;
     61            Ogre::ParticleAffector* getAffector(unsigned int affectorNr);
    6562            void removeAffector(unsigned int affectorNr);
    6663            void removeAllAffectors();
    … …  
    9592            void updateVisibility();
    9693
    97             static ParticleInterface* currentParticleInterface_s;
    98             static unsigned int       counter_s;
    99 
    10094            Ogre::ParticleSystem*     particleSystem_;
     95            Ogre::SceneManager*       scenemanager_;
    10196            bool                      bVisible_;
    10297            bool                      bEnabled_;
    … …  
    10499            unsigned int              detaillevel_;     //!< Detail level of this particle effect (0: off, 1: low, 2: normal, 3: high)
    105100            float                     speedFactor_;
    106             Ogre::SceneManager*       scenemanager_;
     101
     102            static ParticleInterface* currentParticleInterface_s;
     103            static unsigned int       counter_s;
    107104    };
    108105}

  • code/branches/pch/src/orxonox/tools/Shader.cc

    r3110 r3131  
    3434#include <OgreRoot.h>
    3535#include <OgrePlugin.h>
    36 
    37 #include "core/GameMode.h"
    38 #include "core/CoreIncludes.h"
    39 #include "core/Executor.h"
    40 #include "GraphicsManager.h"
    41 #include "util/Exception.h"
    42 
    4336#include <OgreMaterial.h>
    4437#include <OgreTechnique.h>
    4538#include <OgrePass.h>
    4639#include <OgreMaterialManager.h>
     40
     41#include "core/CoreIncludes.h"
     42#include "core/GameMode.h"
     43#include "GraphicsManager.h"
    4744
    4845namespace orxonox

  • code/branches/pch/src/orxonox/tools/Shader.h

    r2662 r3131  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
     34#include <map>
     35#include <string>
     36#include <vector>
    3337#include <OgrePrerequisites.h>
    34 #include <vector>
    35 #include <map>
    3638
    3739#include "objects/Tickable.h"

  • code/branches/pch/src/orxonox/tools/TextureGenerator.cc

    r3110 r3131  
    3333
    3434#include "TextureGenerator.h"
     35
    3536#include <OgreMaterialManager.h>
    3637#include <OgreTechnique.h>
    3738#include "util/Convert.h"
     39#include "util/Math.h"
    3840
    3941namespace std

  • code/branches/pch/src/orxonox/tools/TextureGenerator.h

    r1625 r3131  
    3636
    3737#include "OrxonoxPrereqs.h"
     38
     39#include <map>
    3840#include <string>
    39 #include <map>
    40 #include "util/Math.h"
     41#include "util/UtilPrereqs.h"
    4142
    4243namespace orxonox

  • code/branches/pch/src/orxonox/tools/TimeFactorListener.h

    r2896 r3131  
    3333#include "core/OrxonoxClass.h"
    3434
    35 
    3635namespace orxonox
    3736{

  • code/branches/pch/src/orxonox/tools/Timer.cc

    r3110 r3131  
    2727 */
    2828
     29#include "Timer.h"
     30
    2931#include <set>
    3032
    31 #include "Timer.h"
    32 
    33 #include "core/Executor.h"
    3433#include "core/CoreIncludes.h"
    3534#include "core/ConsoleCommand.h"
    3635#include "core/CommandExecutor.h"
    3736#include "core/Clock.h"
     37#include "core/Functor.h"
    3838
    3939namespace orxonox

  • code/branches/pch/src/orxonox/tools/Timer.h

    r2896 r3131  
    6262
    6363#include "OrxonoxPrereqs.h"
     64
    6465#include "core/Executor.h"
    6566#include "core/OrxonoxClass.h"

  • code/branches/pch/src/orxonox/tools/WindowEventListener.h

    r2896 r3131  
    3333#include "core/OrxonoxClass.h"
    3434
    35 
    3635namespace orxonox
    3736{
Note: See TracChangeset for help on using the changeset viewer.