mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-17 02: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)
263 lines
6.8 KiB
C++
263 lines
6.8 KiB
C++
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "stdafx.h"
|
|
#include "scene/sn_utils.h"
|
|
|
|
#include <bit>
|
|
|
|
// sanity checks
|
|
static_assert(std::numeric_limits<double>::is_iec559, "IEEE754 required");
|
|
static_assert(sizeof(float) == 4, "Float must be 4 bytes");
|
|
static_assert(sizeof(double) == 8, "Double must be 8 bytes");
|
|
static_assert(-1 == ~0, "Two's complement required");
|
|
|
|
// deserialize little endian uint16
|
|
uint16_t sn_utils::ld_uint16(std::istream &s)
|
|
{
|
|
std::array<uint8_t, 2> buf{};
|
|
s.read(reinterpret_cast<char *>(buf.data()), buf.size());
|
|
auto v = static_cast<uint16_t>(buf[1] << 8 | buf[0]);
|
|
return v;
|
|
}
|
|
|
|
// deserialize little endian uint32
|
|
uint32_t sn_utils::ld_uint32(std::istream &s)
|
|
{
|
|
std::array<uint8_t, 4> buf{};
|
|
s.read(reinterpret_cast<char *>(buf.data()), buf.size());
|
|
uint32_t v = buf[3] << 24 | buf[2] << 16 | buf[1] << 8 | buf[0];
|
|
return v;
|
|
}
|
|
|
|
// deserialize little endian int32
|
|
int32_t sn_utils::ld_int32(std::istream &s)
|
|
{
|
|
std::array<uint8_t, 4> buf{};
|
|
s.read(reinterpret_cast<char *>(buf.data()), buf.size());
|
|
uint32_t v = buf[3] << 24 | buf[2] << 16 | buf[1] << 8 | buf[0];
|
|
return static_cast<int32_t>(v);
|
|
}
|
|
|
|
// deserialize little endian uint64
|
|
uint64_t sn_utils::ld_uint64(std::istream &s)
|
|
{
|
|
std::array<uint8_t, 8> buf{};
|
|
s.read(reinterpret_cast<char *>(buf.data()), buf.size());
|
|
uint64_t v = (uint64_t)buf[7] << 56 | (uint64_t)buf[6] << 48 |
|
|
(uint64_t)buf[5] << 40 | (uint64_t)buf[4] << 32 |
|
|
(uint64_t)buf[3] << 24 | (uint64_t)buf[2] << 16 |
|
|
(uint64_t)buf[1] << 8 | (uint64_t)buf[0];
|
|
return v;
|
|
}
|
|
|
|
// deserialize little endian int64
|
|
int64_t sn_utils::ld_int64(std::istream &s)
|
|
{
|
|
std::array<uint8_t, 8> buf{};
|
|
s.read(reinterpret_cast<char *>(buf.data()), buf.size());
|
|
uint64_t v = (uint64_t)buf[7] << 56 | (uint64_t)buf[6] << 48 |
|
|
(uint64_t)buf[5] << 40 | (uint64_t)buf[4] << 32 |
|
|
(uint64_t)buf[3] << 24 | (uint64_t)buf[2] << 16 |
|
|
(uint64_t)buf[1] << 8 | (uint64_t)buf[0];
|
|
return static_cast<int64_t>(v);
|
|
}
|
|
|
|
// deserialize little endian ieee754 float32
|
|
float sn_utils::ld_float32(std::istream &s)
|
|
{
|
|
std::array<uint8_t, 4> buf{};
|
|
s.read(reinterpret_cast<char *>(buf.data()), buf.size());
|
|
uint32_t v = buf[3] << 24 | buf[2] << 16 | buf[1] << 8 | buf[0];
|
|
return std::bit_cast<float>(v);
|
|
}
|
|
|
|
// deserialize little endian ieee754 float64
|
|
double sn_utils::ld_float64(std::istream &s)
|
|
{
|
|
std::array<uint8_t, 8> buf{};
|
|
s.read(reinterpret_cast<char *>(buf.data()), buf.size());
|
|
uint64_t v = (uint64_t)buf[7] << 56 | (uint64_t)buf[6] << 48 |
|
|
(uint64_t)buf[5] << 40 | (uint64_t)buf[4] << 32 |
|
|
(uint64_t)buf[3] << 24 | (uint64_t)buf[2] << 16 |
|
|
(uint64_t)buf[1] << 8 | (uint64_t)buf[0];
|
|
return std::bit_cast<double>(v);
|
|
}
|
|
|
|
// deserialize null-terminated string
|
|
std::string sn_utils::d_str(std::istream &s)
|
|
{
|
|
std::string r;
|
|
r.reserve(32);
|
|
char c{};
|
|
while (true)
|
|
{
|
|
s.read(&c, 1);
|
|
if (c == 0)
|
|
break;
|
|
r.push_back(c);
|
|
}
|
|
return r;
|
|
}
|
|
|
|
bool sn_utils::d_bool(std::istream& s)
|
|
{
|
|
return ld_uint16(s) == 1;
|
|
}
|
|
|
|
glm::dvec3 sn_utils::d_dvec3(std::istream& s)
|
|
{
|
|
return {
|
|
ld_float64(s),
|
|
ld_float64(s),
|
|
ld_float64(s) };
|
|
}
|
|
|
|
glm::vec3 sn_utils::d_vec3( std::istream& s )
|
|
{
|
|
return {
|
|
ld_float32(s),
|
|
ld_float32(s),
|
|
ld_float32(s) };
|
|
}
|
|
|
|
glm::vec4 sn_utils::d_vec4( std::istream& s )
|
|
{
|
|
return {
|
|
ld_float32(s),
|
|
ld_float32(s),
|
|
ld_float32(s),
|
|
ld_float32(s) };
|
|
}
|
|
|
|
uint8_t sn_utils::d_uint8( std::istream& s ) {
|
|
|
|
uint8_t buf;
|
|
s.read((char*)&buf, 1);
|
|
return buf;
|
|
}
|
|
|
|
|
|
void sn_utils::ls_uint16(std::ostream &s, uint16_t v)
|
|
{
|
|
std::array<uint8_t, 2> buf{};
|
|
buf[0] = static_cast<uint8_t>(v);
|
|
buf[1] = v >> 8;
|
|
s.write(reinterpret_cast<char const *>(buf.data()), buf.size());
|
|
}
|
|
|
|
void sn_utils::ls_uint32(std::ostream &s, uint32_t v)
|
|
{
|
|
std::array<uint8_t, 4> buf{};
|
|
buf[0] = static_cast<uint8_t>(v);
|
|
buf[1] = static_cast<uint8_t>(v >> 8);
|
|
buf[2] = static_cast<uint8_t>(v >> 16);
|
|
buf[3] = v >> 24;
|
|
s.write(reinterpret_cast<char const *>(buf.data()), buf.size());
|
|
}
|
|
|
|
void sn_utils::ls_int32(std::ostream &s, int32_t v)
|
|
{
|
|
std::array<uint8_t, 4> buf{};
|
|
buf[0] = static_cast<uint8_t>(v);
|
|
buf[1] = static_cast<uint8_t>(v >> 8);
|
|
buf[2] = static_cast<uint8_t>(v >> 16);
|
|
buf[3] = v >> 24;
|
|
s.write(reinterpret_cast<char const *>(buf.data()), buf.size());
|
|
}
|
|
|
|
void sn_utils::ls_uint64(std::ostream &s, uint64_t v)
|
|
{
|
|
std::array<uint8_t, 8> buf{};
|
|
buf[0] = static_cast<uint8_t>(v);
|
|
buf[1] = static_cast<uint8_t>(v >> 8);
|
|
buf[2] = static_cast<uint8_t>(v >> 16);
|
|
buf[3] = static_cast<uint8_t>(v >> 24);
|
|
buf[4] = static_cast<uint8_t>(v >> 32);
|
|
buf[5] = static_cast<uint8_t>(v >> 40);
|
|
buf[6] = static_cast<uint8_t>(v >> 48);
|
|
buf[7] = v >> 56;
|
|
s.write(reinterpret_cast<char const *>(buf.data()), buf.size());
|
|
}
|
|
|
|
void sn_utils::ls_int64(std::ostream &s, int64_t v)
|
|
{
|
|
std::array<uint8_t, 8> buf{};
|
|
buf[0] = static_cast<uint8_t>(v);
|
|
buf[1] = static_cast<uint8_t>(v >> 8);
|
|
buf[2] = static_cast<uint8_t>(v >> 16);
|
|
buf[3] = static_cast<uint8_t>(v >> 24);
|
|
buf[4] = static_cast<uint8_t>(v >> 32);
|
|
buf[5] = static_cast<uint8_t>(v >> 40);
|
|
buf[6] = static_cast<uint8_t>(v >> 48);
|
|
buf[7] = v >> 56;
|
|
s.write(reinterpret_cast<char const *>(buf.data()), buf.size());
|
|
}
|
|
|
|
void sn_utils::ls_float32(std::ostream &s, float t)
|
|
{
|
|
auto v = std::bit_cast<uint32_t>(t);
|
|
std::array<uint8_t, 4> buf{};
|
|
buf[0] = static_cast<uint8_t>(v);
|
|
buf[1] = static_cast<uint8_t>(v >> 8);
|
|
buf[2] = static_cast<uint8_t>(v >> 16);
|
|
buf[3] = v >> 24;
|
|
s.write(reinterpret_cast<char const *>(buf.data()), buf.size());
|
|
}
|
|
|
|
void sn_utils::ls_float64(std::ostream &s, double t)
|
|
{
|
|
auto v = std::bit_cast<uint64_t>(t);
|
|
std::array<uint8_t, 8> buf{};
|
|
buf[0] = static_cast<uint8_t>(v);
|
|
buf[1] = static_cast<uint8_t>(v >> 8);
|
|
buf[2] = static_cast<uint8_t>(v >> 16);
|
|
buf[3] = static_cast<uint8_t>(v >> 24);
|
|
buf[4] = static_cast<uint8_t>(v >> 32);
|
|
buf[5] = static_cast<uint8_t>(v >> 40);
|
|
buf[6] = static_cast<uint8_t>(v >> 48);
|
|
buf[7] = v >> 56;
|
|
s.write(reinterpret_cast<char const *>(buf.data()), buf.size());
|
|
}
|
|
|
|
void sn_utils::s_uint8(std::ostream &s, uint8_t v)
|
|
{
|
|
s.write((char*)&v, 1);
|
|
}
|
|
|
|
void sn_utils::s_str(std::ostream &s, std::string const &v)
|
|
{
|
|
const char* buf = v.c_str();
|
|
s.write(buf, v.size() + 1);
|
|
}
|
|
|
|
void sn_utils::s_bool(std::ostream &s, bool v)
|
|
{
|
|
ls_uint16(
|
|
s,
|
|
true == v ? 1 : 0 );
|
|
}
|
|
|
|
void sn_utils::s_dvec3(std::ostream &s, glm::dvec3 const &v)
|
|
{
|
|
ls_float64(s, v.x);
|
|
ls_float64(s, v.y);
|
|
ls_float64(s, v.z);
|
|
}
|
|
|
|
void sn_utils::s_vec3(std::ostream &s, glm::vec3 const &v)
|
|
{
|
|
ls_float32(s, v.x);
|
|
ls_float32(s, v.y);
|
|
ls_float32(s, v.z);
|
|
}
|
|
|
|
void sn_utils::s_vec4(std::ostream &s, glm::vec4 const &v)
|
|
{
|
|
ls_float32(s, v.x);
|
|
ls_float32(s, v.y);
|
|
ls_float32(s, v.z);
|
|
ls_float32(s, v.w);
|
|
}
|