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

Bit of cleanup

Browse source
This commit is contained in:
Atlante45 2015-11-06 11:14:10 -08:00
parent c53c0ec53f
commit e630f3072e
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/controllers/src/controllers/ScriptingInterface.cpp
View file

@ -206,7 +206,7 @@ namespace controller {
void ScriptingInterface::updateMaps() { void ScriptingInterface::updateMaps() {
QVariantMap newHardware; QVariantMap newHardware;
auto userInputMapper = DependencyManager::get<controller::UserInputMapper>(); auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
auto devices = userInputMapper->getDevices(); const auto& devices = userInputMapper->getDevices();
for (const auto& deviceMapping : devices) { for (const auto& deviceMapping : devices) {
auto deviceID = deviceMapping.first; auto deviceID = deviceMapping.first;
if (deviceID != userInputMapper->getStandardDeviceID()) { if (deviceID != userInputMapper->getStandardDeviceID()) {

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

@ -100,7 +100,7 @@ namespace controller {
void setSensorToWorldMat(glm::mat4 sensorToWorldMat) { _sensorToWorldMat = sensorToWorldMat; } void setSensorToWorldMat(glm::mat4 sensorToWorldMat) { _sensorToWorldMat = sensorToWorldMat; }
glm::mat4 getSensorToWorldMat() { return _sensorToWorldMat; } glm::mat4 getSensorToWorldMat() { return _sensorToWorldMat; }
DevicesMap getDevices() { return _registeredDevices; } const DevicesMap& getDevices() { return _registeredDevices; }
uint16 getStandardDeviceID() const { return STANDARD_DEVICE; } uint16 getStandardDeviceID() const { return STANDARD_DEVICE; }
InputDevice::Pointer getStandardDevice() { return _registeredDevices[getStandardDeviceID()]; } InputDevice::Pointer getStandardDevice() { return _registeredDevices[getStandardDeviceID()]; }

2
libraries/input-plugins/src/input-plugins/InputPlugin.cpp
View file

@ -29,7 +29,7 @@ InputPluginList getInputPlugins() {
InputPluginList result; InputPluginList result;
for (int i = 0; PLUGIN_POOL[i]; ++i) { for (int i = 0; PLUGIN_POOL[i]; ++i) {
InputPlugin * plugin = PLUGIN_POOL[i]; InputPlugin* plugin = PLUGIN_POOL[i];
if (plugin->isSupported()) { if (plugin->isSupported()) {
plugin->init(); plugin->init();
result.push_back(InputPluginPointer(plugin)); result.push_back(InputPluginPointer(plugin));