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

fix crash for NULL deviceProxy

Browse source
This commit is contained in:
Andrew Meadows 2015-05-05 11:05:28 -07:00
parent 61f6139f4f
commit 00bea4d274
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/ui/UserInputMapper.cpp
View file

@ -90,7 +90,7 @@ void UserInputMapper::update(float deltaTime) {
bool isActiveModifier = false; bool isActiveModifier = false;
for (auto& modifier : modifiersIt->second) { for (auto& modifier : modifiersIt->second) {
auto deviceProxy = getDeviceProxy(modifier); auto deviceProxy = getDeviceProxy(modifier);
if (deviceProxy->getButton(modifier, currentTimestamp)) { if (deviceProxy && deviceProxy->getButton(modifier, currentTimestamp)) {
validModifiers.push_back(modifier); validModifiers.push_back(modifier);
isActiveModifier |= (modifier.getID() == inputMapping._modifier.getID()); isActiveModifier |= (modifier.getID() == inputMapping._modifier.getID());
} }
@ -99,8 +99,8 @@ void UserInputMapper::update(float deltaTime) {
} }
// if enabled: default input or all modifiers on // if enabled: default input or all modifiers on
if (enabled) { auto deviceProxy = getDeviceProxy(inputID);
auto deviceProxy = getDeviceProxy(inputID); if (enabled && deviceProxy) {
switch (inputMapping._input.getType()) { switch (inputMapping._input.getType()) {
case ChannelType::BUTTON: { case ChannelType::BUTTON: {
_actionStates[channelInput.first] += inputMapping._scale * float(deviceProxy->getButton(inputID, currentTimestamp));// * deltaTime; // weight the impulse by the deltaTime _actionStates[channelInput.first] += inputMapping._scale * float(deviceProxy->getButton(inputID, currentTimestamp));// * deltaTime; // weight the impulse by the deltaTime