Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/WolfireGames/overgrowth.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/Source/UserInput/input.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/UserInput/input.cpp')
-rw-r--r--Source/UserInput/input.cpp845
1 files changed, 420 insertions, 425 deletions
diff --git a/Source/UserInput/input.cpp b/Source/UserInput/input.cpp
index aaaacc16..1a0e77e6 100644
--- a/Source/UserInput/input.cpp
+++ b/Source/UserInput/input.cpp
@@ -42,60 +42,59 @@
#include <set>
#include <cctype>
-
extern Timer ui_timer;
-Input::JoystickStruct::JoystickStruct( )
- : joystick( 1.0f )
-{
-
+Input::JoystickStruct::JoystickStruct()
+ : joystick(1.0f) {
}
namespace {
- void StringFromBind(std::string* str, const SDL_GameControllerButtonBind &bind) {
- std::ostringstream oss;
- switch(bind.bindType){
+void StringFromBind(std::string* str, const SDL_GameControllerButtonBind& bind) {
+ std::ostringstream oss;
+ switch (bind.bindType) {
case SDL_CONTROLLER_BINDTYPE_NONE:
- oss << "none"; break;
+ oss << "none";
+ break;
case SDL_CONTROLLER_BINDTYPE_BUTTON:
- oss << "button" << bind.value.button + 1; break;
+ oss << "button" << bind.value.button + 1;
+ break;
case SDL_CONTROLLER_BINDTYPE_AXIS:
- oss << "axis" << bind.value.axis + 1; break;
+ oss << "axis" << bind.value.axis + 1;
+ break;
case SDL_CONTROLLER_BINDTYPE_HAT:
- oss << "hat" << bind.value.hat.hat << " " << bind.value.hat.hat_mask; break;
- }
- *str = oss.str();
+ oss << "hat" << bind.value.hat.hat << " " << bind.value.hat.hat_mask;
+ break;
}
+ *str = oss.str();
+}
- void PrintControllers(const Input::JoystickMap &open_joysticks){
- LOGI << "Current controllers:" << std::endl;
- for(const auto & open_joystick : open_joysticks){
- const Input::RC_JoystickStruct& js = open_joystick.second;
- SDL_Joystick* joystick = (SDL_Joystick*)js.GetConst().sdl_joystick;
- LOGI << "Joystick" << open_joystick.first << "," << SDL_JoystickName(joystick) << std::endl;
- }
+void PrintControllers(const Input::JoystickMap& open_joysticks) {
+ LOGI << "Current controllers:" << std::endl;
+ for (const auto& open_joystick : open_joysticks) {
+ const Input::RC_JoystickStruct& js = open_joystick.second;
+ SDL_Joystick* joystick = (SDL_Joystick*)js.GetConst().sdl_joystick;
+ LOGI << "Joystick" << open_joystick.first << "," << SDL_JoystickName(joystick) << std::endl;
}
-} // namespace ""
-
-Input::Input() :
- ignore_mouse_frame(false),
- num_players_(0),
- quit_requested_(false),
- in_focus_(true),
- grab_mouse_(false),
- invert_x_mouse_look_(false),
- invert_y_mouse_look_(false),
- use_raw_input(false),
- last_controller_event_time(0.0f),
- last_mouse_event_time(0.0f),
- last_keyboard_event_time(0.0f),
- joystick_sequence_id(0),
- allow_controller_input_(true),
- use_controller_input_(false)
-{
+}
+} // namespace
+
+Input::Input() : ignore_mouse_frame(false),
+ num_players_(0),
+ quit_requested_(false),
+ in_focus_(true),
+ grab_mouse_(false),
+ invert_x_mouse_look_(false),
+ invert_y_mouse_look_(false),
+ use_raw_input(false),
+ last_controller_event_time(0.0f),
+ last_mouse_event_time(0.0f),
+ last_keyboard_event_time(0.0f),
+ joystick_sequence_id(0),
+ allow_controller_input_(true),
+ use_controller_input_(false) {
player_inputs_.resize(4);
- //Default to only having one active player input.
+ // Default to only having one active player input.
player_inputs_[0].enabled = true;
player_inputs_[1].enabled = false;
player_inputs_[2].enabled = false;
@@ -111,8 +110,7 @@ void Input::SetInvertYMouseLook(bool val) {
}
void Input::UpdateGamepadLookSensitivity() {
- for(auto & open_joystick : open_joysticks_)
- {
+ for (auto& open_joystick : open_joysticks_) {
char buffer[64];
sprintf(buffer, "gamepad_%i_look_sensitivity", open_joystick.second->player_input);
open_joystick.second->joystick.look_sensitivity_ = config[buffer].toNumber<float>();
@@ -120,16 +118,15 @@ void Input::UpdateGamepadLookSensitivity() {
}
void Input::UpdateGamepadDeadzone() {
- for(auto & open_joystick : open_joysticks_)
- {
+ for (auto& open_joystick : open_joysticks_) {
char buffer[64];
sprintf(buffer, "gamepad_%i_deadzone", open_joystick.second->player_input);
open_joystick.second->joystick.deadzone = config[buffer].toNumber<float>();
}
}
-void Input::OpenJoystick(int index){
- //int num_joysticks = SDL_NumJoysticks();
+void Input::OpenJoystick(int index) {
+ // int num_joysticks = SDL_NumJoysticks();
// If joystick has a GameController definition, extract mapping
SDL_GameControllerButtonBind null_bind;
@@ -137,45 +134,45 @@ void Input::OpenJoystick(int index){
null_bind.value.axis = 0;
std::vector<SDL_GameControllerButtonBind> gamepad_binding;
- if(SDL_IsGameController(index)){
+ if (SDL_IsGameController(index)) {
const char* name = SDL_GameControllerNameForIndex(index);
- LOGI << "Attached controller " << index << ":" << (name ? name : "Unknown Controller") << std::endl;
+ LOGI << "Attached controller " << index << ":" << (name ? name : "Unknown Controller") << std::endl;
SDL_GameController* controller = SDL_GameControllerOpen(index);
- if(!controller){
+ if (!controller) {
LOGW << "Could not open GameController: " << SDL_GetError() << std::endl;
return;
}
gamepad_binding.resize(ControllerInput::NUM_INPUTS, null_bind);
- for(int i=0; i<SDL_CONTROLLER_AXIS_MAX; ++i){
+ for (int i = 0; i < SDL_CONTROLLER_AXIS_MAX; ++i) {
SDL_GameControllerButtonBind bind = SDL_GameControllerGetBindForAxis(controller, (SDL_GameControllerAxis)i);
ControllerInput::Input input = SDLControllerAxisToController((SDL_GameControllerAxis)i);
- if(input != ControllerInput::NONE) {
+ if (input != ControllerInput::NONE) {
gamepad_binding[input] = bind;
}
}
- for(int i=0; i<SDL_CONTROLLER_BUTTON_MAX; ++i){
+ for (int i = 0; i < SDL_CONTROLLER_BUTTON_MAX; ++i) {
SDL_GameControllerButtonBind bind = SDL_GameControllerGetBindForButton(controller, (SDL_GameControllerButton)i);
ControllerInput::Input input = SDLControllerButtonToController((SDL_GameControllerButton)i);
- if(input != ControllerInput::NONE) {
+ if (input != ControllerInput::NONE) {
gamepad_binding[input] = bind;
}
}
- SDL_GameControllerClose(controller);
+ SDL_GameControllerClose(controller);
} else {
- return; // Only handle joysticks that have a GameController entry for now
+ return; // Only handle joysticks that have a GameController entry for now
}
const char* name = SDL_JoystickNameForIndex(index);
- LOGI << "Attached joystick " << index << ":" << (name ? name : "Unknown Joystick") << std::endl;
+ LOGI << "Attached joystick " << index << ":" << (name ? name : "Unknown Joystick") << std::endl;
SDL_Joystick* joystick = SDL_JoystickOpen(index);
- if(!joystick){
- DisplayError("Error","Could not open Joystick");
+ if (!joystick) {
+ DisplayError("Error", "Could not open Joystick");
return;
}
@@ -184,8 +181,8 @@ void Input::OpenJoystick(int index){
RC_JoystickStruct& js = open_joysticks_[id];
js->sdl_joystick = joystick;
js->gamepad_bind = gamepad_binding;
- //char buffer[64];
- //sprintf(buffer, "gamepad%d_deadzone", id);
+ // char buffer[64];
+ // sprintf(buffer, "gamepad%d_deadzone", id);
js->player_input = 0;
js->joystick.deadzone = config["gamepad_0_deadzone"].toNumber<float>();
@@ -200,9 +197,9 @@ void Input::OpenJoystick(int index){
}*/
}
-void Input::CloseJoystick(int instance_id){
+void Input::CloseJoystick(int instance_id) {
JoystickMap::iterator iter = open_joysticks_.find(instance_id);
- if(iter != open_joysticks_.end()){
+ if (iter != open_joysticks_.end()) {
RC_JoystickStruct js = iter->second;
SDL_Joystick* joystick = (SDL_Joystick*)js->sdl_joystick;
SDL_JoystickClose(joystick);
@@ -216,19 +213,19 @@ static void AddGameControllerDB() {
// https://github.com/gabomdq/SDL_GameControllerDB/blob/master/gamecontrollerdb.txt
DiskFileDescriptor file;
std::vector<char> file_buf;
- if(!file.Open("Data/gamecontrollerdb.txt", "r")){
+ if (!file.Open("Data/gamecontrollerdb.txt", "r")) {
return;
}
int file_size = file.GetSize();
file_buf.resize(file_size);
int bytes_read = file.ReadBytesPartial(&file_buf[0], file_size);
- file_buf.resize(bytes_read+1);
+ file_buf.resize(bytes_read + 1);
file_buf.back() = '\0';
file.Close();
SDL_RWops* SDL_file = SDL_RWFromConstMem(&file_buf[0], file_buf.size());
- if(SDL_file){
+ if (SDL_file) {
int mappings = SDL_GameControllerAddMappingsFromRW(SDL_file, 1);
LOGI << "Added " << mappings << " controller mappings." << std::endl;
}
@@ -237,13 +234,13 @@ static void AddGameControllerDB() {
void Input::Initialize() {
InitKeyTranslator();
if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) < 0) {
- FatalError("Error", "Could not initialize SDL_INIT_GAMECONTROLLER");
+ FatalError("Error", "Could not initialize SDL_INIT_GAMECONTROLLER");
}
if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0) {
- FatalError("Error", "Could not initialize SDL_INIT_JOYSTICK");
+ FatalError("Error", "Could not initialize SDL_INIT_JOYSTICK");
}
// if (SDL_InitSubSystem(SDL_INIT_HAPTIC) < 0) {
- // FatalError("Error", "Could not initialize SDL_INIT_HAPTIC");
+ // FatalError("Error", "Could not initialize SDL_INIT_HAPTIC");
// }
AddGameControllerDB();
SDL_JoystickEventState(SDL_ENABLE);
@@ -256,13 +253,13 @@ void Input::Initialize() {
}
void Input::Dispose() {
- for(auto & open_joystick : open_joysticks_){
+ for (auto& open_joystick : open_joysticks_) {
RC_JoystickStruct js = open_joystick.second;
SDL_Joystick* joystick = (SDL_Joystick*)js->sdl_joystick;
- SDL_JoystickClose(joystick);
+ SDL_JoystickClose(joystick);
}
- // SDL_QuitSubSystem(SDL_INIT_HAPTIC);
+ // SDL_QuitSubSystem(SDL_INIT_HAPTIC);
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
}
@@ -272,7 +269,7 @@ bool Input::GetGrabMouse() {
}
void UIShowCursor(bool show) {
- if(show) {
+ if (show) {
SDL_ShowCursor(SDL_ENABLE);
} else {
SDL_ShowCursor(SDL_DISABLE);
@@ -281,9 +278,9 @@ void UIShowCursor(bool show) {
bool UICursorVisible() {
int v = SDL_ShowCursor(SDL_QUERY);
- if( v == SDL_ENABLE ) {
+ if (v == SDL_ENABLE) {
return true;
- } else if( v == SDL_ENABLE ) {
+ } else if (v == SDL_ENABLE) {
return false;
} else {
LOGE << "Mouse show error" << std::endl;
@@ -292,18 +289,15 @@ bool UICursorVisible() {
}
void Input::SetGrabMouse(bool grab) {
- if(grab_mouse_ == grab) return;
- if(grab && in_focus_) {
+ if (grab_mouse_ == grab) return;
+ if (grab && in_focus_) {
grab_mouse_ = true;
Graphics::Instance()->SetWindowGrab(true);
cursor->SetVisible(false);
- if( use_raw_input )
- {
- //If we further wish to do this "correctly" we can use this hint: https://wiki.libsdl.org/SDL_HINT_MOUSE_RELATIVE_MODE_WARP
+ if (use_raw_input) {
+ // If we further wish to do this "correctly" we can use this hint: https://wiki.libsdl.org/SDL_HINT_MOUSE_RELATIVE_MODE_WARP
SDL_SetRelativeMouseMode(SDL_TRUE);
- }
- else
- {
+ } else {
SDL_SetRelativeMouseMode(SDL_FALSE);
}
} else {
@@ -315,268 +309,275 @@ void Input::SetGrabMouse(bool grab) {
}
void Input::HandleEvent(const SDL_Event& event) {
- PROFILER_ZONE(g_profiler_ctx, "Input::HandleEvent");
- //Redirect input events to the controller
- switch( event.type ) {
- case SDL_WINDOWEVENT:
- switch(event.window.event){
- case SDL_WINDOWEVENT_FOCUS_LOST:
- in_focus_ = false;
- break;
- case SDL_WINDOWEVENT_FOCUS_GAINED:
- if(grab_mouse_) {
- Graphics::Instance()->SetWindowGrab(true);
- cursor->SetVisible(false);
- }
- in_focus_ = true;
+ PROFILER_ZONE(g_profiler_ctx, "Input::HandleEvent");
+ // Redirect input events to the controller
+ switch (event.type) {
+ case SDL_WINDOWEVENT:
+ switch (event.window.event) {
+ case SDL_WINDOWEVENT_FOCUS_LOST:
+ in_focus_ = false;
+ break;
+ case SDL_WINDOWEVENT_FOCUS_GAINED:
+ if (grab_mouse_) {
+ Graphics::Instance()->SetWindowGrab(true);
+ cursor->SetVisible(false);
+ }
+ in_focus_ = true;
+ break;
+ }
break;
- } break;
- case SDL_MOUSEMOTION:
- if(in_focus_){
- last_mouse_event_time = (float) event.common.timestamp;
- }
- if( use_raw_input ) {
- mouse_.delta_[0] += event.motion.xrel;
- mouse_.delta_[1] += event.motion.yrel;
- mouse_.pos_[0] = event.motion.x;
- mouse_.pos_[1] = event.motion.y;
- } else {
- int width;
- int height;
- SDL_GetWindowSize(Graphics::Instance()->sdl_window_, &width, &height);
- if(!grab_mouse_ || event.motion.x != width/2 || event.motion.y != height/2){
+ case SDL_MOUSEMOTION:
+ if (in_focus_) {
+ last_mouse_event_time = (float)event.common.timestamp;
+ }
+ if (use_raw_input) {
mouse_.delta_[0] += event.motion.xrel;
mouse_.delta_[1] += event.motion.yrel;
mouse_.pos_[0] = event.motion.x;
mouse_.pos_[1] = event.motion.y;
+ } else {
+ int width;
+ int height;
+ SDL_GetWindowSize(Graphics::Instance()->sdl_window_, &width, &height);
+ if (!grab_mouse_ || event.motion.x != width / 2 || event.motion.y != height / 2) {
+ mouse_.delta_[0] += event.motion.xrel;
+ mouse_.delta_[1] += event.motion.yrel;
+ mouse_.pos_[0] = event.motion.x;
+ mouse_.pos_[1] = event.motion.y;
+ }
+ if (grab_mouse_ && in_focus_ && (event.motion.x < 100 || event.motion.y < 100 || event.motion.x > width - 100 || event.motion.y > height - 100)) {
+ PROFILER_ZONE(g_profiler_ctx, "WarpMouse");
+ SDL_WarpMouseInWindow(Graphics::Instance()->sdl_window_, width / 2, height / 2);
+ }
}
- if(grab_mouse_ && in_focus_ && (event.motion.x < 100 || event.motion.y < 100 || event.motion.x > width - 100 || event.motion.y > height - 100) ) {
- PROFILER_ZONE(g_profiler_ctx, "WarpMouse");
- SDL_WarpMouseInWindow(Graphics::Instance()->sdl_window_, width/2, height/2);
+ break;
+ case SDL_MOUSEBUTTONDOWN:
+ if (in_focus_) {
+ last_mouse_event_time = (float)event.common.timestamp;
+ }
+ if (!ignore_mouse_frame) {
+ HandleMouseButtonDown(event.button.button, event.button.clicks);
+ }
+ break;
+ case SDL_MOUSEWHEEL:
+ if (in_focus_) {
+ last_mouse_event_time = (float)event.common.timestamp;
+ }
+ if (!ignore_mouse_frame) {
+ mouse_.MouseWheelEvent(event.wheel.x, event.wheel.y);
+ }
+ break;
+ case SDL_MOUSEBUTTONUP: {
+ if (in_focus_) {
+ last_mouse_event_time = (float)event.common.timestamp;
+ }
+ if (!ignore_mouse_frame) {
+ HandleMouseButtonUp(event.button.button);
}
- }
- break;
- case SDL_MOUSEBUTTONDOWN:
- if(in_focus_){
- last_mouse_event_time = (float) event.common.timestamp;
- }
- if(!ignore_mouse_frame){
- HandleMouseButtonDown(event.button.button, event.button.clicks);
- }
- break;
- case SDL_MOUSEWHEEL:
- if(in_focus_){
- last_mouse_event_time = (float) event.common.timestamp;
- }
- if(!ignore_mouse_frame){
- mouse_.MouseWheelEvent(event.wheel.x, event.wheel.y);
- }
- break;
- case SDL_MOUSEBUTTONUP:{
- if(in_focus_){
- last_mouse_event_time = (float) event.common.timestamp;
- }
- if(!ignore_mouse_frame){
- HandleMouseButtonUp(event.button.button);
- }
- break;}
- case SDL_KEYDOWN: {
- if(in_focus_){
- last_keyboard_event_time = (float) event.common.timestamp;
- }
- const SDL_Keysym &keysym = event.key.keysym;
- const SDL_Scancode &scancode = keysym.scancode;
- const SDL_Keycode &sdl_key = keysym.sym;
-
- if(scancode == StringToSDLScancode(bindings_["key"]["rclick"])){
- HandleMouseButtonDown(3, 1);
break;
}
+ case SDL_KEYDOWN: {
+ if (in_focus_) {
+ last_keyboard_event_time = (float)event.common.timestamp;
+ }
+ const SDL_Keysym& keysym = event.key.keysym;
+ const SDL_Scancode& scancode = keysym.scancode;
+ const SDL_Keycode& sdl_key = keysym.sym;
+
+ if (scancode == StringToSDLScancode(bindings_["key"]["rclick"])) {
+ HandleMouseButtonDown(3, 1);
+ break;
+ }
- if( event.key.repeat == false ) {
- keyboard_.handleKeyDownFirst( keysym );
+ if (event.key.repeat == false) {
+ keyboard_.handleKeyDownFirst(keysym);
+ }
+ keyboard_.handleKeyDown(keysym);
+ KeyCommand::HandleKeyDownEvent(keyboard_, keysym);
+ // printf("Keydown: %s\n", SDLKeyToString(sdl_key));
+ break;
}
- keyboard_.handleKeyDown( keysym );
- KeyCommand::HandleKeyDownEvent(keyboard_, keysym);
- //printf("Keydown: %s\n", SDLKeyToString(sdl_key));
- break;}
- case SDL_KEYUP: {
- if(in_focus_){
- last_keyboard_event_time = (float) event.common.timestamp;
- }
- const SDL_Keysym &keysym = event.key.keysym;
- const SDL_Scancode &scancode = keysym.scancode;
- const SDL_Keycode &sdl_key = keysym.sym;
- if(scancode == StringToSDLScancode(bindings_["key"]["rclick"])){
- HandleMouseButtonUp(3);
+ case SDL_KEYUP: {
+ if (in_focus_) {
+ last_keyboard_event_time = (float)event.common.timestamp;
+ }
+ const SDL_Keysym& keysym = event.key.keysym;
+ const SDL_Scancode& scancode = keysym.scancode;
+ const SDL_Keycode& sdl_key = keysym.sym;
+ if (scancode == StringToSDLScancode(bindings_["key"]["rclick"])) {
+ HandleMouseButtonUp(3);
+ break;
+ }
+ keyboard_.handleKeyUp(keysym);
break;
}
- keyboard_.handleKeyUp( keysym );
- break;}
- case SDL_JOYAXISMOTION:{
- if(in_focus_){
- last_controller_event_time = (float) event.common.timestamp;
- }
- SDL_JoyAxisEvent *sdl_joy = (SDL_JoyAxisEvent *) &event.jaxis;
- JoystickMap::iterator iter = open_joysticks_.find(sdl_joy->which);
- if(iter != open_joysticks_.end()){
- const std::vector<SDL_GameControllerButtonBind>& gamepad_bind = iter->second->gamepad_bind;
- // TODO: Replace for-loop with constant-time lookup?
- for(size_t i = 0; i < gamepad_bind.size(); ++i) {
- if(gamepad_bind[i].bindType == SDL_CONTROLLER_BINDTYPE_AXIS && gamepad_bind[i].value.axis == sdl_joy->axis) {
- ControllerInput::Input input = (ControllerInput::Input)i;
- ControllerInput::Input opposite_input = ControllerInput::NONE;
- switch(input) {
- case ControllerInput::L_STICK_X:
- input = (sdl_joy->value >= 0.0f ? ControllerInput::L_STICK_XP : ControllerInput::L_STICK_XN);
- opposite_input = (sdl_joy->value < 0.0f ? ControllerInput::L_STICK_XP : ControllerInput::L_STICK_XN);
- break;
- case ControllerInput::L_STICK_Y:
- input = (sdl_joy->value >= 0.0f ? ControllerInput::L_STICK_YP : ControllerInput::L_STICK_YN);
- opposite_input = (sdl_joy->value < 0.0f ? ControllerInput::L_STICK_YP : ControllerInput::L_STICK_YN);
- break;
- case ControllerInput::R_STICK_X:
- input = (sdl_joy->value >= 0.0f ? ControllerInput::R_STICK_XP : ControllerInput::R_STICK_XN);
- opposite_input = (sdl_joy->value < 0.0f ? ControllerInput::R_STICK_XP : ControllerInput::R_STICK_XN);
- break;
- case ControllerInput::R_STICK_Y:
- input = (sdl_joy->value >= 0.0f ? ControllerInput::R_STICK_YP : ControllerInput::R_STICK_YN);
- opposite_input = (sdl_joy->value < 0.0f ? ControllerInput::R_STICK_YP : ControllerInput::R_STICK_YN);
- break;
- case ControllerInput::L_TRIGGER:
- case ControllerInput::R_TRIGGER:
- // Remap triggers from {-X, X} to { 0, X }
- sdl_joy->value = ((sdl_joy->value + 32767) / 2);
- break;
- default:
- break;
- }
- joystick_sequence_id += iter->second->joystick.HandleInputChange(input, sdl_joy->value, joystick_sequence_id);
- if(opposite_input != ControllerInput::NONE) {
- joystick_sequence_id += iter->second->joystick.HandleInputChange(opposite_input, 0.0f, joystick_sequence_id);
+ case SDL_JOYAXISMOTION: {
+ if (in_focus_) {
+ last_controller_event_time = (float)event.common.timestamp;
+ }
+ SDL_JoyAxisEvent* sdl_joy = (SDL_JoyAxisEvent*)&event.jaxis;
+ JoystickMap::iterator iter = open_joysticks_.find(sdl_joy->which);
+ if (iter != open_joysticks_.end()) {
+ const std::vector<SDL_GameControllerButtonBind>& gamepad_bind = iter->second->gamepad_bind;
+ // TODO: Replace for-loop with constant-time lookup?
+ for (size_t i = 0; i < gamepad_bind.size(); ++i) {
+ if (gamepad_bind[i].bindType == SDL_CONTROLLER_BINDTYPE_AXIS && gamepad_bind[i].value.axis == sdl_joy->axis) {
+ ControllerInput::Input input = (ControllerInput::Input)i;
+ ControllerInput::Input opposite_input = ControllerInput::NONE;
+ switch (input) {
+ case ControllerInput::L_STICK_X:
+ input = (sdl_joy->value >= 0.0f ? ControllerInput::L_STICK_XP : ControllerInput::L_STICK_XN);
+ opposite_input = (sdl_joy->value < 0.0f ? ControllerInput::L_STICK_XP : ControllerInput::L_STICK_XN);
+ break;
+ case ControllerInput::L_STICK_Y:
+ input = (sdl_joy->value >= 0.0f ? ControllerInput::L_STICK_YP : ControllerInput::L_STICK_YN);
+ opposite_input = (sdl_joy->value < 0.0f ? ControllerInput::L_STICK_YP : ControllerInput::L_STICK_YN);
+ break;
+ case ControllerInput::R_STICK_X:
+ input = (sdl_joy->value >= 0.0f ? ControllerInput::R_STICK_XP : ControllerInput::R_STICK_XN);
+ opposite_input = (sdl_joy->value < 0.0f ? ControllerInput::R_STICK_XP : ControllerInput::R_STICK_XN);
+ break;
+ case ControllerInput::R_STICK_Y:
+ input = (sdl_joy->value >= 0.0f ? ControllerInput::R_STICK_YP : ControllerInput::R_STICK_YN);
+ opposite_input = (sdl_joy->value < 0.0f ? ControllerInput::R_STICK_YP : ControllerInput::R_STICK_YN);
+ break;
+ case ControllerInput::L_TRIGGER:
+ case ControllerInput::R_TRIGGER:
+ // Remap triggers from {-X, X} to { 0, X }
+ sdl_joy->value = ((sdl_joy->value + 32767) / 2);
+ break;
+ default:
+ break;
+ }
+ joystick_sequence_id += iter->second->joystick.HandleInputChange(input, sdl_joy->value, joystick_sequence_id);
+ if (opposite_input != ControllerInput::NONE) {
+ joystick_sequence_id += iter->second->joystick.HandleInputChange(opposite_input, 0.0f, joystick_sequence_id);
+ }
+ break;
}
- break;
}
}
+ break;
}
- break;}
- case SDL_JOYBUTTONDOWN:
- case SDL_JOYBUTTONUP:{
- if(in_focus_){
- last_controller_event_time = (float) event.common.timestamp;
- }
- SDL_JoyButtonEvent *button = (SDL_JoyButtonEvent *) &event.jbutton;
- JoystickMap::iterator iter = open_joysticks_.find(button->which);
- if(iter != open_joysticks_.end()){
- // TODO: Replace for-loop with constant-time lookup?
- const std::vector<SDL_GameControllerButtonBind>& gamepad_bind = iter->second->gamepad_bind;
- for(size_t i = 0; i < gamepad_bind.size(); ++i) {
- if(gamepad_bind[i].bindType == SDL_CONTROLLER_BINDTYPE_BUTTON && gamepad_bind[i].value.button == button->button){
- joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, (button->state == SDL_PRESSED), joystick_sequence_id);
- break;
+ case SDL_JOYBUTTONDOWN:
+ case SDL_JOYBUTTONUP: {
+ if (in_focus_) {
+ last_controller_event_time = (float)event.common.timestamp;
+ }
+ SDL_JoyButtonEvent* button = (SDL_JoyButtonEvent*)&event.jbutton;
+ JoystickMap::iterator iter = open_joysticks_.find(button->which);
+ if (iter != open_joysticks_.end()) {
+ // TODO: Replace for-loop with constant-time lookup?
+ const std::vector<SDL_GameControllerButtonBind>& gamepad_bind = iter->second->gamepad_bind;
+ for (size_t i = 0; i < gamepad_bind.size(); ++i) {
+ if (gamepad_bind[i].bindType == SDL_CONTROLLER_BINDTYPE_BUTTON && gamepad_bind[i].value.button == button->button) {
+ joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, (button->state == SDL_PRESSED), joystick_sequence_id);
+ break;
+ }
}
}
+ break;
}
- break;}
- case SDL_JOYHATMOTION:{
- if(in_focus_){
- last_controller_event_time = (float) event.common.timestamp;
- }
- SDL_JoyHatEvent *hat = (SDL_JoyHatEvent*)&event.jhat;
- JoystickMap::iterator iter = open_joysticks_.find(hat->which);
- if(iter != open_joysticks_.end()){
- // TODO: Replace for-loop with constant-time lookup?
- const std::vector<SDL_GameControllerButtonBind>& gamepad_bind = iter->second->gamepad_bind;
- for(size_t i = 0; i < gamepad_bind.size(); ++i) {
- if(gamepad_bind[i].bindType == SDL_CONTROLLER_BINDTYPE_HAT && gamepad_bind[i].value.hat.hat == hat->hat){
- switch(hat->value) {
- case SDL_HAT_LEFTUP:
- if(gamepad_bind[i].value.hat.hat_mask == SDL_HAT_LEFT ||
- gamepad_bind[i].value.hat.hat_mask == SDL_HAT_UP) {
- joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, 1.0f, joystick_sequence_id);
- } else {
- joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, 0.0f, joystick_sequence_id);
- }
- break;
- case SDL_HAT_RIGHTUP:
- if(gamepad_bind[i].value.hat.hat_mask == SDL_HAT_RIGHT ||
- gamepad_bind[i].value.hat.hat_mask == SDL_HAT_UP) {
- joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, 1.0f, joystick_sequence_id);
- } else {
- joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, 0.0f, joystick_sequence_id);
- }
- break;
- case SDL_HAT_LEFTDOWN:
- if(gamepad_bind[i].value.hat.hat_mask == SDL_HAT_LEFT ||
- gamepad_bind[i].value.hat.hat_mask == SDL_HAT_DOWN) {
- joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, 1.0f, joystick_sequence_id);
- } else {
- joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, 0.0f, joystick_sequence_id);
- }
- break;
- case SDL_HAT_RIGHTDOWN:
- if(gamepad_bind[i].value.hat.hat_mask == SDL_HAT_RIGHT ||
- gamepad_bind[i].value.hat.hat_mask == SDL_HAT_DOWN) {
- joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, 1.0f, joystick_sequence_id);
- } else {
- joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, 0.0f, joystick_sequence_id);
- }
- break;
- default:
- if(gamepad_bind[i].value.hat.hat_mask == hat->value) {
- joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, 1.0f, joystick_sequence_id);
- } else {
- joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, 0.0f, joystick_sequence_id);
- }
- break;
+ case SDL_JOYHATMOTION: {
+ if (in_focus_) {
+ last_controller_event_time = (float)event.common.timestamp;
+ }
+ SDL_JoyHatEvent* hat = (SDL_JoyHatEvent*)&event.jhat;
+ JoystickMap::iterator iter = open_joysticks_.find(hat->which);
+ if (iter != open_joysticks_.end()) {
+ // TODO: Replace for-loop with constant-time lookup?
+ const std::vector<SDL_GameControllerButtonBind>& gamepad_bind = iter->second->gamepad_bind;
+ for (size_t i = 0; i < gamepad_bind.size(); ++i) {
+ if (gamepad_bind[i].bindType == SDL_CONTROLLER_BINDTYPE_HAT && gamepad_bind[i].value.hat.hat == hat->hat) {
+ switch (hat->value) {
+ case SDL_HAT_LEFTUP:
+ if (gamepad_bind[i].value.hat.hat_mask == SDL_HAT_LEFT ||
+ gamepad_bind[i].value.hat.hat_mask == SDL_HAT_UP) {
+ joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, 1.0f, joystick_sequence_id);
+ } else {
+ joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, 0.0f, joystick_sequence_id);
+ }
+ break;
+ case SDL_HAT_RIGHTUP:
+ if (gamepad_bind[i].value.hat.hat_mask == SDL_HAT_RIGHT ||
+ gamepad_bind[i].value.hat.hat_mask == SDL_HAT_UP) {
+ joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, 1.0f, joystick_sequence_id);
+ } else {
+ joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, 0.0f, joystick_sequence_id);
+ }
+ break;
+ case SDL_HAT_LEFTDOWN:
+ if (gamepad_bind[i].value.hat.hat_mask == SDL_HAT_LEFT ||
+ gamepad_bind[i].value.hat.hat_mask == SDL_HAT_DOWN) {
+ joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, 1.0f, joystick_sequence_id);
+ } else {
+ joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, 0.0f, joystick_sequence_id);
+ }
+ break;
+ case SDL_HAT_RIGHTDOWN:
+ if (gamepad_bind[i].value.hat.hat_mask == SDL_HAT_RIGHT ||
+ gamepad_bind[i].value.hat.hat_mask == SDL_HAT_DOWN) {
+ joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, 1.0f, joystick_sequence_id);
+ } else {
+ joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, 0.0f, joystick_sequence_id);
+ }
+ break;
+ default:
+ if (gamepad_bind[i].value.hat.hat_mask == hat->value) {
+ joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, 1.0f, joystick_sequence_id);
+ } else {
+ joystick_sequence_id += iter->second->joystick.HandleInputChange((ControllerInput::Input)i, 0.0f, joystick_sequence_id);
+ }
+ break;
+ }
}
}
}
+ break;
}
- break;}
- case SDL_JOYDEVICEADDED:
- LOGI << "Added device:" << event.jdevice.which << std::endl;
- OpenJoystick(event.jdevice.which);
- PrintControllers(open_joysticks_);
- SetUpForXPlayers(num_players_);
- ProcessBindings();
- break;
- case SDL_JOYDEVICEREMOVED:
- LOGI << "Removed device:" << event.jdevice.which << std::endl;
- CloseJoystick(event.jdevice.which);
- PrintControllers(open_joysticks_);
- SetUpForXPlayers(num_players_);
- break;
+ case SDL_JOYDEVICEADDED:
+ LOGI << "Added device:" << event.jdevice.which << std::endl;
+ OpenJoystick(event.jdevice.which);
+ PrintControllers(open_joysticks_);
+ SetUpForXPlayers(num_players_);
+ ProcessBindings();
+ break;
+ case SDL_JOYDEVICEREMOVED:
+ LOGI << "Removed device:" << event.jdevice.which << std::endl;
+ CloseJoystick(event.jdevice.which);
+ PrintControllers(open_joysticks_);
+ SetUpForXPlayers(num_players_);
+ break;
}
}
namespace {
- void PlayerInputKeyDown(KeyState* keyState) {
- if(keyState->count <= 0){
- keyState->count *= -1;
- keyState->count++;
- keyState->depth_count++;
- keyState->depth = 1.0f;
- }
+void PlayerInputKeyDown(KeyState* keyState) {
+ if (keyState->count <= 0) {
+ keyState->count *= -1;
+ keyState->count++;
+ keyState->depth_count++;
+ keyState->depth = 1.0f;
}
-} // namespace ""
+}
+} // namespace
void Input::ProcessController(int controller_id, float timestep) {
- PlayerInput &control = player_inputs_[controller_id];
+ PlayerInput& control = player_inputs_[controller_id];
- //Early out if we're remote controlled via network.
- if(control.remote_controlled) {
+ // Early out if we're remote controlled via network.
+ if (control.remote_controlled) {
return;
}
- //Early out if we're disabled.
- if(control.enabled == false) {
+ // Early out if we're disabled.
+ if (control.enabled == false) {
return;
}
// Set all keydown counts to negative
- PlayerInput::KeyDownMap &kd = control.key_down;
- for(auto & iter : kd){
+ PlayerInput::KeyDownMap& kd = control.key_down;
+ for (auto& iter : kd) {
iter.second.count *= -1;
iter.second.depth = 0.0f;
}
@@ -585,19 +586,19 @@ void Input::ProcessController(int controller_id, float timestep) {
// (disregarding sensitivity settings), controller input is accepted until
// any mouse/keyboard bind is pressed.
// This is to avoid misconfigured deadzone settings to spook around
- if(!use_controller_input_) {
+ if (!use_controller_input_) {
bool run = true;
- for(JoystickMap::iterator iter = open_joysticks_.begin(); run && iter != open_joysticks_.end(); ++iter){
+ for (JoystickMap::iterator iter = open_joysticks_.begin(); run && iter != open_joysticks_.end(); ++iter) {
const RC_JoystickStruct js = iter->second;
- if(js.GetConst().player_input != controller_id){
+ if (js.GetConst().player_input != controller_id) {
continue;
}
const Joystick& joystick = js.GetConst().joystick;
const Joystick::ButtonMap& bm = joystick.buttons_down_;
- for(const auto & iter2 : bm){
- if(iter2.second){
+ for (const auto& iter2 : bm) {
+ if (iter2.second) {
float depth = iter2.second;
- if(depth > 0.5f) {
+ if (depth > 0.5f) {
use_controller_input_ = true;
run = false;
break;
@@ -607,28 +608,28 @@ void Input::ProcessController(int controller_id, float timestep) {
}
}
// Joystick input
- if(allow_controller_input_ && use_controller_input_) {
- for(auto & open_joystick : open_joysticks_){
+ if (allow_controller_input_ && use_controller_input_) {
+ for (auto& open_joystick : open_joysticks_) {
const RC_JoystickStruct js = open_joystick.second;
- if(js.GetConst().player_input != controller_id){
+ if (js.GetConst().player_input != controller_id) {
continue;
}
const Joystick& joystick = js.GetConst().joystick;
const Joystick::ButtonMap& bm = joystick.buttons_down_;
- for(const auto & iter2 : bm){
- if(iter2.second){
+ for (const auto& iter2 : bm) {
+ if (iter2.second) {
float sensitivity = 1.0f;
- if(memcmp(iter2.first.c_str(), "look", 4) == 0) {
+ if (memcmp(iter2.first.c_str(), "look", 4) == 0) {
sensitivity = joystick.look_sensitivity_;
}
float depth = iter2.second * sensitivity;
- int &count = control.key_down[iter2.first].count;
- int &depth_count = control.key_down[iter2.first].depth_count;
- if(count <= 0){
+ int& count = control.key_down[iter2.first].count;
+ int& depth_count = control.key_down[iter2.first].depth_count;
+ if (count <= 0) {
count *= -1;
++count;
- if(depth > KeyState::kDepthThreshold)
+ if (depth > KeyState::kDepthThreshold)
++depth_count;
}
control.key_down[iter2.first].depth = depth;
@@ -638,11 +639,11 @@ void Input::ProcessController(int controller_id, float timestep) {
}
// Keyboard input, only bound to player one if in split screen.
bool catch_kbmouse = (controller_id == 0);
- if(catch_kbmouse){
+ if (catch_kbmouse) {
static const std::string kKey = "key";
- const StrMap &key_map = bindings_[kKey];
- for(const auto & iter : key_map) {
- if(IsKeyDown(iter.second.c_str())) {
+ const StrMap& key_map = bindings_[kKey];
+ for (const auto& iter : key_map) {
+ if (IsKeyDown(iter.second.c_str())) {
PlayerInputKeyDown(&control.key_down[iter.first]);
use_controller_input_ = false;
}
@@ -650,15 +651,15 @@ void Input::ProcessController(int controller_id, float timestep) {
keyboard_.Update(timestep);
if (in_focus_) {
- control.key_down["look_right"].depth += mouse_.delta_[0] * mouse_sensitivity_ * (invert_x_mouse_look_?-1.0f:1.0f);
- control.key_down["look_down"].depth += mouse_.delta_[1] * mouse_sensitivity_ * (invert_y_mouse_look_?-1.0f:1.0f);
- mouse_.delta_[0]=0;
- mouse_.delta_[1]=0;
+ control.key_down["look_right"].depth += mouse_.delta_[0] * mouse_sensitivity_ * (invert_x_mouse_look_ ? -1.0f : 1.0f);
+ control.key_down["look_down"].depth += mouse_.delta_[1] * mouse_sensitivity_ * (invert_y_mouse_look_ ? -1.0f : 1.0f);
+ mouse_.delta_[0] = 0;
+ mouse_.delta_[1] = 0;
}
}
// Zero all negative keydown counts
- for(auto & iter : kd){
- if(iter.second.count < 0){
+ for (auto& iter : kd) {
+ if (iter.second.count < 0) {
iter.second.count = 0;
iter.second.depth_count = 0;
iter.second.depth = 0.0f;
@@ -666,34 +667,31 @@ void Input::ProcessController(int controller_id, float timestep) {
}
}
-Keyboard &Input::getKeyboard() {
+Keyboard& Input::getKeyboard() {
return keyboard_;
}
-Mouse &Input::getMouse() {
+Mouse& Input::getMouse() {
return mouse_;
}
-void Input::UseRawInput(bool val )
-{
+void Input::UseRawInput(bool val) {
use_raw_input = val;
}
-void Input::StartTextInput()
-{
+void Input::StartTextInput() {
SDL_StartTextInput();
}
-void Input::StopTextInput()
-{
+void Input::StopTextInput() {
SDL_StopTextInput();
}
-std::string Input::GetStringDescriptionForBinding( const std::string& type, const std::string& name ) {
+std::string Input::GetStringDescriptionForBinding(const std::string& type, const std::string& name) {
StrMap& keyboard_map = bindings_[type];
- StrMap::iterator keyit = keyboard_map.find(name) ;
+ StrMap::iterator keyit = keyboard_map.find(name);
- if( keyit != keyboard_map.end() ) {
+ if (keyit != keyboard_map.end()) {
return StringFromInput(keyit->second.c_str());
} else {
return name;
@@ -703,20 +701,19 @@ std::string Input::GetStringDescriptionForBinding( const std::string& type, cons
std::vector<std::string> Input::GetAvailableBindingCategories() {
std::vector<std::string> categs;
BindMap::iterator bindit = bindings_.begin();
- while( bindit != bindings_.end() ) {
+ while (bindit != bindings_.end()) {
categs.push_back(bindit->first);
-
+
bindit++;
- }
+ }
return categs;
}
-
std::vector<std::string> Input::GetAvailableBindings(const std::string& binding_category) {
std::vector<std::string> binds;
StrMap bindings = bindings_[binding_category];
StrMap::iterator bindit = bindings.begin();
- while( bindit != bindings.end() ) {
+ while (bindit != bindings.end()) {
binds.push_back(bindit->first);
bindit++;
@@ -727,8 +724,8 @@ std::vector<std::string> Input::GetAvailableBindings(const std::string& binding_
std::set<std::string> Input::GetAllAvailableBindings() {
std::set<std::string> binds;
- for(const auto& binding_cat : bindings_) {
- for(const auto& binding : binding_cat.second) {
+ for (const auto& binding_cat : bindings_) {
+ for (const auto& binding : binding_cat.second) {
binds.insert(binding.first);
}
}
@@ -736,11 +733,11 @@ std::set<std::string> Input::GetAllAvailableBindings() {
return binds;
}
-std::string Input::GetBindingValue( const std::string& binding_category, const std::string& binding ) {
+std::string Input::GetBindingValue(const std::string& binding_category, const std::string& binding) {
// If the category is "gamepad_[0-9][...]", default to "gamepad_[...] if the bind doesn't exist
- if(binding_category.size() > 10 && memcmp(binding_category.c_str(), "gamepad_", 8) == 0 && isdigit(binding_category.c_str()[8]) && binding_category.c_str()[9] == '[') {
+ if (binding_category.size() > 10 && memcmp(binding_category.c_str(), "gamepad_", 8) == 0 && isdigit(binding_category.c_str()[8]) && binding_category.c_str()[9] == '[') {
BindMap::iterator iter = bindings_.find(binding_category);
- if(iter != bindings_.end()) {
+ if (iter != bindings_.end()) {
return iter->second[binding];
}
return bindings_["gamepad"][binding];
@@ -749,57 +746,57 @@ std::string Input::GetBindingValue( const std::string& binding_category, const s
}
}
-void Input::SetBindingValue( std::string binding_category, std::string binding, std::string value ) {
+void Input::SetBindingValue(std::string binding_category, std::string binding, std::string value) {
config.GetRef(binding_category + "[" + binding + "]") = value;
- config.ReloadStaticSettings();
+ config.ReloadStaticSettings();
}
-void Input::SetKeyboardBindingValue( std::string binding_category, std::string binding, SDL_Scancode value ) {
+void Input::SetKeyboardBindingValue(std::string binding_category, std::string binding, SDL_Scancode value) {
SetBindingValue(binding_category, binding, std::string(SDLScancodeToString(value)));
}
-void Input::SetMouseBindingValue( std::string binding_category, std::string binding, uint32_t button ) {
+void Input::SetMouseBindingValue(std::string binding_category, std::string binding, uint32_t button) {
char buffer[32];
sprintf(buffer, "mouse%d", button);
SetBindingValue(binding_category, binding, buffer);
}
-void Input::SetMouseBindingValue( std::string binding_category, std::string binding, std::string text ) {
+void Input::SetMouseBindingValue(std::string binding_category, std::string binding, std::string text) {
SetBindingValue(binding_category, binding, text.c_str());
}
-void Input::SetControllerBindingValue( std::string binding_category, std::string binding, ControllerInput::Input input ) {
+void Input::SetControllerBindingValue(std::string binding_category, std::string binding, ControllerInput::Input input) {
SetBindingValue(binding_category, binding, StringFromControllerInput(input));
}
-void Input::HandleMouseButtonDown( int sdl_button_index, int clicks ) {
+void Input::HandleMouseButtonDown(int sdl_button_index, int clicks) {
mouse_.MouseDownEvent(sdl_button_index);
}
-void Input::HandleMouseButtonUp( int sdl_button_index ) {
+void Input::HandleMouseButtonUp(int sdl_button_index) {
mouse_.MouseUpEvent(sdl_button_index);
}
-PlayerInput* Input::GetController( int id ) {
+PlayerInput* Input::GetController(int id) {
return id >= 0 && id < player_inputs_.size() ? &player_inputs_[id] : NULL;
}
void Input::ProcessBindings() {
- for(auto & open_joystick : open_joysticks_){
+ for (auto& open_joystick : open_joysticks_) {
RC_JoystickStruct js = open_joystick.second;
js->joystick.ClearBinding();
char gamepad_name[32];
FormatString(gamepad_name, 32, "gamepad_%i", js->player_input);
- if(!js->gamepad_bind.empty()){
+ if (!js->gamepad_bind.empty()) {
StrMap& gamepad_map = bindings_[gamepad_name];
- for(auto & xb_iter : gamepad_map){
+ for (auto& xb_iter : gamepad_map) {
const std::string& input_str = xb_iter.second;
ControllerInput::Input input = SDLStringToController(input_str.c_str());
- if(input != ControllerInput::NONE){
- SDL_GameControllerButtonBind bind;
- // Input comes as an internal value, so map it to a physical
- // (SDL) input, but send the internal input to ProcessBinding
- switch(input) {
+ if (input != ControllerInput::NONE) {
+ SDL_GameControllerButtonBind bind;
+ // Input comes as an internal value, so map it to a physical
+ // (SDL) input, but send the internal input to ProcessBinding
+ switch (input) {
case ControllerInput::L_STICK_XN:
case ControllerInput::L_STICK_XP:
bind = js->gamepad_bind[ControllerInput::L_STICK_X];
@@ -820,7 +817,7 @@ void Input::ProcessBindings() {
bind = js->gamepad_bind[input];
break;
}
- if(bind.bindType != SDL_CONTROLLER_BINDTYPE_NONE){
+ if (bind.bindType != SDL_CONTROLLER_BINDTYPE_NONE) {
js->joystick.ProcessBinding(input, xb_iter.first);
}
}
@@ -836,8 +833,8 @@ void Input::ProcessBindings() {
}
void Input::ProcessControllers(float timestep) {
- PROFILER_ZONE(g_profiler_ctx, "ProcessControllers");
- for(unsigned i=0; i<player_inputs_.size(); ++i){
+ PROFILER_ZONE(g_profiler_ctx, "ProcessControllers");
+ for (unsigned i = 0; i < player_inputs_.size(); ++i) {
ProcessController(i, timestep);
}
}
@@ -847,51 +844,51 @@ void Input::ProcessControllers(float timestep) {
*/
void Input::UpdateKeyboardFocus() {
uint32_t mask = 0U;
- if( mask == 0U ) {
- mask = KIMF_ANY;
+ if (mask == 0U) {
+ mask = KIMF_ANY;
}
- keyboard_.SetMode(mask);
+ keyboard_.SetMode(mask);
}
-void Input::SetUpForXPlayers( unsigned num_players ) {
- if(num_players_ != num_players) {
+void Input::SetUpForXPlayers(unsigned num_players) {
+ if (num_players_ != num_players) {
num_players_ = num_players;
- //Setup the enabled number of local controllers to match local player count.
- for(unsigned i = 0; i < 4; i++) {
+ // Setup the enabled number of local controllers to match local player count.
+ for (unsigned i = 0; i < 4; i++) {
player_inputs_[i].enabled = (i < num_players);
}
- if(num_players <= 1){
- for(auto & open_joystick : open_joysticks_){
+ if (num_players <= 1) {
+ for (auto& open_joystick : open_joysticks_) {
RC_JoystickStruct js = open_joystick.second;
js->player_input = 0;
std::map<std::string, float>::iterator buttons_iter = js->joystick.buttons_down_.begin();
- for(; buttons_iter != js->joystick.buttons_down_.end(); ++buttons_iter) {
+ for (; buttons_iter != js->joystick.buttons_down_.end(); ++buttons_iter) {
buttons_iter->second = 0.0f;
}
}
}
int num_joysticks = open_joysticks_.size();
- if(num_players >= 2){
- if(num_joysticks < (int)num_players){
+ if (num_players >= 2) {
+ if (num_joysticks < (int)num_players) {
int index = 1;
- for(auto & open_joystick : open_joysticks_){
+ for (auto& open_joystick : open_joysticks_) {
RC_JoystickStruct js = open_joystick.second;
js->player_input = index;
++index;
std::map<std::string, float>::iterator buttons_iter = js->joystick.buttons_down_.begin();
- for(; buttons_iter != js->joystick.buttons_down_.end(); ++buttons_iter) {
+ for (; buttons_iter != js->joystick.buttons_down_.end(); ++buttons_iter) {
buttons_iter->second = 0.0f;
}
}
} else {
int index = 0;
- for(auto & open_joystick : open_joysticks_){
+ for (auto& open_joystick : open_joysticks_) {
RC_JoystickStruct js = open_joystick.second;
js->player_input = index;
++index;
std::map<std::string, float>::iterator buttons_iter = js->joystick.buttons_down_.begin();
- for(; buttons_iter != js->joystick.buttons_down_.end(); ++buttons_iter) {
+ for (; buttons_iter != js->joystick.buttons_down_.end(); ++buttons_iter) {
buttons_iter->second = 0.0f;
}
}
@@ -909,44 +906,43 @@ bool Input::WasQuitRequested() {
return quit_requested_;
}
-void CheckBinding(const Config::Map::const_iterator &iter, const std::string &type, BindMap &bind_map) {
- std::string find_str = type+"[";
+void CheckBinding(const Config::Map::const_iterator& iter, const std::string& type, BindMap& bind_map) {
+ std::string find_str = type + "[";
size_t start = iter->first.find(find_str, 0);
- if(start != std::string::npos){
+ if (start != std::string::npos) {
size_t end = iter->first.find("]", 0);
start += find_str.size();
- std::string label = iter->first.substr(start, end-start);
+ std::string label = iter->first.substr(start, end - start);
std::string binding = iter->second.data.str();
bind_map[type][label] = binding;
}
}
-static void CompleteGamepadBindings(const std::string &type, BindMap &bind_map) {
+static void CompleteGamepadBindings(const std::string& type, BindMap& bind_map) {
StrMap& gamepad = bind_map[type];
- for(auto & iter : bind_map["gamepad"]) {
+ for (auto& iter : bind_map["gamepad"]) {
StrMap::iterator gamepad_iter = gamepad.find(iter.first);
- if(gamepad_iter == gamepad.end()) {
+ if (gamepad_iter == gamepad.end()) {
gamepad[iter.first] = iter.second;
}
}
char buffer[128];
FormatString(buffer, 128, "%s_deadzone", type.c_str());
- if(!config.HasKey(buffer)) {
+ if (!config.HasKey(buffer)) {
config.GetRef(std::string(buffer)) = config["gamepad_deadzone"];
}
FormatString(buffer, 128, "%s_look_sensitivity", type.c_str());
- if(!config.HasKey(buffer)) {
+ if (!config.HasKey(buffer)) {
config.GetRef(std::string(buffer)) = config["gamepad_look_sensitivity"];
}
}
-
-void Input::SetFromConfig( const Config &config ) {
+void Input::SetFromConfig(const Config& config) {
bindings_.erase("gamepad_0");
bindings_.erase("gamepad_1");
bindings_.erase("gamepad_2");
bindings_.erase("gamepad_3");
- for(Config::Map::const_iterator iter = config.map_.begin(); iter != config.map_.end(); ++iter){
+ for (Config::Map::const_iterator iter = config.map_.begin(); iter != config.map_.end(); ++iter) {
CheckBinding(iter, "key", bindings_);
CheckBinding(iter, "gamepad", bindings_);
CheckBinding(iter, "gamepad_0", bindings_);
@@ -964,17 +960,17 @@ void Input::SetFromConfig( const Config &config ) {
CompleteGamepadBindings("gamepad_3", bindings_);
use_raw_input = config["use_raw_input"].toNumber<bool>();
// Process hotkey bindings
- StrMap &binds = bindings_["bind"];
- for(StrMap::const_iterator iter = binds.begin(); iter != binds.end(); ++iter){
- KeyCommand::BindString((iter->second+": "+iter->first).c_str());
+ StrMap& binds = bindings_["bind"];
+ for (StrMap::const_iterator iter = binds.begin(); iter != binds.end(); ++iter) {
+ KeyCommand::BindString((iter->second + ": " + iter->first).c_str());
}
- #ifdef WIN32
- StrMap &platform_binds = bindings_["bind_win"];
- #else
- StrMap &platform_binds = bindings_["bind_unix"];
- #endif
- for(StrMap::const_iterator iter = platform_binds.begin(); iter != platform_binds.end(); ++iter){
- KeyCommand::BindString((iter->second+": "+iter->first).c_str());
+#ifdef WIN32
+ StrMap& platform_binds = bindings_["bind_win"];
+#else
+ StrMap& platform_binds = bindings_["bind_unix"];
+#endif
+ for (StrMap::const_iterator iter = platform_binds.begin(); iter != platform_binds.end(); ++iter) {
+ KeyCommand::BindString((iter->second + ": " + iter->first).c_str());
}
KeyCommand::FinalizeBindings();
mouse_sensitivity_ = config["mouse_sensitivity"].toNumber<float>();
@@ -983,10 +979,9 @@ void Input::SetFromConfig( const Config &config ) {
SetInvertXMouseLook(config["invert_x_mouse_look"].toNumber<bool>());
SetInvertYMouseLook(config["invert_y_mouse_look"].toNumber<bool>());
debug_keys = config["debug_keys"].toNumber<bool>();
- if(!open_joysticks_.empty()){
+ if (!open_joysticks_.empty()) {
ProcessBindings();
}
-
}
void Input::ClearQuitRequested() {
@@ -994,8 +989,8 @@ void Input::ClearQuitRequested() {
}
int Input::PlayerOpenedMenu() {
- for(size_t i = 0; i < player_inputs_.size(); ++i) {
- if(player_inputs_[i].key_down["quit"].count == 1) {
+ for (size_t i = 0; i < player_inputs_.size(); ++i) {
+ if (player_inputs_[i].key_down["quit"].count == 1) {
return i;
}
}
@@ -1016,19 +1011,19 @@ int Input::AllocateRemotePlayerInput() {
}
bool Input::IsKeyDown(const char* name) {
- if(strlen(name) <= 5 || memcmp(name, "mouse", 5) != 0) {
+ if (strlen(name) <= 5 || memcmp(name, "mouse", 5) != 0) {
return keyboard_.isScancodeDown(StringToSDLScancode(name), KIMF_PLAYING);
- } else if(strcmp(name, "mousescrollup") == 0) {
+ } else if (strcmp(name, "mousescrollup") == 0) {
return mouse_.wheel_delta_y_ > 0;
- } else if(strcmp(name, "mousescrolldown") == 0) {
+ } else if (strcmp(name, "mousescrolldown") == 0) {
return mouse_.wheel_delta_y_ < 0;
- } else if(strcmp(name, "mousescrollleft") == 0) {
+ } else if (strcmp(name, "mousescrollleft") == 0) {
return mouse_.wheel_delta_x_ < 0;
- } else if(strcmp(name, "mousescrollright") == 0) {
+ } else if (strcmp(name, "mousescrollright") == 0) {
return mouse_.wheel_delta_x_ > 0;
} else {
int button = atoi(name + 5);
- if(button >= 0 && button < Mouse::MouseButton::NUM_BUTTONS)
+ if (button >= 0 && button < Mouse::MouseButton::NUM_BUTTONS)
return mouse_.mouse_down_[button] == Mouse::ClickState::HELD;
else {
LOGW << "Unknown mouse button \"" << name << "\"" << std::endl;
@@ -1055,20 +1050,20 @@ std::vector<Mouse::MousePress> Input::GetMouseInputs() {
std::vector<Joystick::JoystickPress> Input::GetJoystickInputs(int player_index) {
std::vector<Joystick::JoystickPress> ret_inputs;
- for(auto & open_joystick : open_joysticks_) {
- if(open_joystick.second->player_input == player_index) {
+ for (auto& open_joystick : open_joysticks_) {
+ if (open_joystick.second->player_input == player_index) {
std::vector<Joystick::JoystickPress> inputs = open_joystick.second->joystick.GetJoystickInputs();
ret_inputs.reserve(ret_inputs.size() + inputs.size());
- for(auto & input : inputs) {
+ for (auto& input : inputs) {
ret_inputs.push_back(input);
}
}
}
// Some insertion sort variant
- for(int i = 1; i < (int)ret_inputs.size(); ++i) {
+ for (int i = 1; i < (int)ret_inputs.size(); ++i) {
Joystick::JoystickPress curr = ret_inputs[i];
int j = i - 1;
- for(; j >= 0 && ret_inputs[j].s_id > curr.s_id; --j) {
+ for (; j >= 0 && ret_inputs[j].s_id > curr.s_id; --j) {
ret_inputs[j + 1] = ret_inputs[j];
}
ret_inputs[j + 1] = curr;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 12:40:12 +0300