flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-26 10:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #317 Adding joystick support to input manager

Browse Source
This commit is contained in:
Roland Winklmeier
2014-07-31 01:15:41 +02:00
parent 78cab16a3d
commit 9283ecdd9d
3 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries.pri
View File

@@ -23,6 +23,10 @@ blacksound {
blackinput { blackinput {
LIBS += -lblackinput LIBS += -lblackinput
win32 {
LIBS += -ldxguid -lole32 -ldinput8 -lUser32
}
} }
blacksim { blacksim {

25
src/blackcore/input_manager.cpp
View File

@@ -15,10 +15,13 @@ namespace BlackCore
CInputManager::CInputManager(QObject *parent) : CInputManager::CInputManager(QObject *parent) :
QObject(parent), QObject(parent),
m_keyboard(IKeyboard::getInstance()) m_keyboard(IKeyboard::getInstance()),
m_joystick(IJoystick::getInstance())
{ {
connect(m_keyboard, &IKeyboard::keyUp, this, &CInputManager::ps_processKeyboardKeyUp); connect(m_keyboard, &IKeyboard::keyUp, this, &CInputManager::ps_processKeyboardKeyUp);
connect(m_keyboard, &IKeyboard::keyDown, this, &CInputManager::ps_processKeyboardKeyDown); connect(m_keyboard, &IKeyboard::keyDown, this, &CInputManager::ps_processKeyboardKeyDown);
connect(m_joystick, &IJoystick::buttonUp, this, &CInputManager::ps_processJoystickButtonUp);
connect(m_joystick, &IJoystick::buttonDown, this, &CInputManager::ps_processJoystickButtonDown);
} }
CInputManager *CInputManager::getInstance() CInputManager *CInputManager::getInstance()
@@ -62,6 +65,26 @@ namespace BlackCore
callFunctionsBy(hotkeyFunc, false); callFunctionsBy(hotkeyFunc, false);
} }
void CInputManager::ps_processJoystickButtonDown(const CJoystickButton &button)
{
qDebug() << "Pressed Button" << button.getButtonIndex();
if (!m_hashJoystickKeyFunctions.contains(button)) return;
// Get configured hotkey function
CHotkeyFunction hotkeyFunc = m_hashJoystickKeyFunctions.value(button);
callFunctionsBy(hotkeyFunc, true);
}
void CInputManager::ps_processJoystickButtonUp(const CJoystickButton &button)
{
qDebug() << "Released Button" << button.getButtonIndex();
if (!m_hashJoystickKeyFunctions.contains(button)) return;
// Get configured hotkey function
CHotkeyFunction hotkeyFunc = m_hashJoystickKeyFunctions.value(button);
callFunctionsBy(hotkeyFunc, false);
}
void CInputManager::callFunctionsBy(const CHotkeyFunction &hotkeyFunction, bool isKeyDown) void CInputManager::callFunctionsBy(const CHotkeyFunction &hotkeyFunction, bool isKeyDown)
{ {
if (!m_hashRegisteredFunctions.contains(hotkeyFunction)) return; if (!m_hashRegisteredFunctions.contains(hotkeyFunction)) return;

8
src/blackcore/input_manager.h
View File

@@ -7,7 +7,9 @@
#define BLACKCORE_INPUTMANAGER_H #define BLACKCORE_INPUTMANAGER_H
#include "blackinput/keyboard.h" #include "blackinput/keyboard.h"
#include "blackinput/joystick.h"
#include "blackmisc/hwkeyboardkeylist.h" #include "blackmisc/hwkeyboardkeylist.h"
#include "blackmisc/hwjoystickbutton.h"
#include "blackmisc/hotkeyfunction.h" #include "blackmisc/hotkeyfunction.h"
#include "blackmisc/setkeyboardhotkeylist.h" #include "blackmisc/setkeyboardhotkeylist.h"
#include <QObject> #include <QObject>
@@ -84,6 +86,10 @@ namespace BlackCore
void ps_processKeyboardKeyUp(const BlackMisc::Hardware::CKeyboardKey &); void ps_processKeyboardKeyUp(const BlackMisc::Hardware::CKeyboardKey &);
void ps_processJoystickButtonDown(const BlackMisc::Hardware::CJoystickButton &button);
void ps_processJoystickButtonUp(const BlackMisc::Hardware::CJoystickButton &button);
private: private:
RegistrationHandle registerHotkeyFuncImpl(const BlackMisc::CHotkeyFunction &hotkeyFunction, QObject *receiver, std::function<void(bool)> function); RegistrationHandle registerHotkeyFuncImpl(const BlackMisc::CHotkeyFunction &hotkeyFunction, QObject *receiver, std::function<void(bool)> function);
@@ -91,9 +97,11 @@ namespace BlackCore
static CInputManager *m_instance; static CInputManager *m_instance;
BlackInput::IKeyboard *m_keyboard = nullptr; BlackInput::IKeyboard *m_keyboard = nullptr;
BlackInput::IJoystick *m_joystick = nullptr;
QHash<BlackMisc::CHotkeyFunction, std::function<void(bool)> > m_hashRegisteredFunctions; QHash<BlackMisc::CHotkeyFunction, std::function<void(bool)> > m_hashRegisteredFunctions;
QHash<BlackMisc::Hardware::CKeyboardKey, BlackMisc::CHotkeyFunction> m_hashKeyboardKeyFunctions; QHash<BlackMisc::Hardware::CKeyboardKey, BlackMisc::CHotkeyFunction> m_hashKeyboardKeyFunctions;
QHash<BlackMisc::Hardware::CJoystickButton, BlackMisc::CHotkeyFunction> m_hashJoystickKeyFunctions;
}; };
} }