Context Navigation

← Previous Changeset
Next Changeset →

Changeset 10380

Timestamp:

Apr 22, 2015, 10:30:42 PM (10 years ago)

Author:

landauf

Message:

registered missing classes.
WorldEntityCollisionShape is the only class which was really missing, all other classes are singletons or part of the framework.

Location:

code/branches/core7/src

Files:

: 29 edited

libraries/core/GUIManager.cc (modified) (1 diff)
libraries/core/Game.cc (modified) (1 diff)
libraries/core/GraphicsManager.cc (modified) (1 diff)
libraries/core/input/InputManager.cc (modified) (1 diff)
libraries/core/input/JoyStickQuantityListener.cc (modified) (1 diff)
libraries/core/input/KeyBinder.cc (modified) (1 diff)
libraries/core/input/KeyBinderManager.cc (modified) (1 diff)
libraries/core/input/KeyDetector.cc (modified) (1 diff)
libraries/core/input/Mouse.cc (modified) (1 diff)
libraries/network/Host.cc (modified) (1 diff)
modules/designtools/ScreenshotManager.cc (modified) (1 diff)
modules/designtools/SkyboxGenerator.cc (modified) (1 diff)
modules/notifications/NotificationManager.cc (modified) (1 diff)
modules/pickup/PickupManager.cc (modified) (1 diff)
orxonox/LevelManager.cc (modified) (1 diff)
orxonox/MoodManager.cc (modified) (1 diff)
orxonox/PawnManager.cc (modified) (1 diff)
orxonox/PlayerManager.cc (modified) (1 diff)
orxonox/ShipPartManager.cc (modified) (1 diff)
orxonox/chat/ChatHistory.cc (modified) (1 diff)
orxonox/chat/ChatInputHandler.cc (modified) (1 diff)
orxonox/chat/ChatManager.cc (modified) (1 diff)
orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) (1 diff)
orxonox/gamestates/GSMainMenu.cc (modified) (1 diff)
orxonox/interfaces/NotificationListener.cc (modified) (1 diff)
orxonox/interfaces/PickupListener.cc (modified) (1 diff)
orxonox/overlays/InGameConsole.cc (modified) (1 diff)
orxonox/sound/AmbientSound.cc (modified) (1 diff)
orxonox/sound/SoundManager.cc (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

code/branches/core7/src/libraries/core/GUIManager.cc

r10347	r10380
255	255	SetConsoleCommand("toggleGUI", &GUIManager::toggleGUI).defaultValue(1, false).defaultValue(2, false);
256	256
	257	RegisterAbstractClass(GUIManager).inheritsFrom<WindowEventListener>();
	258
257	259	/**
258	260	@brief

code/branches/core7/src/libraries/core/Game.cc

r10347	r10380
77	77	};
78	78
	79	RegisterAbstractClass(Game).inheritsFrom<Configurable>();
	80
79	81	Game::Game(const std::string& cmdLine)
80	82	: gameClock_(NULL)

code/branches/core7/src/libraries/core/GraphicsManager.cc

r10347	r10380
93	93
94	94	GraphicsManager* GraphicsManager::singletonPtr_s = 0;
	95
	96	RegisterAbstractClass(GraphicsManager).inheritsFrom<Configurable>();
95	97
96	98	GraphicsManager::GraphicsManager(bool bLoadRenderer)

code/branches/core7/src/libraries/core/input/InputManager.cc

r10347	r10380
86	86	}
87	87
	88	RegisterAbstractClass(InputManager).inheritsFrom<WindowEventListener>();
	89
88	90	// ############################################################
89	91	// ##### Initialisation #####

code/branches/core7/src/libraries/core/input/JoyStickQuantityListener.cc

r9667	r10380
36	36	std::vector<JoyStick*> JoyStickQuantityListener::joyStickList_s;
37	37
	38	RegisterAbstractClass(JoyStickQuantityListener).inheritsFrom<Listable>();
	39
38	40	JoyStickQuantityListener::JoyStickQuantityListener()
39	41	{

code/branches/core7/src/libraries/core/input/KeyBinder.cc

r9667	r10380
43	43	namespace orxonox
44	44	{
	45	RegisterAbstractClass(KeyBinder).inheritsFrom<JoyStickQuantityListener>();
	46
45	47	/**
46	48	@brief

code/branches/core7/src/libraries/core/input/KeyBinderManager.cc

r10347	r10380
52	52	SetConsoleCommand(__CC_unbind_name, &KeyBinderManager::unbind).defaultValues("");
53	53	SetConsoleCommand(__CC_tunbind_name, &KeyBinderManager::tunbind).defaultValues("");
	54
	55	RegisterAbstractClass(KeyBinderManager).inheritsFrom<Configurable>();
54	56
55	57	KeyBinderManager::KeyBinderManager()

code/branches/core7/src/libraries/core/input/KeyDetector.cc

r10347	r10380
43	43	DeclareConsoleCommand(__CC_KeyDetector_callback_name, &prototype::void__string).hide();
44	44
	45	RegisterAbstractClass(KeyDetector).inheritsFrom<KeyBinder>();
	46
45	47	KeyDetector::KeyDetector()
46	48	: KeyBinder("")

code/branches/core7/src/libraries/core/input/Mouse.cc

r10347	r10380
50	50	SetConsoleCommand(__CC_Mouse_name, __CC_ungrab_name, &Mouse::ungrab);
51	51	#endif
	52
	53	RegisterAbstractClass(Mouse).inheritsFrom<WindowEventListener>();
52	54
53	55	Mouse::Mouse(unsigned int id, OIS::InputManager* oisInputManager)

code/branches/core7/src/libraries/network/Host.cc

r10347	r10380
143	143	//////////////////////////////////////////////////////////////////////////
144	144
	145	RegisterAbstractClass(NetworkChatListener).inheritsFrom<Listable>();
	146
145	147	NetworkChatListener::NetworkChatListener()
146	148	{

code/branches/core7/src/modules/designtools/ScreenshotManager.cc

r10347	r10380
63	63	ManageScopedSingleton(ScreenshotManager, ScopeID::Graphics, false);
64	64
	65	RegisterAbstractClass(ScreenshotManager).inheritsFrom<Configurable>();
	66
65	67	/**
66	68	@brief

code/branches/core7/src/modules/designtools/SkyboxGenerator.cc

r10347	r10380
61	61
62	62	ManageScopedSingleton(SkyboxGenerator, ScopeID::Graphics, false);
	63
	64	RegisterAbstractClass(SkyboxGenerator).inheritsFrom<Configurable>().inheritsFrom<Tickable>();
63	65
64	66	/**

code/branches/core7/src/modules/notifications/NotificationManager.cc

r9667	r10380
48	48
49	49	ManageScopedSingleton(NotificationManager, ScopeID::Root, false);
	50
	51	RegisterAbstractClass(NotificationManager).inheritsFrom<NotificationListener>();
50	52
51	53	/**

code/branches/core7/src/modules/pickup/PickupManager.cc

r9667	r10380
61	61	registerStaticNetworkFunction(PickupManager::dropPickupNetworked);
62	62	registerStaticNetworkFunction(PickupManager::usePickupNetworked);
	63
	64	RegisterAbstractClass(PickupManager).inheritsFrom<PickupListener>();
63	65
64	66	/**

code/branches/core7/src/orxonox/LevelManager.cc

r10345	r10380
53	53	ManageScopedSingleton(LevelManager, ScopeID::Root, false);
54	54
	55	RegisterAbstractClass(LevelManager).inheritsFrom<Configurable>();
	56
55	57	/**
56	58	@brief

code/branches/core7/src/orxonox/MoodManager.cc

-                      r9667
+                      r10380
     // Note: I'm (Kevin Young) not entirely sure whether that's good code style:
     const std::string MoodManager::defaultMood_ = "default";
+    RegisterAbstractClass(MoodListener).inheritsFrom<OrxonoxInterface>();
+    RegisterAbstractClass(MoodManager).inheritsFrom<Configurable>();
     MoodManager::MoodManager()

code/branches/core7/src/orxonox/PawnManager.cc

r9667	r10380
37	37	ManageScopedSingleton(PawnManager, ScopeID::Root, false);
38	38
	39	RegisterAbstractClass(PawnManager).inheritsFrom<Tickable>();
	40
39	41	PawnManager::PawnManager()
40	42	{

code/branches/core7/src/orxonox/PlayerManager.cc

r9667	r10380
40	40	{
41	41	ManageScopedSingleton(PlayerManager, ScopeID::Root, false);
	42
	43	RegisterAbstractClass(PlayerManager).inheritsFrom<ClientConnectionListener>();
42	44
43	45	PlayerManager::PlayerManager()

code/branches/core7/src/orxonox/ShipPartManager.cc

r10262	r10380
37	37	ManageScopedSingleton(ShipPartManager, ScopeID::Root, false);
38	38
	39	RegisterAbstractClass(ShipPartManager).inheritsFrom<Tickable>();
	40
39	41	ShipPartManager::ShipPartManager()
40	42	{

code/branches/core7/src/orxonox/chat/ChatHistory.cc

-                      r9667
+                      r10380
   /* singleton */
   ManageScopedSingleton( ChatHistory, ScopeID::Root, false );
+  RegisterAbstractClass(ChatHistory).inheritsFrom<ChatListener>();
 #endif

code/branches/core7/src/orxonox/chat/ChatInputHandler.cc

r10347	r10380
68	68	SetConsoleCommand( "startchat_small", &ChatInputHandler::activate_small_static );
69	69
	70	RegisterAbstractClass(ChatInputHandler).inheritsFrom<ChatListener>();
	71
70	72	/* constructor */
71	73	ChatInputHandler::ChatInputHandler()

code/branches/core7/src/orxonox/chat/ChatManager.cc

r10362	r10380
43	43
44	44	SetConsoleCommand("chat", &ChatManager::chat).defaultValue(1, NETWORK_PEER_ID_BROADCAST);
	45
	46	RegisterAbstractClass(ChatManager).inheritsFrom<NetworkChatListener>();
45	47
46	48	ChatManager::ChatManager()

code/branches/core7/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc

r9667	r10380
37	37	namespace orxonox
38	38	{
	39	RegisterClass(WorldEntityCollisionShape);
	40
39	41	WorldEntityCollisionShape::WorldEntityCollisionShape(Context* context) : CompoundCollisionShape(context)
40	42	{

code/branches/core7/src/orxonox/gamestates/GSMainMenu.cc

r10347	r10380
63	63	SetConsoleCommand(__CC_setMainMenuSoundPath_name, &GSMainMenu::setMainMenuSoundPath).hide();
64	64
	65	RegisterAbstractClass(GSMainMenu).inheritsFrom<Configurable>();
	66
65	67	GSMainMenu::GSMainMenu(const GameStateInfo& info)
66	68	: GameState(info)

code/branches/core7/src/orxonox/interfaces/NotificationListener.cc

r9667	r10380
51	51	registerStaticNetworkFunction(NotificationListener::sendHelper);
52	52
	53	RegisterAbstractClass(NotificationListener).inheritsFrom<OrxonoxInterface>();
	54
53	55	NotificationListener::NotificationListener()
54	56	{

code/branches/core7/src/orxonox/interfaces/PickupListener.cc

r9667	r10380
40	40	namespace orxonox
41	41	{
	42	RegisterAbstractClass(PickupListener).inheritsFrom<OrxonoxInterface>();
42	43
43	44	/**

code/branches/core7/src/orxonox/overlays/InGameConsole.cc

r10347	r10380
67	67	ManageScopedSingleton(InGameConsole, ScopeID::Graphics, false);
68	68
	69	RegisterAbstractClass(InGameConsole).inheritsFrom<WindowEventListener>();
	70
69	71	/**
70	72	@brief Constructor: Creates and initializes the InGameConsole.

code/branches/core7/src/orxonox/sound/AmbientSound.cc

r9939	r10380
36	36	namespace orxonox
37	37	{
	38	RegisterAbstractClass(AmbientSound).inheritsFrom<BaseSound>().inheritsFrom<MoodListener>();
	39
38	40	AmbientSound::AmbientSound()
39	41	: bPlayOnLoad_(false)

code/branches/core7/src/orxonox/sound/SoundManager.cc

r9939	r10380
66	66	}
67	67
	68	RegisterAbstractClass(SoundManager).inheritsFrom<Configurable>();
	69
68	70	SoundManager::SoundManager()
69	71	: effectsPoolSize_(0)

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 10380

Legend:

Download in other formats: