Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-08 19:23:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Warning fixes

Browse source
This commit is contained in:
Brad Davis 2015-10-20 10:35:53 -07:00
parent bea6fdd890
commit 22139931f2
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,7 +54,6 @@ controller::ScriptingInterface::ScriptingInterface() {
// FIXME allow custom user actions?
auto actionNames = userInputMapper->getActionNames();
int actionNumber = 0;
qCDebug(controllers) << "Setting up standard actions";
for (const auto& namedInput : userInputMapper->getActionInputs()) {
const QString& actionName = namedInput.second;

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

@ -18,8 +18,6 @@
namespace controller {
const float CONTROLLER_THRESHOLD = 0.3f;
StandardController::StandardController() : InputDevice("Standard") {
_deviceID = UserInputMapper::STANDARD_DEVICE;
}

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

@ -470,7 +470,11 @@ Input UserInputMapper::makeStandardInput(controller::StandardPoseChannel pose) {
return Input(STANDARD_DEVICE, pose, ChannelType::POSE);
}
enum Pass {
HARDWARE_PASS,
STANDARD_PASS,
NUM_PASSES
};
void UserInputMapper::update() {
static auto deviceNames = getDeviceNames();
@ -479,12 +483,9 @@ void UserInputMapper::update() {
EndpointSet readEndpoints;
EndpointSet writtenEndpoints;
static const int HARDWARE_PASS = 0;
static const int STANDARD_PASS = 1;
// Now process the current values for each level of the stack
for (auto& mapping : _activeMappings) {
for (int pass = 0; pass < 2; ++pass) {
for (int pass = HARDWARE_PASS; pass < NUM_PASSES; ++pass) {
for (const auto& mappingEntry : mapping->channelMappings) {
const auto& source = mappingEntry.first;
if (_inputsByEndpoint.count(source)) {
@ -534,7 +535,6 @@ void UserInputMapper::update() {
float value = getValue(source);
// Apply each of the filters.
const auto& filters = route->filters;
for (const auto& filter : route->filters) {
value = filter->apply(value);
}