Refactored Math::Point in screen classes
parent
3fabdad1fe
commit
7bf37a3999
|
@ -90,7 +90,7 @@ void CScreenApperance::CreateInterface()
|
||||||
CButton* pb;
|
CButton* pb;
|
||||||
CColor* pco;
|
CColor* pco;
|
||||||
CSlider* psl;
|
CSlider* psl;
|
||||||
Math::Point pos, ddim;
|
glm::vec2 pos, ddim;
|
||||||
std::string name;
|
std::string name;
|
||||||
|
|
||||||
pos.x = 0.10f;
|
pos.x = 0.10f;
|
||||||
|
|
|
@ -51,7 +51,7 @@ void CScreenIORead::CreateInterface()
|
||||||
CButton* pb;
|
CButton* pb;
|
||||||
CList* pli;
|
CList* pli;
|
||||||
CImage* pi;
|
CImage* pi;
|
||||||
Math::Point pos, ddim;
|
glm::vec2 pos, ddim;
|
||||||
std::string name;
|
std::string name;
|
||||||
|
|
||||||
pos.x = 0.10f;
|
pos.x = 0.10f;
|
||||||
|
|
|
@ -49,7 +49,7 @@ void CScreenIOWrite::CreateInterface()
|
||||||
CLabel* pl;
|
CLabel* pl;
|
||||||
CImage* pi;
|
CImage* pi;
|
||||||
CEdit* pe;
|
CEdit* pe;
|
||||||
Math::Point pos, ddim;
|
glm::vec2 pos, ddim;
|
||||||
std::string name;
|
std::string name;
|
||||||
|
|
||||||
pos.x = 0.10f;
|
pos.x = 0.10f;
|
||||||
|
|
|
@ -69,7 +69,7 @@ void CScreenLevelList::CreateInterface()
|
||||||
CButton* pb;
|
CButton* pb;
|
||||||
CCheck* pc;
|
CCheck* pc;
|
||||||
CList* pli;
|
CList* pli;
|
||||||
Math::Point pos, ddim;
|
glm::vec2 pos, ddim;
|
||||||
int res;
|
int res;
|
||||||
std::string name;
|
std::string name;
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@ void CScreenLoading::CreateInterface()
|
||||||
CWindow* pw;
|
CWindow* pw;
|
||||||
CLabel* pl;
|
CLabel* pl;
|
||||||
CGroup* pg;
|
CGroup* pg;
|
||||||
Math::Point pos, ddim;
|
glm::vec2 pos, ddim;
|
||||||
std::string name;
|
std::string name;
|
||||||
|
|
||||||
pos.x = 0.35f;
|
pos.x = 0.35f;
|
||||||
|
|
|
@ -49,7 +49,7 @@ void CScreenMainMenu::CreateInterface()
|
||||||
CLabel* pl;
|
CLabel* pl;
|
||||||
CButton* pb;
|
CButton* pb;
|
||||||
CGroup* pg;
|
CGroup* pg;
|
||||||
Math::Point pos, ddim;
|
glm::vec2 pos, ddim;
|
||||||
std::string name;
|
std::string name;
|
||||||
|
|
||||||
pos.x = 0.35f;
|
pos.x = 0.35f;
|
||||||
|
|
|
@ -63,7 +63,7 @@ void CScreenModList::CreateInterface()
|
||||||
CLabel* pl;
|
CLabel* pl;
|
||||||
CButton* pb;
|
CButton* pb;
|
||||||
CList* pli;
|
CList* pli;
|
||||||
Math::Point pos, ddim;
|
glm::vec2 pos, ddim;
|
||||||
std::string name;
|
std::string name;
|
||||||
|
|
||||||
// Display the window
|
// Display the window
|
||||||
|
|
|
@ -58,7 +58,7 @@ void CScreenPlayerSelect::CreateInterface()
|
||||||
CButton* pb;
|
CButton* pb;
|
||||||
CList* pli;
|
CList* pli;
|
||||||
CGroup* pg;
|
CGroup* pg;
|
||||||
Math::Point pos, ddim;
|
glm::vec2 pos, ddim;
|
||||||
std::string name;
|
std::string name;
|
||||||
|
|
||||||
pos.x = 0.10f;
|
pos.x = 0.10f;
|
||||||
|
|
|
@ -44,7 +44,7 @@ void CScreenQuit::CreateInterface()
|
||||||
CEdit* pe;
|
CEdit* pe;
|
||||||
CLabel* pl;
|
CLabel* pl;
|
||||||
CButton* pb;
|
CButton* pb;
|
||||||
Math::Point pos, ddim;
|
glm::vec2 pos, ddim;
|
||||||
std::string name;
|
std::string name;
|
||||||
|
|
||||||
pos.x = 0.0f;
|
pos.x = 0.0f;
|
||||||
|
|
|
@ -59,7 +59,7 @@ void CScreenSetup::CreateInterface()
|
||||||
{
|
{
|
||||||
CWindow* pw;
|
CWindow* pw;
|
||||||
CButton* pb;
|
CButton* pb;
|
||||||
Math::Point pos, ddim;
|
glm::vec2 pos, ddim;
|
||||||
std::string name;
|
std::string name;
|
||||||
|
|
||||||
pos.x = 0.10f;
|
pos.x = 0.10f;
|
||||||
|
|
|
@ -58,8 +58,8 @@ void CScreenSetupControls::CreateInterface()
|
||||||
CButton* pb;
|
CButton* pb;
|
||||||
CGroup* pg;
|
CGroup* pg;
|
||||||
CList* pli;
|
CList* pli;
|
||||||
CEditValue* pev;
|
CEditValue* pev;
|
||||||
Math::Point pos, ddim;
|
glm::vec2 pos, ddim;
|
||||||
std::string name;
|
std::string name;
|
||||||
|
|
||||||
CScreenSetup::CreateInterface();
|
CScreenSetup::CreateInterface();
|
||||||
|
@ -344,10 +344,10 @@ void CScreenSetupControls::UpdateKey()
|
||||||
for (int i = 0; i < INPUT_SLOT_MAX; i++)
|
for (int i = 0; i < INPUT_SLOT_MAX; i++)
|
||||||
pw->DeleteControl(static_cast<EventType>(EVENT_INTERFACE_KEY+i));
|
pw->DeleteControl(static_cast<EventType>(EVENT_INTERFACE_KEY+i));
|
||||||
|
|
||||||
Math::Point dim;
|
glm::vec2 dim;
|
||||||
dim.x = 250.0f/640.0f;
|
dim.x = 250.0f/640.0f;
|
||||||
dim.y = 20.0f/480.0f;
|
dim.y = 20.0f/480.0f;
|
||||||
Math::Point pos;
|
glm::vec2 pos;
|
||||||
pos.x = 110.0f/640.0f;
|
pos.x = 110.0f/640.0f;
|
||||||
pos.y = 128.0f/480.0f + dim.y*(KEY_VISIBLE-1);
|
pos.y = 128.0f/480.0f + dim.y*(KEY_VISIBLE-1);
|
||||||
for (int i = 0; i < KEY_VISIBLE; i++)
|
for (int i = 0; i < KEY_VISIBLE; i++)
|
||||||
|
|
|
@ -57,7 +57,7 @@ void CScreenSetupDisplay::CreateInterface()
|
||||||
CList* pli;
|
CList* pli;
|
||||||
CCheck* pc;
|
CCheck* pc;
|
||||||
CButton* pb;
|
CButton* pb;
|
||||||
Math::Point pos, ddim;
|
glm::vec2 pos, ddim;
|
||||||
std::string name;
|
std::string name;
|
||||||
|
|
||||||
CScreenSetup::CreateInterface();
|
CScreenSetup::CreateInterface();
|
||||||
|
|
|
@ -54,7 +54,7 @@ void CScreenSetupGame::CreateInterface()
|
||||||
CCheck* pc;
|
CCheck* pc;
|
||||||
CSlider* psl;
|
CSlider* psl;
|
||||||
CList* pli;
|
CList* pli;
|
||||||
Math::Point pos, ddim;
|
glm::vec2 pos, ddim;
|
||||||
std::string name;
|
std::string name;
|
||||||
|
|
||||||
CScreenSetup::CreateInterface();
|
CScreenSetup::CreateInterface();
|
||||||
|
|
|
@ -57,7 +57,7 @@ void CScreenSetupGraphics::CreateInterface()
|
||||||
CCheck* pc;
|
CCheck* pc;
|
||||||
CEnumSlider* pes;
|
CEnumSlider* pes;
|
||||||
CButton* pb;
|
CButton* pb;
|
||||||
Math::Point pos, ddim;
|
glm::vec2 pos, ddim;
|
||||||
std::string name;
|
std::string name;
|
||||||
|
|
||||||
CScreenSetup::CreateInterface();
|
CScreenSetup::CreateInterface();
|
||||||
|
|
|
@ -55,7 +55,7 @@ void CScreenSetupSound::CreateInterface()
|
||||||
CSlider* psl;
|
CSlider* psl;
|
||||||
CButton* pb;
|
CButton* pb;
|
||||||
CCheck* pc;
|
CCheck* pc;
|
||||||
Math::Point pos, ddim;
|
glm::vec2 pos, ddim;
|
||||||
std::string name;
|
std::string name;
|
||||||
|
|
||||||
CScreenSetup::CreateInterface();
|
CScreenSetup::CreateInterface();
|
||||||
|
|
|
@ -49,7 +49,7 @@ void CScreenWelcome::SetImageIndex(int imageIndex)
|
||||||
|
|
||||||
void CScreenWelcome::CreateInterface()
|
void CScreenWelcome::CreateInterface()
|
||||||
{
|
{
|
||||||
Math::Point pos, ddim;
|
glm::vec2 pos, ddim;
|
||||||
|
|
||||||
pos.x = 0.0f;
|
pos.x = 0.0f;
|
||||||
pos.y = 0.0f;
|
pos.y = 0.0f;
|
||||||
|
|
Loading…
Reference in New Issue