Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 16:23:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

xbox controller works on restart

Browse source
This commit is contained in:
SamGondelman 2016-06-07 15:14:08 -07:00
parent dd97f16728
commit 5daccba235
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/controllers/src/controllers/UserInputMapper.cpp
View file

@ -77,7 +77,7 @@ void UserInputMapper::registerDevice(InputDevice::Pointer device) {
} }
const auto& deviceID = device->_deviceID; const auto& deviceID = device->_deviceID;
//recordDeviceOfType(device->getName()); recordDeviceOfType(device->getName());
qCDebug(controllers) << "Registered input device <" << device->getName() << "> deviceID = " << deviceID; qCDebug(controllers) << "Registered input device <" << device->getName() << "> deviceID = " << deviceID;
@ -126,6 +126,10 @@ void UserInputMapper::removeDevice(int deviceID) {
auto device = proxyEntry->second; auto device = proxyEntry->second;
qCDebug(controllers) << "Unregistering input device <" << device->getName() << "> deviceID = " << deviceID; qCDebug(controllers) << "Unregistering input device <" << device->getName() << "> deviceID = " << deviceID;
if (!_deviceCounts.contains(device->getName())) {
_deviceCounts[device->getName()] -= 1;
}
unloadMappings(device->getDefaultMappingConfigs()); unloadMappings(device->getDefaultMappingConfigs());
auto mappingsEntry = _mappingsByDevice.find(deviceID); auto mappingsEntry = _mappingsByDevice.find(deviceID);

2
libraries/controllers/src/controllers/UserInputMapper.h
View file

@ -142,7 +142,7 @@ namespace controller {
std::vector<float> _lastStandardStates = std::vector<float>(); std::vector<float> _lastStandardStates = std::vector<float>();
int recordDeviceOfType(const QString& deviceName); int recordDeviceOfType(const QString& deviceName);
QHash<const QString&, int> _deviceCounts; QHash<const QString, int> _deviceCounts;
static float getValue(const EndpointPointer& endpoint, bool peek = false); static float getValue(const EndpointPointer& endpoint, bool peek = false);
static Pose getPose(const EndpointPointer& endpoint, bool peek = false); static Pose getPose(const EndpointPointer& endpoint, bool peek = false);

2
plugins/hifiSdl2/src/Joystick.cpp
View file

@ -64,7 +64,7 @@ void Joystick::handleButtonEvent(const SDL_ControllerButtonEvent& event) {
controller::Input::NamedVector Joystick::getAvailableInputs() const { controller::Input::NamedVector Joystick::getAvailableInputs() const {
using namespace controller; using namespace controller;
static const Input::NamedVector availableInputs{ const Input::NamedVector availableInputs{
makePair(A, "A"), makePair(A, "A"),
makePair(B, "B"), makePair(B, "B"),
makePair(X, "X"), makePair(X, "X"),