mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-17 13:19:20 +02:00
* refactor(sonar): use override instead of redundant virtual (cpp:S3471) * refactor(sonar): remove empty statements, one declaration per statement (cpp:S1116, cpp:S1659) * refactor(sonar): drop redundant lambda return types (cpp:S3574) * refactor(sonar): prefer using over typedef (cpp:S5416) * refactor(sonar): use =default for trivial special members (cpp:S3490) * refactor(sonar): use nullptr literal (cpp:S4962) * refactor(sonar): remove redundant access specifiers (cpp:S3539) * refactor(sonar): remove redundant casts (cpp:S1905) * refactor(sonar): use std::scoped_lock instead of std::lock_guard (cpp:S5997) * refactor(sonar): construct elements in place with emplace_back (cpp:S6003) * refactor(sonar): make narrowing conversions explicit (cpp:S5276) * refactor(sonar): mark unused parameters (cpp:S1172) Unused names are commented out; parameters used only on some platforms are marked [[maybe_unused]]. * refactor(sonar): declare non-mutating member functions const (cpp:S5817) Virtual functions are left untouched so overrides keep matching. * refactor(sonar): merge collapsible nested if statements (cpp:S1066) Comments that preceded the inner if are kept above the merged statement. * refactor(sonar): scope single-use variables in if init-statements (cpp:S6004) * fix(sonar): give polymorphic base classes virtual destructors (cpp:S1235) * refactor(sonar): use try_emplace for map insertion (cpp:S6030) * refactor(sonar): use auto where the type is spelled out on the right (cpp:S5827) * refactor(sonar): remove redundant parentheses (cpp:S1110) * refactor(sonar): document intentionally empty functions (cpp:S1186) * refactor(sonar): remove dead stores (cpp:S1854) Side effects (e.g. LISTLINE++) are kept. * refactor(sonar): remove unused variables, captures and private fields (cpp:S1481, cpp:S1068) * refactor(sonar): use structured bindings for pair access (cpp:S6005) * refactor(sonar): use range-based loops and ranges algorithms (cpp:S5566) * refactor(sonar): split chained assignments (cpp:S1121) * refactor(sonar): add default cases to switch statements (cpp:S3562) * refactor(sonar): use std::size for array lengths (cpp:S7127) * refactor(sonar): use std::ranges algorithms and std::erase(_if) (cpp:S6197) * refactor(sonar): access static members through the class (cpp:S2209) * refactor(sonar): add braces around nested if-else (cpp:S5261) * refactor(sonar): avoid side effects inside typeid operands (cpp:S5279) * refactor(sonar): drop top-level const from by-value return types (cpp:S5951) * refactor(sonar): declare variables separately from their type definitions (cpp:S3646) * refactor(sonar): declare loop counters in the for statement (cpp:S5955) * refactor(sonar): rely on class template argument deduction (cpp:S6012) * refactor(sonar): inherit base constructors instead of forwarding them (cpp:S5952) * refactor(sonar): rename locals that shadow outer declarations (cpp:S1117) Only local variables and definition parameters are renamed; shadowing struct fields and enumerators in headers are left for a separate change. * refactor(sonar): reduce enum qualification with using enum (cpp:S6177) Applied only where no unqualified name in the block could be captured by the introduced enumerators. * refactor(sonar): mark converting constructors explicit (cpp:S1709) sound_source and the gl::object conversion operators stay implicit; they are relied upon by copy-list-initialisation and GL calls. * refactor(sonar): initialise members in initialiser lists or declarations (cpp:S3230) * refactor(sonar): make read-only local references and pointers const (cpp:S5350) * refactor(sonar): take read-only pointer and reference parameters as const (cpp:S995) TTrain command handlers keep their signature, it is fixed by the handler table. * refactor(sonar): pass expensive-to-copy parameters by const reference (cpp:S1238) Signatures declared in files touched by PR 206 (Driver.h, EU07.cpp) and virtual overrides are left unchanged. * refactor(sonar): use transparent comparators for string-keyed maps (cpp:S6045) std::unordered_map instances and map types exposed in headers used by other modules are left as they are. * fix(sonar): do not use UI text as a printf format string (cpp:S5281) Text lines containing '%' would otherwise be interpreted as format specifiers by ImGui::TextColored. * refactor(sonar): use std::bind_front for callbacks (cpp:S5995) * refactor(sonar): drop const_cast on string literals passed to the Python C API (cpp:S859) * refactor(sonar): take read-only string parameters as std::string_view (cpp:S6009) The Windows messaging helpers keep std::string, they need c_str(). * refactor(sonar): make read-only global tables const (cpp:S5421) Mutable global state (flags, timers, singletons) is left as is. * refactor(sonar): replace single-case switch statements with if (cpp:S1301) * refactor(sonar): format UUIDs and log timestamps with std::format (cpp:S6494, cpp:S5945) * refactor(sonar): use std::array for local fixed-size arrays (cpp:S5945) Arrays that are class members or part of headers are left unchanged. * fix(sonar): test the bearing damage bit, not bit 0 (cpp:S872) 'DamageFlag & dtrain_bearing > 0' parsed as 'DamageFlag & (dtrain_bearing > 0)', i.e. DamageFlag & 1, so bearing friction reacted to the wrong damage flag. * refactor(sonar): assorted small fixes - empty() instead of size() comparisons (cpp:S1155) - member initialisers in declaration order (cpp:S3229) - no redundant c_str() when a std::string is accepted (cpp:S7121) - contains() on associative containers (cpp:S6171) - const reference instead of a copying range-for (cpp:S6032) - starts_with() for prefix checks (cpp:S6178) - no std::move on temporaries (cpp:S5274) - has_value() on std::optional (cpp:S7172) - bool literals for bool members (cpp:S5820) - inline only on the definition (cpp:S3548) - explicit base access specifier (cpp:S5965) - explicit element access instead of dereferencing an array (cpp:S7116) - rely on the C++20 rewritten operator!= (cpp:S6186) * refactor(sonar): more small fixes - std::format instead of iostream manipulators in to_string/to_hex_str (cpp:S6495); output verified identical, negative hex values keep the unsigned form - remove an empty compound statement (cpp:S108) - drop an always-false unsigned < 0 branch (cpp:S1768) - explicit lambda capture (cpp:S3608) - std::make_unique (cpp:S5950) * chore: strip stray carriage returns left in TTrain constructor comments * fix: keep quantize() in its own value type The S5276 change cast the result of the generic quantize<Type_>() to unsigned int, which truncated float/double callers (shadow angle slider, editor rotation snapping, AI speed control steps) and broke negative values. * fix(sonar): use integer loop counters in segment sampling (cpp:S2193) * refactor(sonar): clean up issues reported on PR 209 - remove locals left unused after the dead-store cleanup (cpp:S1481, cpp:S1854) - unnamed unused parameter (cpp:S1172) - single-use declarations moved into if init-statements (cpp:S6004) - auto for casted initialisers (cpp:S5827) - const references and pointers where nothing is modified (cpp:S5350) - rename structured bindings shadowed by inner declarations (cpp:S1117)
274 lines
6.7 KiB
C++
274 lines
6.7 KiB
C++
#include "stdafx.h"
|
|
#include "network/network.h"
|
|
#include "network/message.h"
|
|
#include "utilities/Logs.h"
|
|
#include "scene/sn_utils.h"
|
|
#include "utilities/Timer.h"
|
|
#include "application/application.h"
|
|
#include "utilities/Globals.h"
|
|
|
|
std::uint32_t const EU07_NETWORK_VERSION = 2;
|
|
|
|
namespace network {
|
|
|
|
backend_list_t& backend_list() {
|
|
// HACK: static initialization order fiasco fix
|
|
// NOTE: potential static deinitialization order fiasco
|
|
static backend_list_t backend_list;
|
|
return backend_list;
|
|
}
|
|
|
|
}
|
|
// connection
|
|
|
|
void network::connection::disconnect() {
|
|
WriteLog("net: peer dropped", logtype::net);
|
|
state = DEAD;
|
|
}
|
|
|
|
void network::connection::set_handler(std::function<void (const message &)> handler) {
|
|
message_handler = handler;
|
|
}
|
|
|
|
network::connection::connection(bool client, size_t counter) : is_client(client), packet_counter(counter) {
|
|
state = AWAITING_HELLO;
|
|
}
|
|
|
|
void network::connection::connected()
|
|
{
|
|
WriteLog("net: socket connected", logtype::net);
|
|
|
|
if (is_client) {
|
|
client_hello msg;
|
|
msg.version = EU07_NETWORK_VERSION;
|
|
msg.start_packet = static_cast<uint32_t>(packet_counter);
|
|
send_message(msg);
|
|
}
|
|
}
|
|
|
|
void network::connection::catch_up()
|
|
{
|
|
backbuffer->seekg(backbuffer_pos);
|
|
|
|
std::vector<std::shared_ptr<message>> messages;
|
|
|
|
for (int i = 0; i < CATCHUP_PACKETS; i++) {
|
|
if (backbuffer->peek() == EOF) {
|
|
send_messages(messages);
|
|
state = ACTIVE;
|
|
backbuffer->seekg(0, std::ios_base::end);
|
|
return;
|
|
}
|
|
|
|
auto msg = deserialize_message(*backbuffer.get());
|
|
|
|
if (packet_counter) {
|
|
packet_counter--;
|
|
i--; // TODO: it would be better to skip frames in chunks
|
|
continue;
|
|
}
|
|
|
|
messages.push_back(msg);
|
|
}
|
|
|
|
backbuffer_pos = backbuffer->tellg();
|
|
backbuffer->seekg(0, std::ios_base::end);
|
|
|
|
send_messages(messages);
|
|
}
|
|
|
|
void network::connection::send_complete(std::shared_ptr<std::string> /*buf*/)
|
|
{
|
|
if (!is_client && state == CATCHING_UP) {
|
|
catch_up();
|
|
}
|
|
}
|
|
|
|
// --------------
|
|
|
|
// server
|
|
network::server::server(std::shared_ptr<std::istream> buf) : backbuffer(buf)
|
|
{
|
|
|
|
}
|
|
|
|
void network::server::push_delta(const frame_info &msg)
|
|
{
|
|
for (auto it = clients.begin(); it != clients.end(); ) {
|
|
if ((*it)->state == connection::DEAD) {
|
|
it = clients.erase(it);
|
|
continue;
|
|
}
|
|
|
|
if ((*it)->state == connection::ACTIVE)
|
|
(*it)->send_message(msg);
|
|
|
|
it++;
|
|
}
|
|
}
|
|
|
|
command_queue::commands_map network::server::pop_commands()
|
|
{
|
|
command_queue::commands_map map(client_commands_queue);
|
|
client_commands_queue.clear();
|
|
return map;
|
|
}
|
|
|
|
void network::server::handle_message(std::shared_ptr<connection> conn, const message &msg)
|
|
{
|
|
if (msg.type == message::TYPE_MAX)
|
|
{
|
|
conn->disconnect();
|
|
return;
|
|
}
|
|
|
|
if (msg.type == message::CLIENT_HELLO) {
|
|
const auto& cmd = dynamic_cast<const client_hello&>(msg);
|
|
|
|
if (cmd.version != EU07_NETWORK_VERSION // wrong version
|
|
|| !Global.ready_to_load) { // not ready yet
|
|
conn->disconnect();
|
|
return;
|
|
}
|
|
|
|
server_hello reply;
|
|
reply.seed = Global.random_seed;
|
|
reply.timestamp = Global.starting_timestamp;
|
|
reply.config = 0; // TODO: pass bitfield with state of relevant setting switches
|
|
reply.scenario = Global.SceneryFile;
|
|
conn->state = connection::CATCHING_UP;
|
|
conn->backbuffer = backbuffer;
|
|
conn->backbuffer_pos = 0;
|
|
conn->packet_counter = cmd.start_packet;
|
|
|
|
conn->send_message(reply);
|
|
|
|
WriteLog("net: client accepted", logtype::net);
|
|
}
|
|
else if (msg.type == message::REQUEST_COMMAND) {
|
|
const auto& cmd = dynamic_cast<const request_command&>(msg);
|
|
|
|
for (auto const &kv : cmd.commands)
|
|
client_commands_queue.try_emplace(kv.first, kv.second);
|
|
}
|
|
}
|
|
|
|
// ------------
|
|
|
|
void network::client::update()
|
|
{
|
|
if (conn && conn->state == connection::DEAD) {
|
|
conn.reset();
|
|
}
|
|
|
|
if (!conn) {
|
|
if (!reconnect_delay) {
|
|
connect();
|
|
reconnect_delay = RECONNECT_DELAY_FRAMES;
|
|
}
|
|
reconnect_delay--;
|
|
}
|
|
}
|
|
|
|
// client
|
|
std::tuple<double, double, command_queue::commands_map> network::client::get_next_delta(int counter)
|
|
{
|
|
auto now = std::chrono::high_resolution_clock::now();
|
|
if (counter == 1) {
|
|
frame_time = now - last_frame;
|
|
last_frame = now;
|
|
}
|
|
|
|
if (delta_queue.empty()) {
|
|
// buffer underflow
|
|
return std::tuple<double, double,
|
|
command_queue::commands_map>(0.0, 0.0, command_queue::commands_map());
|
|
}
|
|
|
|
|
|
float size = static_cast<float>(delta_queue.size()) - consume_counter;
|
|
const auto& entry = delta_queue.front();
|
|
auto mult = static_cast<float>(entry.render_dt / std::chrono::duration_cast<std::chrono::duration<float>>(frame_time).count());
|
|
|
|
if (counter == 1 && size < MAX_BUFFER_SIZE * 2.0f) {
|
|
last_target = last_target * TARGET_MIX +
|
|
(std::min(TARGET_MIN + jitteriness * JITTERINESS_MULTIPIER, MAX_BUFFER_SIZE)) * (1.0f - TARGET_MIX);
|
|
float diff = size - last_target;
|
|
jitteriness = std::max(jitteriness * JITTERINESS_MIX, std::abs(diff));
|
|
|
|
float speed = 1.0f + diff * CONSUME_MULTIPIER;
|
|
|
|
consume_counter += speed;
|
|
}
|
|
|
|
float last_rcv_diff = std::chrono::duration_cast<std::chrono::duration<float>>(now - last_rcv).count();
|
|
|
|
if (size > MAX_BUFFER_SIZE || consume_counter > mult || last_rcv_diff > 1.0f) {
|
|
if (consume_counter > mult) {
|
|
consume_counter = std::clamp(consume_counter - mult, -MAX_BUFFER_SIZE, MAX_BUFFER_SIZE);
|
|
}
|
|
|
|
delta_queue.pop();
|
|
|
|
return std::make_tuple(entry.dt, entry.sync, entry.commands);
|
|
} else {
|
|
// nothing to push
|
|
return std::tuple<double, double,
|
|
command_queue::commands_map>(0.0, 0.0, command_queue::commands_map());
|
|
}
|
|
}
|
|
|
|
void network::client::send_commands(command_queue::commands_map const &commands) const
|
|
{
|
|
if (!conn || conn->state == connection::DEAD || commands.empty())
|
|
return;
|
|
// eh, maybe queue lost messages
|
|
|
|
request_command msg;
|
|
msg.commands = commands;
|
|
|
|
conn->send_message(msg);
|
|
}
|
|
|
|
void network::client::handle_message(std::shared_ptr<connection> Connection, const message &msg)
|
|
{
|
|
if (msg.type >= message::TYPE_MAX)
|
|
{
|
|
Connection->disconnect();
|
|
return;
|
|
}
|
|
|
|
if (msg.type == message::SERVER_HELLO) {
|
|
const auto& cmd = dynamic_cast<const server_hello&>(msg);
|
|
Connection->state = connection::ACTIVE;
|
|
|
|
if (!Global.ready_to_load) {
|
|
Global.random_seed = cmd.seed;
|
|
Global.random_engine.seed(Global.random_seed);
|
|
Global.starting_timestamp = cmd.timestamp;
|
|
// TODO: configure simulation settings according to received cmd.config
|
|
Global.SceneryFile = cmd.scenario;
|
|
Global.ready_to_load = true;
|
|
} else if (Global.random_seed != cmd.seed) {
|
|
ErrorLog("net: seed mismatch", logtype::net);
|
|
Connection->disconnect();
|
|
return;
|
|
}
|
|
|
|
WriteLog("net: accept received", logtype::net);
|
|
}
|
|
|
|
if (Connection->state != connection::ACTIVE)
|
|
return;
|
|
|
|
if (msg.type == message::FRAME_INFO) {
|
|
resume_frame_counter++;
|
|
|
|
auto delta = dynamic_cast<const frame_info&>(msg);
|
|
delta_queue.push(delta);
|
|
last_rcv = std::chrono::high_resolution_clock::now();
|
|
}
|
|
}
|
|
|
|
// --------------
|