Refactored Math::Point in screen classes

dev
Tomasz Kapuściński 2021-12-24 03:53:36 +01:00
parent 3fabdad1fe
commit 7bf37a3999
16 changed files with 19 additions and 19 deletions

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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<EventType>(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++)

View File

@ -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();

View File

@ -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();

View File

@ -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();

View File

@ -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();

View File

@ -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;