diff options
Diffstat (limited to 'src/guiMainMenu.cpp')
-rw-r--r-- | src/guiMainMenu.cpp | 185 |
1 files changed, 152 insertions, 33 deletions
diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp index 6c5d6553c..ef0a013f1 100644 --- a/src/guiMainMenu.cpp +++ b/src/guiMainMenu.cpp @@ -64,7 +64,11 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) std::wstring text_address; std::wstring text_port; bool creative_mode; - + bool enable_damage; + bool fancy_trees; + bool smooth_lighting; + + // Client options { gui::IGUIElement *e = getElementFromId(258); if(e != NULL) @@ -87,12 +91,35 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) text_port = m_data->port; } { + gui::IGUIElement *e = getElementFromId(263); + if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX) + fancy_trees = ((gui::IGUICheckBox*)e)->isChecked(); + else + fancy_trees = m_data->fancy_trees; + } + { + gui::IGUIElement *e = getElementFromId(262); + if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX) + smooth_lighting = ((gui::IGUICheckBox*)e)->isChecked(); + else + smooth_lighting = m_data->smooth_lighting; + } + + // Server options + { gui::IGUIElement *e = getElementFromId(259); if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX) creative_mode = ((gui::IGUICheckBox*)e)->isChecked(); else creative_mode = m_data->creative_mode; } + { + gui::IGUIElement *e = getElementFromId(261); + if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX) + enable_damage = ((gui::IGUICheckBox*)e)->isChecked(); + else + enable_damage = m_data->enable_damage; + } /* Remove stuff @@ -102,86 +129,144 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) /* Calculate new sizes and positions */ + + v2s32 size(620, 430); + core::rect<s32> rect( - screensize.X/2 - 580/2, - screensize.Y/2 - 300/2, - screensize.X/2 + 580/2, - screensize.Y/2 + 300/2 + screensize.X/2 - size.X/2, + screensize.Y/2 - size.Y/2, + screensize.X/2 + size.X/2, + screensize.Y/2 + size.Y/2 ); - + DesiredRect = rect; recalculateAbsolutePosition(false); - v2s32 size = rect.getSize(); + //v2s32 size = rect.getSize(); /* Add stuff */ - // Nickname + /* + Client section + */ + + v2s32 topleft_client(40, 0); + v2s32 size_client = size - v2s32(40, 0); + { - core::rect<s32> rect(0, 0, 100, 20); - rect = rect + v2s32(size.X/2 - 250, size.Y/2 - 100 + 6); - const wchar_t *text = L"Nickname"; + core::rect<s32> rect(0, 0, 20, 125); + rect += topleft_client + v2s32(-15, 60); + const wchar_t *text = L"C\nL\nI\nE\nN\nT"; + //gui::IGUIStaticText *t = Environment->addStaticText(text, rect, false, true, this, -1); + //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT); } + + // Nickname + password { - core::rect<s32> rect(0, 0, 250, 30); - rect = rect + v2s32(size.X/2 - 130, size.Y/2 - 100); + core::rect<s32> rect(0, 0, 110, 20); + rect += topleft_client + v2s32(35, 50+6); + const wchar_t *text = L"Name/Password"; + Environment->addStaticText(text, rect, false, true, this, -1); + } + { + core::rect<s32> rect(0, 0, 230, 30); + rect += topleft_client + v2s32(160, 50); gui::IGUIElement *e = Environment->addEditBox(text_name.c_str(), rect, true, this, 258); if(text_name == L"") Environment->setFocus(e); } + { + core::rect<s32> rect(0, 0, 120, 30); + rect += topleft_client + v2s32(size_client.X-60-100, 50); + gui::IGUIEditBox *e = + Environment->addEditBox(L"", rect, true, this, 264); + e->setPasswordBox(true); + + } // Address + port { - core::rect<s32> rect(0, 0, 100, 20); - rect = rect + v2s32(size.X/2 - 250, size.Y/2 - 50 + 6); - const wchar_t *text = L"Address + Port"; + core::rect<s32> rect(0, 0, 110, 20); + rect += topleft_client + v2s32(35, 100+6); + const wchar_t *text = L"Address/Port"; Environment->addStaticText(text, rect, false, true, this, -1); } { - core::rect<s32> rect(0, 0, 250, 30); - rect = rect + v2s32(size.X/2 - 130, size.Y/2 - 50); + core::rect<s32> rect(0, 0, 230, 30); + rect += topleft_client + v2s32(160, 100); gui::IGUIElement *e = Environment->addEditBox(text_address.c_str(), rect, true, this, 256); if(text_name != L"") Environment->setFocus(e); } { - core::rect<s32> rect(0, 0, 100, 30); - rect = rect + v2s32(size.X/2 - 130 + 250 + 20, size.Y/2 - 50); + core::rect<s32> rect(0, 0, 120, 30); + //rect += topleft_client + v2s32(160+250+20, 125); + rect += topleft_client + v2s32(size_client.X-60-100, 100); Environment->addEditBox(text_port.c_str(), rect, true, this, 257); } { core::rect<s32> rect(0, 0, 400, 20); - rect = rect + v2s32(size.X/2 - 130, size.Y/2 - 50 + 35); + rect += topleft_client + v2s32(160, 100+35); const wchar_t *text = L"Leave address blank to start a local server."; Environment->addStaticText(text, rect, false, true, this, -1); } - // Server parameters { - core::rect<s32> rect(0, 0, 100, 20); - rect = rect + v2s32(size.X/2 - 250, size.Y/2 + 25 + 6); - const wchar_t *text = L"Server params"; - Environment->addStaticText(text, rect, false, true, this, -1); + core::rect<s32> rect(0, 0, 250, 30); + rect += topleft_client + v2s32(35, 150); + Environment->addCheckBox(fancy_trees, rect, this, 263, + L"Fancy trees"); } { core::rect<s32> rect(0, 0, 250, 30); - rect = rect + v2s32(size.X/2 - 130, size.Y/2 + 25); - Environment->addCheckBox(creative_mode, rect, this, 259, L"Creative Mode"); + rect += topleft_client + v2s32(35, 150+30); + Environment->addCheckBox(smooth_lighting, rect, this, 262, + L"Smooth Lighting"); } // Start game button { core::rect<s32> rect(0, 0, 180, 30); - rect = rect + v2s32(size.X/2-180/2, size.Y/2-30/2 + 100); + //rect += topleft_client + v2s32(size_client.X/2-180/2, 225-30/2); + rect += topleft_client + v2s32(size_client.X-180-40, 150+25); Environment->addButton(rect, this, 257, L"Start Game / Connect"); } + + /* + Server section + */ + + v2s32 topleft_server(40, 250); + v2s32 size_server = size - v2s32(40, 0); + + { + core::rect<s32> rect(0, 0, 20, 125); + rect += topleft_server + v2s32(-15, 40); + const wchar_t *text = L"S\nE\nR\nV\nE\nR"; + //gui::IGUIStaticText *t = + Environment->addStaticText(text, rect, false, true, this, -1); + //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT); + } + + // Server parameters + { + core::rect<s32> rect(0, 0, 250, 30); + rect += topleft_server + v2s32(35, 30); + Environment->addCheckBox(creative_mode, rect, this, 259, L"Creative Mode"); + } + { + core::rect<s32> rect(0, 0, 250, 30); + rect += topleft_server + v2s32(35, 60); + Environment->addCheckBox(enable_damage, rect, this, 261, L"Enable Damage"); + } // Map delete button { core::rect<s32> rect(0, 0, 130, 30); - rect = rect + v2s32(size.X/2-130/2+200, size.Y/2-30/2 + 100); - Environment->addButton(rect, this, 260, L"Delete map"); + //rect += topleft_server + v2s32(size_server.X-40-130, 100+25); + rect += topleft_server + v2s32(40, 100+25); + Environment->addButton(rect, this, 260, L"Delete world"); } } @@ -192,8 +277,22 @@ void GUIMainMenu::drawMenu() return; video::IVideoDriver* driver = Environment->getVideoDriver(); + /*video::SColor bgcolor(140,0,0,0); + driver->draw2DRectangle(bgcolor, AbsoluteRect, &AbsoluteClippingRect);*/ + video::SColor bgcolor(140,0,0,0); - driver->draw2DRectangle(bgcolor, AbsoluteRect, &AbsoluteClippingRect); + + { + core::rect<s32> rect(0, 0, 620, 230); + rect += AbsoluteRect.UpperLeftCorner; + driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect); + } + + { + core::rect<s32> rect(0, 250, 620, 430); + rect += AbsoluteRect.UpperLeftCorner; + driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect); + } gui::IGUIElement::draw(); } @@ -206,6 +305,11 @@ void GUIMainMenu::acceptInput() m_data->name = e->getText(); } { + gui::IGUIElement *e = getElementFromId(264); + if(e != NULL) + m_data->password = e->getText(); + } + { gui::IGUIElement *e = getElementFromId(256); if(e != NULL) m_data->address = e->getText(); @@ -220,6 +324,21 @@ void GUIMainMenu::acceptInput() if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX) m_data->creative_mode = ((gui::IGUICheckBox*)e)->isChecked(); } + { + gui::IGUIElement *e = getElementFromId(261); + if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX) + m_data->enable_damage = ((gui::IGUICheckBox*)e)->isChecked(); + } + { + gui::IGUIElement *e = getElementFromId(262); + if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX) + m_data->smooth_lighting = ((gui::IGUICheckBox*)e)->isChecked(); + } + { + gui::IGUIElement *e = getElementFromId(263); + if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX) + m_data->fancy_trees = ((gui::IGUICheckBox*)e)->isChecked(); + } m_accepted = true; } @@ -274,7 +393,7 @@ bool GUIMainMenu::OnEvent(const SEvent& event) { switch(event.GUIEvent.Caller->getID()) { - case 256: case 257: case 258: + case 256: case 257: case 258: case 264: acceptInput(); quitMenu(); return true; |