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

work

Browse Source
This commit is contained in:
milek7
2019-01-11 23:15:03 +01:00
parent ead2123d8e
commit 3db9efd3f7
18 changed files with 135 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
application.cpp
View File

@@ -109,6 +109,11 @@ eu07_application::init( int Argc, char *Argv[] ) {
int result { 0 };
WriteLog( "Starting MaSzyna rail vehicle simulator (release: " + Global.asVersion + ")" );
WriteLog( "For online documentation and additional files refer to: http://eu07.pl" );
WriteLog( "Authors: Marcin_EU, McZapkie, ABu, Winger, Tolaris, nbmx, OLO_EU, Bart, Quark-t, "
"ShaXbee, Oli_EU, youBy, KURS90, Ra, hunter, szociu, Stele, Q, firleju and others\n" );
init_debug();
init_files();
if( ( result = init_settings( Argc, Argv ) ) != 0 ) {
@@ -118,11 +123,6 @@ eu07_application::init( int Argc, char *Argv[] ) {
return result;
}
WriteLog( "Starting MaSzyna rail vehicle simulator (release: " + Global.asVersion + ")" );
WriteLog( "For online documentation and additional files refer to: http://eu07.pl" );
WriteLog( "Authors: Marcin_EU, McZapkie, ABu, Winger, Tolaris, nbmx, OLO_EU, Bart, Quark-t, "
"ShaXbee, Oli_EU, youBy, KURS90, Ra, hunter, szociu, Stele, Q, firleju and others\n" );
if( ( result = init_glfw() ) != 0 ) {
return result;
}
@@ -138,6 +138,9 @@ eu07_application::init( int Argc, char *Argv[] ) {
return result;
}
//Global.random_seed = std::time(nullptr);
//Global.random_engine.seed(Global.random_seed);
if (!init_network())
return -1;
@@ -167,6 +170,18 @@ void eu07_application::spawn_train(std::string name) {
}
}
double eu07_application::generate_sync() {
if (Timer::GetDeltaTime() == 0.0)
return 0.0;
double sync = 0.0;
for (const TDynamicObject* vehicle : simulation::Vehicles.sequence()) {
glm::vec3 pos = vehicle->GetPosition();
sync += pos.x + pos.y + pos.z;
}
sync += Random(1.0, 100.0);
return sync;
}
int
eu07_application::run() {
@@ -180,6 +195,7 @@ eu07_application::run() {
{
if (!m_modes[ m_modestack.top() ]->update())
break;
simulation::Commands->update();
}
else if (!Global.network_conf.is_server) {
command_queue_client *queue = dynamic_cast<command_queue_client*>(simulation::Commands.get());
@@ -187,26 +203,35 @@ eu07_application::run() {
do {
auto tup = m_network->get_next_delta();
delta = std::get<0>(tup);
queue->push_server_commands(std::get<1>(tup));
m_network->send_commands(queue->pop_queued_commands());
Timer::set_delta_override(delta);
queue->push_server_commands(std::get<2>(tup));
m_network->send_commands(queue->pop_queued_commands());
if (!m_modes[ m_modestack.top() ]->update())
break;
queue->update();
double sync = generate_sync();
if (sync != std::get<1>(tup)) {
WriteLog("net: DESYNC!", logtype::net);
}
}
while (delta != 0.0);
}
else {
command_queue_server *queue = dynamic_cast<command_queue_server*>(simulation::Commands.get());
queue->push_client_commands(m_network->pop_commands());
auto commands = queue->pop_queued_commands();
queue->push_client_commands(m_network->pop_commands());
queue->update();
if (!m_modes[ m_modestack.top() ]->update())
break;
queue->update();
double delta = Timer::GetDeltaTime();
m_network->push_delta(delta, commands);
m_network->push_delta(delta, generate_sync(), commands);
}
m_taskqueue.update();