From 7bf37a3999ea06eb43eb408cd44f55fa637708c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Kapu=C5=9Bci=C5=84ski?= Date: Fri, 24 Dec 2021 03:53:36 +0100 Subject: [PATCH] Refactored Math::Point in screen classes --- src/ui/screen/screen_apperance.cpp | 2 +- src/ui/screen/screen_io_read.cpp | 2 +- src/ui/screen/screen_io_write.cpp | 2 +- src/ui/screen/screen_level_list.cpp | 2 +- src/ui/screen/screen_loading.cpp | 2 +- src/ui/screen/screen_main_menu.cpp | 2 +- src/ui/screen/screen_mod_list.cpp | 2 +- src/ui/screen/screen_player_select.cpp | 2 +- src/ui/screen/screen_quit.cpp | 2 +- src/ui/screen/screen_setup.cpp | 2 +- src/ui/screen/screen_setup_controls.cpp | 8 ++++---- src/ui/screen/screen_setup_display.cpp | 2 +- src/ui/screen/screen_setup_game.cpp | 2 +- src/ui/screen/screen_setup_graphics.cpp | 2 +- src/ui/screen/screen_setup_sound.cpp | 2 +- src/ui/screen/screen_welcome.cpp | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/ui/screen/screen_apperance.cpp b/src/ui/screen/screen_apperance.cpp index 2df97bf6..fc050947 100644 --- a/src/ui/screen/screen_apperance.cpp +++ b/src/ui/screen/screen_apperance.cpp @@ -90,7 +90,7 @@ void CScreenApperance::CreateInterface() CButton* pb; CColor* pco; CSlider* psl; - Math::Point pos, ddim; + glm::vec2 pos, ddim; std::string name; pos.x = 0.10f; diff --git a/src/ui/screen/screen_io_read.cpp b/src/ui/screen/screen_io_read.cpp index 6c702caa..5ec61893 100644 --- a/src/ui/screen/screen_io_read.cpp +++ b/src/ui/screen/screen_io_read.cpp @@ -51,7 +51,7 @@ void CScreenIORead::CreateInterface() CButton* pb; CList* pli; CImage* pi; - Math::Point pos, ddim; + glm::vec2 pos, ddim; std::string name; pos.x = 0.10f; diff --git a/src/ui/screen/screen_io_write.cpp b/src/ui/screen/screen_io_write.cpp index 9ff5f6f9..b8410986 100644 --- a/src/ui/screen/screen_io_write.cpp +++ b/src/ui/screen/screen_io_write.cpp @@ -49,7 +49,7 @@ void CScreenIOWrite::CreateInterface() CLabel* pl; CImage* pi; CEdit* pe; - Math::Point pos, ddim; + glm::vec2 pos, ddim; std::string name; pos.x = 0.10f; diff --git a/src/ui/screen/screen_level_list.cpp b/src/ui/screen/screen_level_list.cpp index 0a5a3202..105b3ccb 100644 --- a/src/ui/screen/screen_level_list.cpp +++ b/src/ui/screen/screen_level_list.cpp @@ -69,7 +69,7 @@ void CScreenLevelList::CreateInterface() CButton* pb; CCheck* pc; CList* pli; - Math::Point pos, ddim; + glm::vec2 pos, ddim; int res; std::string name; diff --git a/src/ui/screen/screen_loading.cpp b/src/ui/screen/screen_loading.cpp index 9ee03619..c7404897 100644 --- a/src/ui/screen/screen_loading.cpp +++ b/src/ui/screen/screen_loading.cpp @@ -43,7 +43,7 @@ void CScreenLoading::CreateInterface() CWindow* pw; CLabel* pl; CGroup* pg; - Math::Point pos, ddim; + glm::vec2 pos, ddim; std::string name; pos.x = 0.35f; diff --git a/src/ui/screen/screen_main_menu.cpp b/src/ui/screen/screen_main_menu.cpp index ece7dded..cdefcb22 100644 --- a/src/ui/screen/screen_main_menu.cpp +++ b/src/ui/screen/screen_main_menu.cpp @@ -49,7 +49,7 @@ void CScreenMainMenu::CreateInterface() CLabel* pl; CButton* pb; CGroup* pg; - Math::Point pos, ddim; + glm::vec2 pos, ddim; std::string name; pos.x = 0.35f; diff --git a/src/ui/screen/screen_mod_list.cpp b/src/ui/screen/screen_mod_list.cpp index f9f50686..2151be0a 100644 --- a/src/ui/screen/screen_mod_list.cpp +++ b/src/ui/screen/screen_mod_list.cpp @@ -63,7 +63,7 @@ void CScreenModList::CreateInterface() CLabel* pl; CButton* pb; CList* pli; - Math::Point pos, ddim; + glm::vec2 pos, ddim; std::string name; // Display the window diff --git a/src/ui/screen/screen_player_select.cpp b/src/ui/screen/screen_player_select.cpp index 40472ff9..a02f02ce 100644 --- a/src/ui/screen/screen_player_select.cpp +++ b/src/ui/screen/screen_player_select.cpp @@ -58,7 +58,7 @@ void CScreenPlayerSelect::CreateInterface() CButton* pb; CList* pli; CGroup* pg; - Math::Point pos, ddim; + glm::vec2 pos, ddim; std::string name; pos.x = 0.10f; diff --git a/src/ui/screen/screen_quit.cpp b/src/ui/screen/screen_quit.cpp index 87e11154..59d37ae3 100644 --- a/src/ui/screen/screen_quit.cpp +++ b/src/ui/screen/screen_quit.cpp @@ -44,7 +44,7 @@ void CScreenQuit::CreateInterface() CEdit* pe; CLabel* pl; CButton* pb; - Math::Point pos, ddim; + glm::vec2 pos, ddim; std::string name; pos.x = 0.0f; diff --git a/src/ui/screen/screen_setup.cpp b/src/ui/screen/screen_setup.cpp index 38978792..ee093293 100644 --- a/src/ui/screen/screen_setup.cpp +++ b/src/ui/screen/screen_setup.cpp @@ -59,7 +59,7 @@ void CScreenSetup::CreateInterface() { CWindow* pw; CButton* pb; - Math::Point pos, ddim; + glm::vec2 pos, ddim; std::string name; pos.x = 0.10f; diff --git a/src/ui/screen/screen_setup_controls.cpp b/src/ui/screen/screen_setup_controls.cpp index 736d0c3c..d8776d4b 100644 --- a/src/ui/screen/screen_setup_controls.cpp +++ b/src/ui/screen/screen_setup_controls.cpp @@ -58,8 +58,8 @@ void CScreenSetupControls::CreateInterface() CButton* pb; CGroup* pg; CList* pli; - CEditValue* pev; - Math::Point pos, ddim; + CEditValue* pev; + glm::vec2 pos, ddim; std::string name; CScreenSetup::CreateInterface(); @@ -344,10 +344,10 @@ void CScreenSetupControls::UpdateKey() for (int i = 0; i < INPUT_SLOT_MAX; i++) pw->DeleteControl(static_cast(EVENT_INTERFACE_KEY+i)); - Math::Point dim; + glm::vec2 dim; dim.x = 250.0f/640.0f; dim.y = 20.0f/480.0f; - Math::Point pos; + glm::vec2 pos; pos.x = 110.0f/640.0f; pos.y = 128.0f/480.0f + dim.y*(KEY_VISIBLE-1); for (int i = 0; i < KEY_VISIBLE; i++) diff --git a/src/ui/screen/screen_setup_display.cpp b/src/ui/screen/screen_setup_display.cpp index 00f86e14..e073947c 100644 --- a/src/ui/screen/screen_setup_display.cpp +++ b/src/ui/screen/screen_setup_display.cpp @@ -57,7 +57,7 @@ void CScreenSetupDisplay::CreateInterface() CList* pli; CCheck* pc; CButton* pb; - Math::Point pos, ddim; + glm::vec2 pos, ddim; std::string name; CScreenSetup::CreateInterface(); diff --git a/src/ui/screen/screen_setup_game.cpp b/src/ui/screen/screen_setup_game.cpp index 036df52b..05959bc1 100644 --- a/src/ui/screen/screen_setup_game.cpp +++ b/src/ui/screen/screen_setup_game.cpp @@ -54,7 +54,7 @@ void CScreenSetupGame::CreateInterface() CCheck* pc; CSlider* psl; CList* pli; - Math::Point pos, ddim; + glm::vec2 pos, ddim; std::string name; CScreenSetup::CreateInterface(); diff --git a/src/ui/screen/screen_setup_graphics.cpp b/src/ui/screen/screen_setup_graphics.cpp index 323239e8..ee651cb5 100644 --- a/src/ui/screen/screen_setup_graphics.cpp +++ b/src/ui/screen/screen_setup_graphics.cpp @@ -57,7 +57,7 @@ void CScreenSetupGraphics::CreateInterface() CCheck* pc; CEnumSlider* pes; CButton* pb; - Math::Point pos, ddim; + glm::vec2 pos, ddim; std::string name; CScreenSetup::CreateInterface(); diff --git a/src/ui/screen/screen_setup_sound.cpp b/src/ui/screen/screen_setup_sound.cpp index ebcb40bb..4523810c 100644 --- a/src/ui/screen/screen_setup_sound.cpp +++ b/src/ui/screen/screen_setup_sound.cpp @@ -55,7 +55,7 @@ void CScreenSetupSound::CreateInterface() CSlider* psl; CButton* pb; CCheck* pc; - Math::Point pos, ddim; + glm::vec2 pos, ddim; std::string name; CScreenSetup::CreateInterface(); diff --git a/src/ui/screen/screen_welcome.cpp b/src/ui/screen/screen_welcome.cpp index b8bc54f5..b3a7eadd 100644 --- a/src/ui/screen/screen_welcome.cpp +++ b/src/ui/screen/screen_welcome.cpp @@ -49,7 +49,7 @@ void CScreenWelcome::SetImageIndex(int imageIndex) void CScreenWelcome::CreateInterface() { - Math::Point pos, ddim; + glm::vec2 pos, ddim; pos.x = 0.0f; pos.y = 0.0f;