eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 07:49:19 +02:00
Code Issues 121 Wiki Activity

work

Browse Source
This commit is contained in:
milek7
2019-01-01 00:26:11 +01:00
parent 4db460d655
commit 63afece4a6
24 changed files with 563 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
application.cpp
View File

@@ -153,8 +153,35 @@ eu07_application::run() {
Timer::subsystem.mainloop_total.start();
glfwPollEvents();
if (!m_modes[ m_modestack.top() ]->update())
break;
if (!m_network)
{
if (!m_modes[ m_modestack.top() ]->update())
break;
}
else if (!Global.network_conf.is_server) {
double delta;
do {
auto tup = m_network->get_next_delta();
delta = std::get<0>(tup);
simulation::Commands.merge_command_sequences(std::get<1>(tup));
Timer::set_delta_override(delta);
simulation::Commands.update();
if (!m_modes[ m_modestack.top() ]->update())
break;
}
while (delta != 0.0);
}
else {
auto commands = simulation::Commands.peek_command_sequences();
simulation::Commands.update();
if (!m_modes[ m_modestack.top() ]->update())
break;
double delta = Timer::GetDeltaTime();
m_network->push_delta(delta, commands);
}
m_taskqueue.update();
opengl_texture::reset_unit_cache();
@@ -169,7 +196,6 @@ eu07_application::run() {
m_modes[ m_modestack.top() ]->on_event_poll();
simulation::Commands.update();
if (m_screenshot_queued) {
m_screenshot_queued = false;
screenshot_man.make_screenshot();
@@ -177,7 +203,7 @@ eu07_application::run() {
Timer::subsystem.mainloop_total.stop();
if (Global.network_conf.enabled)
if (m_network)
m_network->poll();
}