Changeset 3131 for code/branches
- Timestamp:
- Jun 9, 2009, 8:37:42 PM (15 years ago)
- Location:
- code/branches/pch/src/orxonox
- Files:
-
- 24 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/pch/src/orxonox/CameraManager.cc
r3110 r3131 30 30 #include <OgreSceneManager.h> 31 31 #include <OgreViewport.h> 32 #include <OgreCamera.h>33 32 #include <OgreCompositorManager.h> 34 #include <OgreResource.h>35 33 34 #include "util/String.h" 36 35 #include "core/GameMode.h" 37 36 #include "core/Iterator.h" 37 #include "tools/Shader.h" 38 38 #include "objects/worldentities/Camera.h" 39 39 #include "objects/Scene.h" 40 #include "tools/Shader.h"41 #include "util/String.h"42 40 #include "gui/GUIManager.h" 43 41 -
code/branches/pch/src/orxonox/CameraManager.h
r3068 r3131 55 55 void releaseFocus(Camera* camera); 56 56 57 void useCamera(Ogre::Camera* camera); 58 57 59 static CameraManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; } 58 60 static CameraManager* getInstancePtr() { return singletonRef_s; } 59 61 60 void useCamera(Ogre::Camera* camera); 62 private: 63 CameraManager(const CameraManager&); // don't use 61 64 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_; 68 68 69 69 static CameraManager* singletonRef_s; -
code/branches/pch/src/orxonox/GraphicsManager.cc
r3110 r3131 88 88 , viewport_(0) 89 89 , ogreWindowEventListener_(0) 90 , avgTickTime_(0.0f)91 , avgFramesPerSecond_(0.0f)92 90 { 93 91 RegisterObject(GraphicsManager); -
code/branches/pch/src/orxonox/GraphicsManager.h
r2896 r3131 39 39 #include "OrxonoxPrereqs.h" 40 40 41 #include <cassert> 41 42 #include <string> 42 #include <cassert>43 43 #include <OgreLog.h> 44 45 44 #include "core/OrxonoxClass.h" 46 45 … … 66 65 { return this->detailLevelParticle_; } 67 66 68 inline Ogre::Viewport* getViewport() const67 inline Ogre::Viewport* getViewport() 69 68 { return this->viewport_; } 70 69 inline Ogre::RenderWindow* getRenderWindow() … … 73 72 void setCamera(Ogre::Camera* camera); 74 73 75 static GraphicsManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; } 74 inline static GraphicsManager& getInstance() 75 { assert(singletonRef_s); return *singletonRef_s; } 76 76 77 77 private: … … 101 101 OgreWindowEventListener* ogreWindowEventListener_; 102 102 103 // stats (Hack)104 float avgTickTime_; //!< time in ms to tick() one frame105 float avgFramesPerSecond_; //!< number of frames processed in one second106 107 103 // config values 108 104 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 29 29 #include "LevelManager.h" 30 30 31 #include <map> 31 32 #include "PlayerManager.h" 32 33 #include "objects/Level.h" -
code/branches/pch/src/orxonox/LevelManager.h
r2171 r3131 32 32 #include "OrxonoxPrereqs.h" 33 33 34 #include <cassert> 34 35 #include <list> 35 #include <map>36 #include <cassert>37 36 38 37 namespace orxonox … … 57 56 58 57 std::list<Level*> levels_s; 58 59 59 static LevelManager* singletonRef_s; 60 60 }; -
code/branches/pch/src/orxonox/PawnManager.cc
r3110 r3131 31 31 #include "core/CoreIncludes.h" 32 32 #include "objects/worldentities/pawns/Pawn.h" 33 34 33 35 34 namespace orxonox -
code/branches/pch/src/orxonox/PlayerManager.cc
r3110 r3131 29 29 #include "PlayerManager.h" 30 30 31 #include " LevelManager.h"31 #include "core/CoreIncludes.h" 32 32 #include "core/GameMode.h" 33 #include "core/CoreIncludes.h"34 33 #include "objects/Level.h" 35 34 #include "objects/infos/HumanPlayer.h" 35 #include "LevelManager.h" 36 36 37 37 namespace orxonox -
code/branches/pch/src/orxonox/PlayerManager.h
r2662 r3131 44 44 virtual ~PlayerManager(); 45 45 46 static PlayerManager& getInstance()47 { assert(singletonRef_s); return *singletonRef_s; }46 inline static PlayerManager& getInstance() 47 { assert(singletonRef_s); return *singletonRef_s; } 48 48 49 49 PlayerInfo* getClient(unsigned int clientID) const; -
code/branches/pch/src/orxonox/tools/BillboardSet.cc
r3110 r3131 31 31 #include <sstream> 32 32 #include <cassert> 33 34 33 #include <OgreSceneManager.h> 35 34 #include <OgreBillboardSet.h> 36 35 #include <OgreBillboard.h> 37 36 37 #include "util/Convert.h" 38 #include "util/Math.h" 39 #include "util/String.h" 38 40 #include "core/GameMode.h" 39 #include "util/Convert.h"40 #include "util/String.h"41 41 42 42 namespace orxonox -
code/branches/pch/src/orxonox/tools/BillboardSet.h
r2662 r3131 34 34 #include <string> 35 35 #include <OgrePrerequisites.h> 36 37 #include "util/Math.h" 36 #include "util/UtilPrereqs.h" 38 37 39 38 namespace orxonox … … 52 51 inline Ogre::BillboardSet* getBillboardSet() 53 52 { return this->billboardSet_; } 54 inline Ogre::SceneManager* getSceneManager() 53 inline Ogre::SceneManager* getSceneManager() const 55 54 { return this->scenemanager_; } 56 55 … … 69 68 void destroyBillboardSet(); 70 69 71 static unsigned int billboardSetCounter_s;72 70 Ogre::BillboardSet* billboardSet_; 73 71 Ogre::SceneManager* scenemanager_; 72 73 static unsigned int billboardSetCounter_s; 74 74 }; 75 75 } -
code/branches/pch/src/orxonox/tools/CMakeLists.txt
r3089 r3131 1 1 ADD_SOURCE_FILES(ORXONOX_SRC_FILES 2 2 BillboardSet.cc 3 DynamicLines.cc 4 DynamicRenderable.cc 3 5 Mesh.cc 4 6 ParticleInterface.cc … … 8 10 Timer.cc 9 11 WindowEventListener.cc 10 DynamicLines.cpp11 DynamicRenderable.cpp12 12 ) -
code/branches/pch/src/orxonox/tools/Mesh.cc
r3110 r3131 29 29 #include "Mesh.h" 30 30 31 #include <cassert> 31 32 #include <sstream> 32 33 #include <OgreEntity.h> 33 34 #include <OgreSceneManager.h> 34 #include <cassert>35 35 36 #include "core/GameMode.h"37 36 #include "util/Convert.h" 38 37 #include "util/String.h" 38 #include "core/GameMode.h" 39 39 40 40 namespace orxonox -
code/branches/pch/src/orxonox/tools/Mesh.h
r2662 r3131 58 58 59 59 private: 60 static unsigned int meshCounter_s;61 60 Ogre::Entity* entity_; 62 61 bool bCastShadows_; 63 62 Ogre::SceneManager* scenemanager_; 63 64 static unsigned int meshCounter_s; 64 65 }; 65 66 } -
code/branches/pch/src/orxonox/tools/ParticleInterface.cc
r3110 r3131 34 34 #include "ParticleInterface.h" 35 35 36 #include <cassert> 36 37 #include <OgreParticleSystem.h> 37 38 #include <OgreParticleEmitter.h> 38 39 #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" 41 45 #include "GraphicsManager.h" 42 #include "core/GameMode.h"43 #include "core/CoreIncludes.h"44 #include "util/Convert.h"45 46 46 47 namespace orxonox … … 132 133 return 0; 133 134 } 134 Ogre::ParticleAffector* ParticleInterface::getAffector(unsigned int affectorNr) const135 Ogre::ParticleAffector* ParticleInterface::getAffector(unsigned int affectorNr) 135 136 { 136 137 if (this->particleSystem_ && (affectorNr < this->particleSystem_->getNumAffectors())) -
code/branches/pch/src/orxonox/tools/ParticleInterface.h
r2896 r3131 34 34 #include <string> 35 35 #include <OgrePrerequisites.h> 36 37 #include "core/OrxonoxClass.h"38 #include "util/Math.h"39 36 #include "tools/TimeFactorListener.h" 40 37 … … 52 49 virtual ~ParticleInterface(); 53 50 54 inline Ogre::ParticleSystem* getParticleSystem() const51 inline Ogre::ParticleSystem* getParticleSystem() 55 52 { return this->particleSystem_; } 56 53 … … 62 59 63 60 Ogre::ParticleAffector* addAffector(const std::string& name); 64 Ogre::ParticleAffector* getAffector(unsigned int affectorNr) const;61 Ogre::ParticleAffector* getAffector(unsigned int affectorNr); 65 62 void removeAffector(unsigned int affectorNr); 66 63 void removeAllAffectors(); … … 95 92 void updateVisibility(); 96 93 97 static ParticleInterface* currentParticleInterface_s;98 static unsigned int counter_s;99 100 94 Ogre::ParticleSystem* particleSystem_; 95 Ogre::SceneManager* scenemanager_; 101 96 bool bVisible_; 102 97 bool bEnabled_; … … 104 99 unsigned int detaillevel_; //!< Detail level of this particle effect (0: off, 1: low, 2: normal, 3: high) 105 100 float speedFactor_; 106 Ogre::SceneManager* scenemanager_; 101 102 static ParticleInterface* currentParticleInterface_s; 103 static unsigned int counter_s; 107 104 }; 108 105 } -
code/branches/pch/src/orxonox/tools/Shader.cc
r3110 r3131 34 34 #include <OgreRoot.h> 35 35 #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 43 36 #include <OgreMaterial.h> 44 37 #include <OgreTechnique.h> 45 38 #include <OgrePass.h> 46 39 #include <OgreMaterialManager.h> 40 41 #include "core/CoreIncludes.h" 42 #include "core/GameMode.h" 43 #include "GraphicsManager.h" 47 44 48 45 namespace orxonox -
code/branches/pch/src/orxonox/tools/Shader.h
r2662 r3131 31 31 32 32 #include "OrxonoxPrereqs.h" 33 34 #include <map> 35 #include <string> 36 #include <vector> 33 37 #include <OgrePrerequisites.h> 34 #include <vector>35 #include <map>36 38 37 39 #include "objects/Tickable.h" -
code/branches/pch/src/orxonox/tools/TextureGenerator.cc
r3110 r3131 33 33 34 34 #include "TextureGenerator.h" 35 35 36 #include <OgreMaterialManager.h> 36 37 #include <OgreTechnique.h> 37 38 #include "util/Convert.h" 39 #include "util/Math.h" 38 40 39 41 namespace std -
code/branches/pch/src/orxonox/tools/TextureGenerator.h
r1625 r3131 36 36 37 37 #include "OrxonoxPrereqs.h" 38 39 #include <map> 38 40 #include <string> 39 #include <map> 40 #include "util/Math.h" 41 #include "util/UtilPrereqs.h" 41 42 42 43 namespace orxonox -
code/branches/pch/src/orxonox/tools/TimeFactorListener.h
r2896 r3131 33 33 #include "core/OrxonoxClass.h" 34 34 35 36 35 namespace orxonox 37 36 { -
code/branches/pch/src/orxonox/tools/Timer.cc
r3110 r3131 27 27 */ 28 28 29 #include "Timer.h" 30 29 31 #include <set> 30 32 31 #include "Timer.h"32 33 #include "core/Executor.h"34 33 #include "core/CoreIncludes.h" 35 34 #include "core/ConsoleCommand.h" 36 35 #include "core/CommandExecutor.h" 37 36 #include "core/Clock.h" 37 #include "core/Functor.h" 38 38 39 39 namespace orxonox -
code/branches/pch/src/orxonox/tools/Timer.h
r2896 r3131 62 62 63 63 #include "OrxonoxPrereqs.h" 64 64 65 #include "core/Executor.h" 65 66 #include "core/OrxonoxClass.h" -
code/branches/pch/src/orxonox/tools/WindowEventListener.h
r2896 r3131 33 33 #include "core/OrxonoxClass.h" 34 34 35 36 35 namespace orxonox 37 36 {
Note: See TracChangeset
for help on using the changeset viewer.