mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-07-18 00:49:19 +02:00
desync info tweaks
This commit is contained in:
@@ -248,6 +248,7 @@ struct global_settings {
|
|||||||
|
|
||||||
std::vector<std::pair<std::string, std::string>> network_servers;
|
std::vector<std::pair<std::string, std::string>> network_servers;
|
||||||
std::optional<std::pair<std::string, std::string>> network_client;
|
std::optional<std::pair<std::string, std::string>> network_client;
|
||||||
|
float desync = 0.0f;
|
||||||
|
|
||||||
std::unordered_map<int, std::string> trainset_overrides;
|
std::unordered_map<int, std::string> trainset_overrides;
|
||||||
|
|
||||||
|
|||||||
@@ -257,9 +257,7 @@ eu07_application::run() {
|
|||||||
WriteLog("net: desync! calculated: " + std::to_string(sync)
|
WriteLog("net: desync! calculated: " + std::to_string(sync)
|
||||||
+ ", received: " + std::to_string(slave_sync), logtype::net);
|
+ ", received: " + std::to_string(slave_sync), logtype::net);
|
||||||
|
|
||||||
ImGui::Begin("NET");
|
Global.desync = slave_sync - sync;
|
||||||
ImGui::TextUnformatted("desync!");
|
|
||||||
ImGui::End();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// set total delta for rendering code
|
// set total delta for rendering code
|
||||||
|
|||||||
@@ -261,4 +261,11 @@ driver_ui::render_() {
|
|||||||
m_pause_modal_opened = true;
|
m_pause_modal_opened = true;
|
||||||
ImGui::OpenPopup(popupheader);
|
ImGui::OpenPopup(popupheader);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (Global.desync != 0.0f) {
|
||||||
|
ImGui::SetNextWindowSize(ImVec2(-1, -1));
|
||||||
|
if (ImGui::Begin("network", nullptr, ImGuiWindowFlags_NoCollapse))
|
||||||
|
ImGui::Text("desync: %0.2f", Global.desync);
|
||||||
|
ImGui::End();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -243,7 +243,11 @@ void network::client::handle_message(std::shared_ptr<connection> conn, const mes
|
|||||||
|
|
||||||
WriteLog("net: accept received", logtype::net);
|
WriteLog("net: accept received", logtype::net);
|
||||||
}
|
}
|
||||||
else if (msg.type == message::FRAME_INFO) {
|
|
||||||
|
if (conn->state != connection::ACTIVE)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (msg.type == message::FRAME_INFO) {
|
||||||
resume_frame_counter++;
|
resume_frame_counter++;
|
||||||
|
|
||||||
auto delta = dynamic_cast<const frame_info&>(msg);
|
auto delta = dynamic_cast<const frame_info&>(msg);
|
||||||
|
|||||||
Reference in New Issue
Block a user