mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-17 05:09: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)
154 lines
3.9 KiB
C++
154 lines
3.9 KiB
C++
#pragma once
|
|
|
|
#include "object.h"
|
|
#include "bindable.h"
|
|
#include "buffer.h"
|
|
#include <glm/glm.hpp>
|
|
|
|
#define UBS_PAD(x) uint8_t PAD[x]
|
|
|
|
// 12-byte vec3 for structs that must match an exact binary layout (UBOs, vertex data).
|
|
// Stays packed regardless of GLM_FORCE_DEFAULT_ALIGNED_GENTYPES.
|
|
// Guard prevents redefinition when stdafx.h also defines it.
|
|
#ifndef PACKED_VEC3_DEFINED
|
|
#define PACKED_VEC3_DEFINED
|
|
using packed_vec3 = glm::vec<3, float, glm::packed_highp>;
|
|
#endif
|
|
|
|
namespace gl
|
|
{
|
|
class ubo : public buffer
|
|
{
|
|
int index;
|
|
|
|
public:
|
|
ubo(size_t size, int index, GLenum hint = GL_DYNAMIC_DRAW);
|
|
|
|
void bind_uniform();
|
|
|
|
void update(const uint8_t *data, int offset, GLsizeiptr size);
|
|
template <typename T> void update(const T &data, size_t offset = 0)
|
|
{
|
|
update(reinterpret_cast<const uint8_t*>(&data), static_cast<int>(offset), sizeof(data));
|
|
}
|
|
};
|
|
|
|
// layout std140
|
|
// structs must match with GLSL
|
|
// ordered to minimize padding
|
|
|
|
#pragma pack(push, 1)
|
|
|
|
const size_t MAX_TEXTURES = 8;
|
|
const size_t ENVMAP_SIZE = 1024;
|
|
const size_t MAX_CASCADES = 3;
|
|
const size_t HELPER_TEXTURES = 4;
|
|
const size_t SHADOW_TEX = MAX_TEXTURES + 0;
|
|
const size_t ENV_TEX = MAX_TEXTURES + 1;
|
|
const size_t HEADLIGHT_TEX = MAX_TEXTURES + 2;
|
|
|
|
struct scene_ubs
|
|
{
|
|
glm::mat4 projection;
|
|
glm::mat4 inv_view;
|
|
glm::mat4 lightview[MAX_CASCADES];
|
|
packed_vec3 cascade_end;
|
|
float time;
|
|
glm::vec4 rain_params;
|
|
glm::vec4 wiper_pos;
|
|
glm::vec4 wiper_timer_out;
|
|
glm::vec4 wiper_timer_return;
|
|
};
|
|
|
|
static_assert(sizeof(scene_ubs) == 400, "bad size of ubs");
|
|
|
|
const size_t MAX_PARAMS = 3;
|
|
|
|
struct model_ubs
|
|
{
|
|
glm::mat4 modelview;
|
|
glm::mat3x4 modelviewnormal;
|
|
glm::vec4 param[MAX_PARAMS];
|
|
|
|
glm::mat4 future;
|
|
float opacity;
|
|
float emission;
|
|
float fog_density;
|
|
float alpha_mult;
|
|
float shadow_tone;
|
|
UBS_PAD(12);
|
|
|
|
void set_modelview(const glm::mat4 &mv)
|
|
{
|
|
modelview = mv;
|
|
// normal matrix = transpose(inverse(modelview)). The modelview is
|
|
// always affine, so its 3x3 normal matrix depends only on the
|
|
// upper-left 3x3 block; inverting that mat3 directly is markedly
|
|
// cheaper than a full mat4 inverse and yields an identical result
|
|
// (for affine M, mat3(inverse(M)) == inverse(mat3(M))).
|
|
modelviewnormal = glm::mat3x4(glm::transpose(glm::inverse(glm::mat3(mv))));
|
|
}
|
|
};
|
|
|
|
static_assert(sizeof(model_ubs) == 208 + 16 * MAX_PARAMS, "bad size of ubs");
|
|
|
|
// maximum number of instances per single GPU-instanced draw call.
|
|
// 256 mat4 = 16 KiB, the guaranteed minimum UBO size. Bigger batches must split.
|
|
const size_t MAX_INSTANCES_PER_BATCH = 256;
|
|
|
|
struct instance_ubs
|
|
{
|
|
glm::mat4 instance_modelview[MAX_INSTANCES_PER_BATCH];
|
|
};
|
|
|
|
static_assert(sizeof(instance_ubs) == 64 * MAX_INSTANCES_PER_BATCH, "bad size of instance_ubs");
|
|
|
|
struct light_element_ubs
|
|
{
|
|
enum type_e
|
|
{
|
|
SPOT = 0,
|
|
POINT,
|
|
DIR,
|
|
HEADLIGHTS
|
|
};
|
|
|
|
packed_vec3 pos;
|
|
type_e type;
|
|
|
|
packed_vec3 dir;
|
|
float in_cutoff;
|
|
|
|
packed_vec3 color;
|
|
float out_cutoff;
|
|
|
|
float linear;
|
|
float quadratic;
|
|
|
|
float intensity;
|
|
float ambient;
|
|
|
|
glm::mat4 headlight_projection;
|
|
glm::vec4 headlight_weights;
|
|
};
|
|
|
|
static_assert(sizeof(light_element_ubs) == 144, "bad size of ubs");
|
|
|
|
const size_t MAX_LIGHTS = 8;
|
|
|
|
struct light_ubs
|
|
{
|
|
packed_vec3 ambient;
|
|
UBS_PAD(4);
|
|
|
|
packed_vec3 fog_color;
|
|
uint32_t lights_count;
|
|
|
|
light_element_ubs lights[MAX_LIGHTS];
|
|
};
|
|
|
|
static_assert(sizeof(light_ubs) == 32 + sizeof(light_element_ubs) * MAX_LIGHTS, "bad size of ubs");
|
|
|
|
#pragma pack(pop)
|
|
}
|