Changeset 9578 for code/branches/core6/src
- Timestamp:
- Mar 25, 2013, 11:05:13 PM (12 years ago)
- Location:
- code/branches/core6/src
- Files:
-
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core6/src/libraries/core/Core.h
r9563 r9578 66 66 You should only create this singleton once because it destroys the identifiers! 67 67 */ 68 class _CoreExport Core : public Singleton<Core>, public OrxonoxClass68 class _CoreExport Core : public Singleton<Core>, public Configurable 69 69 { 70 70 friend class Singleton<Core>; -
code/branches/core6/src/libraries/core/Game.h
r9563 r9578 50 50 #include "util/DestructionHelper.h" 51 51 #include "util/Singleton.h" 52 #include "c lass/OrxonoxClass.h"52 #include "config/Configurable.h" 53 53 54 54 /** … … 82 82 class _CoreExport Game 83 83 // tolua_end 84 : public Singleton<Game>, public OrxonoxClass84 : public Singleton<Game>, public Configurable 85 85 { // tolua_export 86 86 friend class Singleton<Game>; -
code/branches/core6/src/libraries/core/GraphicsManager.h
r9563 r9578 52 52 #include "util/DestructionHelper.h" 53 53 #include "util/Singleton.h" 54 #include "c lass/OrxonoxClass.h"54 #include "config/Configurable.h" 55 55 56 56 // tolua_begin … … 63 63 class _CoreExport GraphicsManager 64 64 // tolua_end 65 : public Singleton<GraphicsManager>, public OrxonoxClass, public Ogre::LogListener65 : public Singleton<GraphicsManager>, public Configurable, public Ogre::LogListener 66 66 { // tolua_export 67 67 friend class Singleton<GraphicsManager>; -
code/branches/core6/src/libraries/core/command/Shell.cc
r9558 r9578 96 96 Shell::~Shell() 97 97 { 98 this->inputBuffer_->destroy();98 delete this->inputBuffer_; 99 99 100 100 OutputManager::getInstance().unregisterListener(this); -
code/branches/core6/src/libraries/core/input/InputBuffer.h
r9563 r9578 34 34 #include <list> 35 35 #include <string> 36 #include "core/c lass/OrxonoxClass.h"36 #include "core/config/Configurable.h" 37 37 #include "InputHandler.h" 38 38 … … 74 74 }; 75 75 76 class _CoreExport InputBuffer : public InputHandler, public OrxonoxClass76 class _CoreExport InputBuffer : public InputHandler, public Configurable 77 77 { 78 78 public: -
code/branches/core6/src/libraries/core/input/InputManager.cc
r9560 r9578 280 280 this->destroyState("calibrator"); 281 281 // Destroy KeyDetector and state 282 calibratorCallbackHandler_->destroy();282 delete calibratorCallbackHandler_; 283 283 // Destroy the empty InputState 284 284 this->destroyStateInternal(this->emptyState_); -
code/branches/core6/src/libraries/core/input/KeyBinderManager.h
r9563 r9578 36 36 37 37 #include "util/Singleton.h" 38 #include "core/c lass/OrxonoxClass.h"38 #include "core/config/Configurable.h" 39 39 40 40 namespace orxonox //tolua_export … … 53 53 */ 54 54 class _CoreExport KeyBinderManager //tolua_export 55 : public Singleton<KeyBinderManager>, public OrxonoxClass55 : public Singleton<KeyBinderManager>, public Configurable 56 56 { //tolua_export 57 57 friend class Singleton<KeyBinderManager>; -
code/branches/core6/src/libraries/network/WANDiscovery.h
r9563 r9578 32 32 #include "packet/ServerInformation.h" 33 33 #include "core/CoreIncludes.h" 34 #include "core/c lass/OrxonoxClass.h"34 #include "core/config/Configurable.h" 35 35 #include "core/config/ConfigValueIncludes.h" 36 36 #include "MasterServerComm.h" … … 47 47 class _NetworkExport WANDiscovery 48 48 // tolua_end 49 : public OrxonoxClass49 : public Configurable 50 50 { // tolua_export 51 51 public: -
code/branches/core6/src/modules/designtools/ScreenshotManager.h
r9563 r9578 44 44 45 45 #include "util/Singleton.h" 46 #include "core/c lass/OrxonoxClass.h"46 #include "core/config/Configurable.h" 47 47 48 48 namespace orxonox … … 61 61 @ingroup Designtools 62 62 */ 63 class ScreenshotManager : public OrxonoxClass, public Singleton<ScreenshotManager>63 class ScreenshotManager : public Configurable, public Singleton<ScreenshotManager> 64 64 { 65 65 friend class Singleton<ScreenshotManager>; -
code/branches/core6/src/modules/designtools/SkyboxGenerator.h
r9563 r9578 36 36 #define __SkyboxGenerator_h__ 37 37 38 #include "core/c lass/OrxonoxClass.h"38 #include "core/config/Configurable.h" 39 39 #include "util/Singleton.h" 40 40 #include "tools/interfaces/Tickable.h" … … 58 58 @ingroup Designtools 59 59 */ 60 class SkyboxGenerator : public virtual OrxonoxClass, public Singleton<SkyboxGenerator>, public Tickable60 class SkyboxGenerator : public virtual Configurable, public Singleton<SkyboxGenerator>, public Tickable 61 61 { 62 62 friend class Singleton<SkyboxGenerator>; -
code/branches/core6/src/modules/questsystem/QuestManager.cc
r8952 r9578 38 38 #include "util/ScopedSingletonManager.h" 39 39 #include "core/command/ConsoleCommand.h" 40 #include "core/CoreIncludes.h"41 40 #include "core/GUIManager.h" 42 41 #include "core/LuaState.h" … … 60 59 QuestManager::QuestManager() 61 60 { 62 RegisterRootObject(QuestManager);63 61 orxout(internal_info, context::quests) << "QuestManager created." << endl; 64 62 } -
code/branches/core6/src/modules/questsystem/QuestManager.h
r9563 r9578 43 43 44 44 #include "util/Singleton.h" 45 #include "core/class/OrxonoxClass.h"46 45 47 46 namespace orxonox // tolua_export … … 59 58 */ 60 59 class _QuestsystemExport QuestManager // tolua_export 61 : public Singleton<QuestManager> , public orxonox::OrxonoxClass60 : public Singleton<QuestManager> 62 61 { // tolua_export 63 62 -
code/branches/core6/src/orxonox/CameraManager.cc
r9557 r9578 48 48 CameraManager::CameraManager() 49 49 { 50 RegisterRootObject(CameraManager);51 52 50 assert(GameMode::showsGraphics()); 53 51 } -
code/branches/core6/src/orxonox/CameraManager.h
r9563 r9578 41 41 #include "util/OgreForwardRefs.h" 42 42 #include "util/Singleton.h" 43 #include "core/class/OrxonoxClass.h"44 43 45 44 namespace orxonox 46 45 { 47 class _OrxonoxExport CameraManager : public Singleton<CameraManager> , public OrxonoxClass46 class _OrxonoxExport CameraManager : public Singleton<CameraManager> 48 47 { 49 48 friend class Singleton<CameraManager>; -
code/branches/core6/src/orxonox/LevelManager.h
r9563 r9578 46 46 47 47 #include "util/Singleton.h" 48 #include "core/c lass/OrxonoxClass.h"48 #include "core/config/Configurable.h" 49 49 50 50 // tolua_begin … … 67 67 class _OrxonoxExport LevelManager 68 68 // tolua_end 69 : public Singleton<LevelManager>, public OrxonoxClass69 : public Singleton<LevelManager>, public Configurable 70 70 { // tolua_export 71 71 friend class Singleton<LevelManager>; -
code/branches/core6/src/orxonox/MoodManager.h
r9563 r9578 34 34 #include <string> 35 35 #include "util/Singleton.h" 36 #include "core/c lass/OrxonoxClass.h"36 #include "core/config/Configurable.h" 37 37 38 38 namespace orxonox … … 60 60 The MoodManager class serves to allow for different musical themes in the game. 61 61 */ 62 class _OrxonoxExport MoodManager : public Singleton<MoodManager>, public OrxonoxClass62 class _OrxonoxExport MoodManager : public Singleton<MoodManager>, public Configurable 63 63 { 64 64 friend class Singleton<MoodManager>; … … 74 74 75 75 private: 76 ~MoodManager() {}77 76 void checkMoodValidity(); 78 77 -
code/branches/core6/src/orxonox/gamestates/GSMainMenu.h
r9563 r9578 34 34 #include "util/OgreForwardRefs.h" 35 35 #include "core/GameState.h" 36 #include "core/c lass/OrxonoxClass.h"36 #include "core/config/Configurable.h" 37 37 38 38 namespace orxonox 39 39 { 40 class _OrxonoxExport GSMainMenu : public GameState, public OrxonoxClass40 class _OrxonoxExport GSMainMenu : public GameState, public Configurable 41 41 { 42 42 public: -
code/branches/core6/src/orxonox/sound/SoundManager.h
r9563 r9578 39 39 40 40 #include "util/Singleton.h" 41 #include "core/c lass/OrxonoxClass.h"41 #include "core/config/Configurable.h" 42 42 #include "core/object/SmartPtr.h" 43 43 … … 59 59 class _OrxonoxExport SoundManager 60 60 // tolua_end 61 : public Singleton<SoundManager>, public OrxonoxClass61 : public Singleton<SoundManager>, public Configurable 62 62 { // tolua_export 63 63 friend class Singleton<SoundManager>;
Note: See TracChangeset
for help on using the changeset viewer.