From 46efbf05fcade8199035f956e20a63ca91fc88fd Mon Sep 17 00:00:00 2001 From: Josh Rahm Date: Tue, 23 Dec 2025 12:59:23 -0700 Subject: Run clang-format and add .clang-format --- sons_of_sol/private_db/ControlMultiplexer.cpp | 93 ++++++++++++++------------- 1 file changed, 48 insertions(+), 45 deletions(-) (limited to 'sons_of_sol/private_db/ControlMultiplexer.cpp') diff --git a/sons_of_sol/private_db/ControlMultiplexer.cpp b/sons_of_sol/private_db/ControlMultiplexer.cpp index 97ae2f4..aee9672 100644 --- a/sons_of_sol/private_db/ControlMultiplexer.cpp +++ b/sons_of_sol/private_db/ControlMultiplexer.cpp @@ -1,58 +1,61 @@ #include "sons_of_sol/ControlMultiplexer.hpp" -ControlMultiplexer::ControlMultiplexer() { - -} +ControlMultiplexer::ControlMultiplexer() {} -void ControlMultiplexer::onKeyUp( const SDL_KeyboardEvent& evt ) { - std::map< SDLKey, M_MapVal >::iterator itr; - itr = m_keysym_map.find( evt.keysym.sym ); +void ControlMultiplexer::onKeyUp(const SDL_KeyboardEvent& evt) { + std::map::iterator itr; + itr = m_keysym_map.find(evt.keysym.sym); - if( itr != m_keysym_map.end() ) { - ControlMotionEvent event( (*itr).second.type, 0, ControlMotionEvent::BUTTON ); - fireControlEvent( event ); - } + if (itr != m_keysym_map.end()) { + ControlMotionEvent event((*itr).second.type, 0, ControlMotionEvent::BUTTON); + fireControlEvent(event); + } } -void ControlMultiplexer::onKeyDown( const SDL_KeyboardEvent& evt ) { - std::map< SDLKey, M_MapVal >::iterator itr; - itr = m_keysym_map.find( evt.keysym.sym ); +void ControlMultiplexer::onKeyDown(const SDL_KeyboardEvent& evt) { + std::map::iterator itr; + itr = m_keysym_map.find(evt.keysym.sym); - if( itr != m_keysym_map.end() ) { - ControlMotionEvent event( (*itr).second.type, 1 * (*itr).second.multiplier, ControlMotionEvent::BUTTON ); - fireControlEvent( event ); - } + if (itr != m_keysym_map.end()) { + ControlMotionEvent event((*itr).second.type, 1 * (*itr).second.multiplier, + ControlMotionEvent::BUTTON); + fireControlEvent(event); + } } -void ControlMultiplexer::onMouseMoved( const SDL_MouseMotionEvent& evt ) { - std::map< uint16_t, M_MapVal >::iterator itr; - /* x direction on mousepad */ - itr = m_joy_axis_map.find( 0xFF00 ); - const SDL_VideoInfo* info = SDL_GetVideoInfo(); //<-- calls SDL_GetVideoInfo(); - int screen_width = info->current_w; - int screen_height = info->current_h; - - float x_norm = (evt.x - screen_width / 2) / ((float) screen_width / 2.0); - if( itr != m_joy_axis_map.end() ) { - ControlMotionEvent event( itr->second.type, x_norm * (*itr).second.multiplier, - ControlMotionEvent::MOUSE ); - fireControlEvent( event ); - } - - /* y direction */ - float y_norm = (evt.y - screen_height / 2) / ((float) screen_height / 2.0); - itr = m_joy_axis_map.find( 0xFF01 ); - if( itr != m_joy_axis_map.end() ) { - ControlMotionEvent event( itr->second.type, y_norm * (*itr).second.multiplier, - ControlMotionEvent::MOUSE ); - fireControlEvent( event ); - } +void ControlMultiplexer::onMouseMoved(const SDL_MouseMotionEvent& evt) { + std::map::iterator itr; + /* x direction on mousepad */ + itr = m_joy_axis_map.find(0xFF00); + const SDL_VideoInfo* info = + SDL_GetVideoInfo(); //<-- calls SDL_GetVideoInfo(); + int screen_width = info->current_w; + int screen_height = info->current_h; + + float x_norm = (evt.x - screen_width / 2) / ((float)screen_width / 2.0); + if (itr != m_joy_axis_map.end()) { + ControlMotionEvent event(itr->second.type, + x_norm * (*itr).second.multiplier, + ControlMotionEvent::MOUSE); + fireControlEvent(event); + } + + /* y direction */ + float y_norm = (evt.y - screen_height / 2) / ((float)screen_height / 2.0); + itr = m_joy_axis_map.find(0xFF01); + if (itr != m_joy_axis_map.end()) { + ControlMotionEvent event(itr->second.type, + y_norm * (*itr).second.multiplier, + ControlMotionEvent::MOUSE); + fireControlEvent(event); + } } -void ControlMultiplexer::fireControlEvent( const ControlMotionEvent& evt ) { - std::vector< ControlMotionListener* >::iterator itr; +void ControlMultiplexer::fireControlEvent(const ControlMotionEvent& evt) { + std::vector::iterator itr; - for( itr = m_motion_listeners.begin(); itr != m_motion_listeners.end() ; ++ itr ) { - (*itr)->onControlMotion( evt ); - } + for (itr = m_motion_listeners.begin(); itr != m_motion_listeners.end(); + ++itr) { + (*itr)->onControlMotion(evt); + } } -- cgit