Changeset 10624 for code/trunk/src/libraries/core/input

Timestamp:

Oct 4, 2015, 9:12:21 PM (9 years ago)

Author:

landauf

Message:

merged branch core7 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/input/InputManager.cc (modified) (2 diffs)
• src/libraries/core/input/JoyStick.cc (modified) (1 diff)
• src/libraries/core/input/JoyStickQuantityListener.cc (modified) (1 diff)
• src/libraries/core/input/KeyBinder.cc (modified) (4 diffs)
• src/libraries/core/input/KeyBinderManager.cc (modified) (3 diffs)
• src/libraries/core/input/KeyDetector.cc (modified) (2 diffs)
• src/libraries/core/input/Mouse.cc (modified) (2 diffs)

code/trunk/src/libraries/core/input/InputManager.cc

@@ -48 +48 @@
 #include "core/GraphicsManager.h"
 #include "core/config/ConfigValueIncludes.h"
-#include "core/config/CommandLineParser.h"
-#include "core/command/ConsoleCommand.h"
+#include "core/commandline/CommandLineIncludes.h"
+#include "core/command/ConsoleCommandIncludes.h"
 #include "core/command/Functor.h"
 
@@ -85 +85 @@
         return (lval = (InputManager::State)(lval & rval));
     }
+
+    RegisterAbstractClass(InputManager).inheritsFrom<WindowEventListener>();
 
     // ############################################################

code/trunk/src/libraries/core/input/JoyStick.cc

@@ -47 +47 @@
 
     std::vector<std::string> JoyStick::deviceNames_s;
+
+    RegisterAbstractClass(JoyStick).inheritsFrom<Configurable>();
 
     JoyStick::JoyStick(unsigned int id, OIS::InputManager* oisInputManager)

code/trunk/src/libraries/core/input/JoyStickQuantityListener.cc

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

code/trunk/src/libraries/core/input/KeyBinder.cc

@@ -37 +37 @@
 #include "core/config/ConfigValueIncludes.h"
 #include "core/config/ConfigFile.h"
-#include "core/PathConfig.h"
+#include "core/ApplicationPaths.h"
+#include "core/ConfigurablePaths.h"
 #include "InputCommands.h"
 #include "JoyStick.h"
@@ -43 +44 @@
 namespace orxonox
 {
+    RegisterAbstractClass(KeyBinder).inheritsFrom<JoyStickQuantityListener>();
+
     /**
     @brief
@@ -253 +256 @@
         orxout(internal_info, context::input) << "KeyBinder: Loading key bindings..." << endl;
 
-        this->configFile_ = new ConfigFile(this->filename_, !PathConfig::buildDirectoryRun());
+        this->configFile_ = new ConfigFile(this->filename_, !ApplicationPaths::buildDirectoryRun());
         this->configFile_->load();
 
-        if (PathConfig::buildDirectoryRun())
+        if (ApplicationPaths::buildDirectoryRun())
         {
             // Dev users should have combined key bindings files
-            std::string defaultFilepath(PathConfig::getDataPathString() + ConfigFile::DEFAULT_CONFIG_FOLDER + '/' + this->filename_);
+            std::string defaultFilepath(ConfigurablePaths::getDataPathString() + ConfigFile::DEFAULT_CONFIG_FOLDER + '/' + this->filename_);
             std::ifstream file(defaultFilepath.c_str());
             if (file.is_open())
@@ -287 +290 @@
             addButtonToCommand(binding, it->second);
             std::string str = binding;
-            if (PathConfig::buildDirectoryRun() && binding.empty())
+            if (ApplicationPaths::buildDirectoryRun() && binding.empty())
                 str = "NoBinding";
             it->second->setBinding(this->configFile_, this->fallbackConfigFile_, binding, bTemporary);

code/trunk/src/libraries/core/input/KeyBinderManager.cc

@@ -31 +31 @@
 #include "util/Output.h"
 #include "util/Exception.h"
-#include "util/ScopedSingletonManager.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 #include "core/config/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
 #include "core/LuaState.h"
-#include "core/command/ConsoleCommand.h"
+#include "core/command/ConsoleCommandIncludes.h"
 #include "InputManager.h"
 #include "KeyDetector.h"
@@ -41 +41 @@
 namespace orxonox
 {
-    ManageScopedSingleton(KeyBinderManager, ScopeID::Graphics, false);
+    ManageScopedSingleton(KeyBinderManager, ScopeID::GRAPHICS, false);
 
     static const std::string __CC_keybind_name = "keybind";
@@ -52 +52 @@
     SetConsoleCommand(__CC_unbind_name,   &KeyBinderManager::unbind).defaultValues("");
     SetConsoleCommand(__CC_tunbind_name,  &KeyBinderManager::tunbind).defaultValues("");
+
+    RegisterAbstractClass(KeyBinderManager).inheritsFrom<Configurable>();
 
     KeyBinderManager::KeyBinderManager()

code/trunk/src/libraries/core/input/KeyDetector.cc

@@ -29 +29 @@
 #include "KeyDetector.h"
 
-#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
-#include "core/command/ConsoleCommand.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
+#include "core/command/ConsoleCommandIncludes.h"
 #include "Button.h"
 #include "InputManager.h"
@@ -38 +38 @@
 namespace orxonox
 {
-    ManageScopedSingleton(KeyDetector, ScopeID::Graphics, false);
+    ManageScopedSingleton(KeyDetector, ScopeID::GRAPHICS, false);
 
     static const std::string __CC_KeyDetector_callback_name = "KeyDetectorKeyPressed";
     DeclareConsoleCommand(__CC_KeyDetector_callback_name, &prototype::void__string).hide();
+
+    RegisterAbstractClass(KeyDetector).inheritsFrom<KeyBinder>();
 
     KeyDetector::KeyDetector()

code/trunk/src/libraries/core/input/Mouse.cc

@@ -31 +31 @@
 #include <ois/OISMouse.h>
 #include "core/CoreIncludes.h"
-#include "core/command/ConsoleCommand.h"
+#include "core/command/ConsoleCommandIncludes.h"
 #include "InputState.h"
 
@@ -50 +50 @@
     SetConsoleCommand(__CC_Mouse_name, __CC_ungrab_name, &Mouse::ungrab);
 #endif
+
+    RegisterAbstractClass(Mouse).inheritsFrom<WindowEventListener>();
 
     Mouse::Mouse(unsigned int id, OIS::InputManager* oisInputManager)