Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:44:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert last change (fix for invalid DeviceProxy)

Browse source
This commit is contained in:
Andrew Meadows 2015-05-05 14:59:22 -07:00
parent 00bea4d274
commit 0d4d5d024e
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;
for (auto& modifier : modifiersIt->second) {
auto deviceProxy = getDeviceProxy(modifier);
if (deviceProxy && deviceProxy->getButton(modifier, currentTimestamp)) {
if (deviceProxy->getButton(modifier, currentTimestamp)) {
validModifiers.push_back(modifier);
isActiveModifier |= (modifier.getID() == inputMapping._modifier.getID());
}
@ -99,8 +99,8 @@ void UserInputMapper::update(float deltaTime) {
}
// if enabled: default input or all modifiers on
auto deviceProxy = getDeviceProxy(inputID);
if (enabled && deviceProxy) {
if (enabled) {
auto deviceProxy = getDeviceProxy(inputID);
switch (inputMapping._input.getType()) {
case ChannelType::BUTTON: {
_actionStates[channelInput.first] += inputMapping._scale * float(deviceProxy->getButton(inputID, currentTimestamp));// * deltaTime; // weight the impulse by the deltaTime