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

coding standard fixes

Browse source
This commit is contained in:
Sam Gondelman 2015-06-16 10:25:30 -07:00
parent 68a08d969d
commit 1ecc954656
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/devices/Joystick.cpp
View file

@ -17,7 +17,7 @@
#include "Joystick.h" #include "Joystick.h"
const float CONTROLLER_THRESHOLD = .25f; const float CONTROLLER_THRESHOLD = 0.25f;
#ifdef HAVE_SDL2 #ifdef HAVE_SDL2
const float MAX_AXIS = 32768.0f; const float MAX_AXIS = 32768.0f;
@ -147,7 +147,7 @@ void Joystick::registerToUserInputMapper(UserInputMapper& mapper) {
void Joystick::assignDefaultInputMapping(UserInputMapper& mapper) { void Joystick::assignDefaultInputMapping(UserInputMapper& mapper) {
#ifdef HAVE_SDL2 #ifdef HAVE_SDL2
const float JOYSTICK_MOVE_SPEED = 1.0f; const float JOYSTICK_MOVE_SPEED = 1.0f;
const float DPAD_MOVE_SPEED = .5f; const float DPAD_MOVE_SPEED = 0.5f;
const float JOYSTICK_YAW_SPEED = 0.5f; const float JOYSTICK_YAW_SPEED = 0.5f;
const float JOYSTICK_PITCH_SPEED = 0.25f; const float JOYSTICK_PITCH_SPEED = 0.25f;
const float BOOM_SPEED = 0.1f; const float BOOM_SPEED = 0.1f;

4
interface/src/devices/SixenseManager.cpp
View file

@ -161,7 +161,7 @@ void SixenseManager::update(float deltaTime) {
if (sixenseGetNumActiveControllers() == 0) { if (sixenseGetNumActiveControllers() == 0) {
_hydrasConnected = false; _hydrasConnected = false;
if (_deviceID) { if (_deviceID != 0) {
Application::getUserInputMapper()->removeDevice(_deviceID); Application::getUserInputMapper()->removeDevice(_deviceID);
_deviceID = 0; _deviceID = 0;
if (_prevPalms[0]) { if (_prevPalms[0]) {
@ -704,7 +704,7 @@ void SixenseManager::assignDefaultInputMapping(UserInputMapper& mapper) {
const float JOYSTICK_YAW_SPEED = 0.5f; const float JOYSTICK_YAW_SPEED = 0.5f;
const float JOYSTICK_PITCH_SPEED = 0.25f; const float JOYSTICK_PITCH_SPEED = 0.25f;
const float BUTTON_MOVE_SPEED = 1.0f; const float BUTTON_MOVE_SPEED = 1.0f;
const float BOOM_SPEED = .1f; const float BOOM_SPEED = 0.1f;
// Left Joystick: Movement, strafing // Left Joystick: Movement, strafing
mapper.addInputChannel(UserInputMapper::LONGITUDINAL_FORWARD, makeInput(AXIS_Y_POS, 0), JOYSTICK_MOVE_SPEED); mapper.addInputChannel(UserInputMapper::LONGITUDINAL_FORWARD, makeInput(AXIS_Y_POS, 0), JOYSTICK_MOVE_SPEED);