draw test menu before entering game
This commit is contained in:
1 parent
f3770d1c89
commit
a4df9488a9
1 file changed
+19
-6
+19
-6
@@ -94,7 +94,6 @@ void Client::run(bool fullscreen, int width, int height, std::string pname)
|
|||||||
m_clock.restart();
|
m_clock.restart();
|
||||||
recenter_cursor();
|
recenter_cursor();
|
||||||
|
|
||||||
#if 0
|
|
||||||
sfg::SFGUI sfgui;
|
sfg::SFGUI sfgui;
|
||||||
sfg::Label::Ptr label = sfg::Label::Create("Label Test");
|
sfg::Label::Ptr label = sfg::Label::Create("Label Test");
|
||||||
sfg::Window::Ptr window(sfg::Window::Create());
|
sfg::Window::Ptr window(sfg::Window::Create());
|
||||||
@@ -102,18 +101,35 @@ void Client::run(bool fullscreen, int width, int height, std::string pname)
|
|||||||
window->Add(label);
|
window->Add(label);
|
||||||
sfg::Desktop desktop;
|
sfg::Desktop desktop;
|
||||||
desktop.Add(window);
|
desktop.Add(window);
|
||||||
|
m_window->resetGLStates();
|
||||||
|
|
||||||
sf::Event event;
|
sf::Event event;
|
||||||
|
|
||||||
while (m_window->isOpen())
|
bool in_menu = true;
|
||||||
|
while (in_menu)
|
||||||
{
|
{
|
||||||
while (m_window->pollEvent(event))
|
while (m_window->pollEvent(event))
|
||||||
{
|
{
|
||||||
desktop.HandleEvent(event);
|
desktop.HandleEvent(event);
|
||||||
|
|
||||||
if (event.type == sf::Event::Closed)
|
switch (event.type)
|
||||||
{
|
{
|
||||||
|
case sf::Event::Closed:
|
||||||
m_window->close();
|
m_window->close();
|
||||||
|
in_menu = false;
|
||||||
|
break;
|
||||||
|
case sf::Event::KeyPressed:
|
||||||
|
switch (event.key.code)
|
||||||
|
{
|
||||||
|
case sf::Keyboard::Escape:
|
||||||
|
in_menu = false;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -122,9 +138,7 @@ void Client::run(bool fullscreen, int width, int height, std::string pname)
|
|||||||
sfgui.Display(*m_window);
|
sfgui.Display(*m_window);
|
||||||
m_window->display();
|
m_window->display();
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
//#if 0
|
|
||||||
double last_time = 0.0;
|
double last_time = 0.0;
|
||||||
while (m_window->isOpen())
|
while (m_window->isOpen())
|
||||||
{
|
{
|
||||||
@@ -200,7 +214,6 @@ void Client::run(bool fullscreen, int width, int height, std::string pname)
|
|||||||
// temporary for now. otherwise this thread consumed way too processing
|
// temporary for now. otherwise this thread consumed way too processing
|
||||||
sf::sleep(sf::seconds(0.005)); // 5 milli-seconds
|
sf::sleep(sf::seconds(0.005)); // 5 milli-seconds
|
||||||
}
|
}
|
||||||
//#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Client::recenter_cursor()
|
void Client::recenter_cursor()
|
||||||
|
|||||||
Reference in new issue
Block a user