Changeset 10413 for code/branches/core7/src/orxonox
- Timestamp:
- May 2, 2015, 11:20:45 PM (10 years ago)
- Location:
- code/branches/core7/src/orxonox
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core7/src/orxonox/PawnManager.cc
r10407 r10413 37 37 ManageScopedSingleton(PawnManager, ScopeID::Root, false); 38 38 39 RegisterAbstractClass(PawnManager).inheritsFrom< Tickable>();39 RegisterAbstractClass(PawnManager).inheritsFrom<UpdateListener>(); 40 40 41 41 PawnManager::PawnManager() -
code/branches/core7/src/orxonox/PawnManager.h
r8351 r10413 33 33 34 34 #include "util/Singleton.h" 35 #include " tools/interfaces/Tickable.h"35 #include "core/UpdateListener.h" 36 36 37 37 namespace orxonox 38 38 { 39 class _OrxonoxExport PawnManager : public Singleton<PawnManager>, public Tickable39 class _OrxonoxExport PawnManager : public Singleton<PawnManager>, public UpdateListener 40 40 { 41 41 friend class Singleton<PawnManager>; … … 45 45 46 46 virtual void preUpdate(const Clock& time); 47 virtual void postUpdate(const Clock& time) { /*no action*/ } 47 48 48 49 private: -
code/branches/core7/src/orxonox/ShipPartManager.cc
r10407 r10413 37 37 ManageScopedSingleton(ShipPartManager, ScopeID::Root, false); 38 38 39 RegisterAbstractClass(ShipPartManager).inheritsFrom< Tickable>();39 RegisterAbstractClass(ShipPartManager).inheritsFrom<UpdateListener>(); 40 40 41 41 ShipPartManager::ShipPartManager() -
code/branches/core7/src/orxonox/ShipPartManager.h
r10262 r10413 33 33 34 34 #include "util/Singleton.h" 35 #include " tools/interfaces/Tickable.h"35 #include "core/UpdateListener.h" 36 36 37 37 namespace orxonox 38 38 { 39 class _OrxonoxExport ShipPartManager : public Singleton<ShipPartManager>, public Tickable39 class _OrxonoxExport ShipPartManager : public Singleton<ShipPartManager>, public UpdateListener 40 40 { 41 41 friend class Singleton<ShipPartManager>; … … 45 45 46 46 virtual void preUpdate(const Clock& time); 47 virtual void postUpdate(const Clock& time) { /*no action*/ } 47 48 48 49 private: -
code/branches/core7/src/orxonox/overlays/InGameConsole.cc
r10407 r10413 67 67 ManageScopedSingleton(InGameConsole, ScopeID::Graphics, false); 68 68 69 RegisterAbstractClass(InGameConsole).inheritsFrom<WindowEventListener>() ;69 RegisterAbstractClass(InGameConsole).inheritsFrom<WindowEventListener>().inheritsFrom<UpdateListener>(); 70 70 71 71 /** -
code/branches/core7/src/orxonox/overlays/InGameConsole.h
r8858 r10413 39 39 #include "core/WindowEventListener.h" 40 40 #include "core/command/Shell.h" 41 #include "core/UpdateListener.h" 41 42 42 43 namespace orxonox 43 44 { 44 class _OrxonoxExport InGameConsole : public Singleton<InGameConsole>, public ShellListener, public WindowEventListener 45 class _OrxonoxExport InGameConsole : public Singleton<InGameConsole>, public ShellListener, public WindowEventListener, public UpdateListener 45 46 { 46 47 friend class Singleton<InGameConsole>; … … 53 54 54 55 void preUpdate(const Clock& time); 56 void postUpdate(const Clock& time) { /*no action*/ } 55 57 56 58 static void openConsole(); -
code/branches/core7/src/orxonox/sound/SoundManager.cc
r10407 r10413 66 66 } 67 67 68 RegisterAbstractClass(SoundManager).inheritsFrom<Configurable>() ;68 RegisterAbstractClass(SoundManager).inheritsFrom<Configurable>().inheritsFrom<UpdateListener>(); 69 69 70 70 SoundManager::SoundManager() -
code/branches/core7/src/orxonox/sound/SoundManager.h
r9667 r10413 41 41 #include "core/config/Configurable.h" 42 42 #include "core/object/SmartPtr.h" 43 #include "core/UpdateListener.h" 43 44 44 45 // tolua_begin … … 59 60 class _OrxonoxExport SoundManager 60 61 // tolua_end 61 : public Singleton<SoundManager>, public Configurable 62 : public Singleton<SoundManager>, public Configurable, public UpdateListener 62 63 { // tolua_export 63 64 friend class Singleton<SoundManager>; … … 68 69 69 70 void preUpdate(const Clock& time); 71 void postUpdate(const Clock& time) { /*no action*/ } 70 72 void setConfigValues(); 71 73
Note: See TracChangeset
for help on using the changeset viewer.