mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-17 09:49:19 +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)
163 lines
4.2 KiB
C++
163 lines
4.2 KiB
C++
#include "stdafx.h"
|
|
#include "utilities/motiontelemetry.h"
|
|
#include "utilities/Globals.h"
|
|
#include "utilities/Logs.h"
|
|
#include "vehicle/Train.h"
|
|
#include "utilities/Timer.h"
|
|
#include "vehicle/Driver.h"
|
|
#include "simulation/simulation.h"
|
|
|
|
#ifdef _WIN32
|
|
#include <winsock2.h>
|
|
#include <ws2tcpip.h>
|
|
#else
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <netdb.h>
|
|
#include <arpa/inet.h>
|
|
#include <netinet/in.h>
|
|
#endif
|
|
|
|
motiontelemetry::motiontelemetry()
|
|
{
|
|
conf = Global.motiontelemetry_conf;
|
|
|
|
#ifdef _WIN32
|
|
WSADATA wsd;
|
|
if (WSAStartup(MAKEWORD(2, 2), &wsd))
|
|
throw std::runtime_error("failed to init winsock");
|
|
#endif
|
|
|
|
struct addrinfo hints;
|
|
struct addrinfo *res;
|
|
memset(&hints, 0, sizeof(hints));
|
|
|
|
hints.ai_family = AF_UNSPEC;
|
|
hints.ai_socktype = conf.proto == "tcp" ? SOCK_STREAM : SOCK_DGRAM;
|
|
|
|
if (getaddrinfo(conf.address.c_str(), conf.port.c_str(), &hints, &res))
|
|
throw std::runtime_error("motiontelemetry: getaddrinfo failed");
|
|
|
|
sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
|
|
|
|
if (sock == -1)
|
|
throw std::runtime_error("motiontelemetry: failed to create socket");
|
|
|
|
if (connect(sock, res->ai_addr, res->ai_addrlen) == -1)
|
|
throw std::runtime_error("motiontelemetry: failed to connect socket");
|
|
|
|
WriteLog("motiontelemetry: socket connected");
|
|
}
|
|
|
|
motiontelemetry::~motiontelemetry()
|
|
{
|
|
shutdown(sock, 2);
|
|
#ifdef _WIN32
|
|
WSACleanup();
|
|
#endif
|
|
}
|
|
|
|
void motiontelemetry::update()
|
|
{
|
|
auto now = std::chrono::high_resolution_clock::now();
|
|
if (std::chrono::duration<float>(now - last_update).count() < conf.updatetime)
|
|
return;
|
|
last_update = now;
|
|
|
|
if (Global.iPause)
|
|
return;
|
|
|
|
const TTrain *t = simulation::Train;
|
|
if (!t)
|
|
return;
|
|
|
|
double dt = Timer::GetDeltaTime();
|
|
|
|
glm::dvec3 frontvector = t->Dynamic()->VectorFront();
|
|
glm::dvec3 up = t->Dynamic()->VectorUp();
|
|
glm::dvec3 leftvector = t->Dynamic()->VectorLeft();
|
|
|
|
glm::dvec3 pos = t->Dynamic()->GetPosition();
|
|
glm::dvec3 vel = (pos - last_pos) / dt;
|
|
glm::dvec3 acc = (vel - last_vel) / dt;
|
|
|
|
glm::dvec3 local_acc;
|
|
|
|
if (conf.includegravity)
|
|
{
|
|
glm::dvec3 gravity(0.0, 9.81, 0.0);
|
|
local_acc = glm::dvec3(-glm::dot(gravity, leftvector), glm::dot(gravity, up), glm::dot(gravity, frontvector));
|
|
}
|
|
|
|
if (conf.latposbased)
|
|
local_acc.x -= glm::dot(acc, leftvector);
|
|
else
|
|
local_acc.x -= t->Occupied()->AccN;
|
|
|
|
local_acc.y += glm::dot(acc, up) + t->Occupied()->AccVert * conf.axlebumpscale;
|
|
|
|
if (conf.fwdposbased)
|
|
local_acc.z += glm::dot(acc, frontvector);
|
|
else
|
|
local_acc.z += t->Occupied()->AccSVBased;
|
|
|
|
local_acc /= 9.81;
|
|
|
|
// roll calculation, maybe too complicated?
|
|
|
|
// transform to left-handed
|
|
frontvector.z *= -1;
|
|
up.z *= -1;
|
|
|
|
// make sure that vectors are orthonormal
|
|
glm::dvec3 oright = glm::normalize(glm::cross(up, frontvector));
|
|
glm::dvec3 oup = glm::cross(frontvector, oright);
|
|
|
|
// right and up vector without roll
|
|
glm::dvec3 right0 = glm::normalize(glm::cross(glm::dvec3(0.0, 1.0, 0.0), frontvector));
|
|
glm::dvec3 up0 = glm::cross(frontvector, right0);
|
|
|
|
double cosroll = glm::dot(up0, oup);
|
|
double sinroll;
|
|
|
|
if (abs(right0.x) > abs(right0.y) && abs(right0.x) > abs(right0.z))
|
|
sinroll = (up0.x * cosroll - oup.x) / right0.x;
|
|
else if (abs(right0.y) > abs(right0.x) && abs(right0.y) > abs(right0.z))
|
|
sinroll = (up0.y * cosroll - oup.y) / right0.y;
|
|
else
|
|
sinroll = (up0.z * cosroll - oup.z) / right0.z;
|
|
|
|
glm::dvec3 rot(asin(-frontvector.y), atan2(frontvector.x, frontvector.z), asin(sinroll));
|
|
|
|
double velocity = t->Occupied()->V;
|
|
double yaw_vel = (rot.y - last_yaw) / dt;
|
|
|
|
last_yaw = rot.y;
|
|
last_pos = pos;
|
|
last_vel = vel;
|
|
|
|
if (t->Occupied()->CabActive < 0)
|
|
{
|
|
velocity *= -1;
|
|
local_acc.x *= -1;
|
|
local_acc.z *= -1;
|
|
yaw_vel *= -1;
|
|
rot *= -1;
|
|
}
|
|
|
|
std::array<float, 12> buffer{};
|
|
buffer[0] = static_cast<float>(Timer::GetTime());
|
|
buffer[1] = static_cast<float>(velocity);
|
|
buffer[2] = static_cast<float>(local_acc.y);
|
|
buffer[3] = static_cast<float>(local_acc.z);
|
|
buffer[4] = static_cast<float>(local_acc.x);
|
|
buffer[5] = static_cast<float>(glm::degrees(rot.x));
|
|
buffer[6] = static_cast<float>(glm::degrees(rot.z));
|
|
buffer[7] = static_cast<float>(glm::degrees(rot.y));
|
|
buffer[8] = static_cast<float>(yaw_vel);
|
|
buffer[9] = 1.0f;
|
|
|
|
if (send(sock, reinterpret_cast<char const *>(buffer.data()), sizeof(buffer), 0) == -1)
|
|
WriteLog("motiontelemetry: socket send failed");
|
|
}
|