Changeset 10380 for code/branches/core7/src/libraries/core/input

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/libraries/core/input

Files:

• InputManager.cc (modified) (1 diff)
• JoyStickQuantityListener.cc (modified) (1 diff)
• KeyBinder.cc (modified) (1 diff)
• KeyBinderManager.cc (modified) (1 diff)
• KeyDetector.cc (modified) (1 diff)
• Mouse.cc (modified) (1 diff)

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

@@ -86 +86 @@
     }
 
+    RegisterAbstractClass(InputManager).inheritsFrom<WindowEventListener>();
+
     // ############################################################
     // #####                  Initialisation                  #####

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

@@ -36 +36 @@
     std::vector<JoyStick*> JoyStickQuantityListener::joyStickList_s;
 
+    RegisterAbstractClass(JoyStickQuantityListener).inheritsFrom<Listable>();
+
     JoyStickQuantityListener::JoyStickQuantityListener()
     {

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

@@ -43 +43 @@
 namespace orxonox
 {
+    RegisterAbstractClass(KeyBinder).inheritsFrom<JoyStickQuantityListener>();
+
     /**
     @brief

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

@@ -52 +52 @@
     SetConsoleCommand(__CC_unbind_name,   &KeyBinderManager::unbind).defaultValues("");
     SetConsoleCommand(__CC_tunbind_name,  &KeyBinderManager::tunbind).defaultValues("");
+
+    RegisterAbstractClass(KeyBinderManager).inheritsFrom<Configurable>();
 
     KeyBinderManager::KeyBinderManager()

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

@@ -43 +43 @@
     DeclareConsoleCommand(__CC_KeyDetector_callback_name, &prototype::void__string).hide();
 
+    RegisterAbstractClass(KeyDetector).inheritsFrom<KeyBinder>();
+
     KeyDetector::KeyDetector()
         : KeyBinder("")

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

@@ -50 +50 @@
     SetConsoleCommand(__CC_Mouse_name, __CC_ungrab_name, &Mouse::ungrab);
 #endif
+
+    RegisterAbstractClass(Mouse).inheritsFrom<WindowEventListener>();
 
     Mouse::Mouse(unsigned int id, OIS::InputManager* oisInputManager)