diff --git a/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/3b7f66ca6222ba83/GUI_HANDLER.ipch b/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/3b7f66ca6222ba83/GUI_HANDLER.ipch index 10d7d7eed90e20126957204dc8e8e6c5ffa05b93..5b4d4357934aaa76658e3469fd26a4e8c2b1cb83 100644 Binary files a/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/3b7f66ca6222ba83/GUI_HANDLER.ipch and b/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/3b7f66ca6222ba83/GUI_HANDLER.ipch differ diff --git a/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/5510542e53f89a96/EVENT_LOGGER.ipch b/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/5510542e53f89a96/EVENT_LOGGER.ipch index 1ad622fc4bce8e52dc4d043656a523aa5e4ed4ab..c5a229b6c217d27ba00a7e79c9684220ed6f24d8 100644 Binary files a/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/5510542e53f89a96/EVENT_LOGGER.ipch and b/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/5510542e53f89a96/EVENT_LOGGER.ipch differ diff --git a/include/event_logger.hpp b/include/event_logger.hpp index 2ee915fc137160376c82193a4aebe001a31fec20..3934b9f2b816a8ba4519689bbd9a683a6bcf0908 100644 --- a/include/event_logger.hpp +++ b/include/event_logger.hpp @@ -19,4 +19,4 @@ public: std::array<Pevent, 16> events_other; }; -std::string ptos(const Pevent&); \ No newline at end of file +std::string ptos(const Pevent&, const Toolbox& tb); \ No newline at end of file diff --git a/src/event_logger.cpp b/src/event_logger.cpp index 0b19cad2c4c13441c869c90dd1813b86b5a0f3a1..f32cec34ef2de46333e08ee6c12d7d1e74c59a42 100644 --- a/src/event_logger.cpp +++ b/src/event_logger.cpp @@ -34,7 +34,7 @@ void EventLogger::push_events(Toolbox& tb) { } /*Convert Pevent to std::string*/ -std::string ptos(const Pevent& pev) { +std::string ptos(const Pevent& pev, const Toolbox& tb) { std::string pev_type = ""; std::string sdl_type = ""; std::string pev_fscoords = "(" + std::to_string(pev.fscoord_x) + ", " + std::to_string(pev.fscoord_y) + ")"; @@ -50,7 +50,7 @@ std::string ptos(const Pevent& pev) { break; case SDL_FINGERDOWN: sdl_type = "SDL_FINGERDOWN"; - sdl_coords = "(" + std::to_string(pev.event.tfinger.x) + ", " + std::to_string(pev.event.tfinger.y) + ")"; + sdl_coords = "(" + std::to_string(pev.event.tfinger.x) + ", " + std::to_string(pev.event.tfinger.y) + ")" + ", [" + std::to_string(pev.event.tfinger.x * tb.screen_w) + ", " + std::to_string(pev.event.tfinger.y * tb.screen_h) + "]"; break; default: sdl_type = std::to_string(pev.event.type); @@ -66,7 +66,7 @@ std::string ptos(const Pevent& pev) { break; case SDL_FINGERUP: sdl_type = "SDL_FINGERUP"; - sdl_coords = "(" + std::to_string(pev.event.tfinger.x) + ", " + std::to_string(pev.event.tfinger.y) + ")"; + sdl_coords = "(" + std::to_string(pev.event.tfinger.x) + ", " + std::to_string(pev.event.tfinger.y) + ")" + ", [" + std::to_string(pev.event.tfinger.x * tb.screen_w) + ", " + std::to_string(pev.event.tfinger.y * tb.screen_h) + "]"; break; default: sdl_type = std::to_string(pev.event.type); @@ -82,7 +82,7 @@ std::string ptos(const Pevent& pev) { break; case SDL_FINGERMOTION: sdl_type = "SDL_FINGERMOTION"; - sdl_coords = "(" + std::to_string(pev.event.tfinger.x) + ", " + std::to_string(pev.event.tfinger.y) + ")"; + sdl_coords = "(" + std::to_string(pev.event.tfinger.x) + ", " + std::to_string(pev.event.tfinger.y) + ")" + ", [" + std::to_string(pev.event.tfinger.x * tb.screen_w) + ", " + std::to_string(pev.event.tfinger.y * tb.screen_h) + "]"; break; default: sdl_type = std::to_string(pev.event.type); diff --git a/src/gui_handler.cpp b/src/gui_handler.cpp index 5d997585abd1e78b045d78179b1c0b72ddd2ff4d..a1bfa6bfb7e59c9972c7602a8e2c98c68e3badab 100644 --- a/src/gui_handler.cpp +++ b/src/gui_handler.cpp @@ -155,25 +155,25 @@ void GuiHandler::update(Toolbox& tb) { ImGui::NewLine(); ImGui::Text("UP EVENTS"); for (const Pevent& pev : evlog.events_up) { - std::string str = ptos(pev); + std::string str = ptos(pev, tb); ImGui::Text(str.c_str()); } ImGui::Separator(); ImGui::Text("DOWN EVENTS"); for (const Pevent& pev : evlog.events_down) { - std::string str = ptos(pev); + std::string str = ptos(pev, tb); ImGui::Text(str.c_str()); } ImGui::Separator(); ImGui::Text("MOVE EVENTS"); for (const Pevent& pev : evlog.events_move) { - std::string str = ptos(pev); + std::string str = ptos(pev, tb); ImGui::Text(str.c_str()); } ImGui::Separator(); ImGui::Text("OTHER EVENTS"); for (const Pevent& pev : evlog.events_other) { - std::string str = ptos(pev); + std::string str = ptos(pev, tb); ImGui::Text(str.c_str()); } ImGui::End();