mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-17 22:39: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)
122 lines
5.6 KiB
C++
122 lines
5.6 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/.
|
|
*/
|
|
|
|
/*
|
|
MaSzyna EU07 locomotive simulator
|
|
Copyright (C) 2001-2004 Marcin Wozniak and others
|
|
|
|
*/
|
|
|
|
#include "stdafx.h"
|
|
#include "rendering/lightarray.h"
|
|
#include "vehicle/DynObj.h"
|
|
|
|
void
|
|
light_array::insert( TDynamicObject const *Owner ) {
|
|
|
|
// we're only storing lights for locos, which have two sets of lights, front and rear
|
|
// for a more generic role this function would have to be tweaked to add vehicle type-specific light combinations
|
|
data.emplace_back( Owner, end::front );
|
|
data.emplace_back( Owner, end::rear );
|
|
}
|
|
|
|
void
|
|
light_array::remove( TDynamicObject const *Owner ) {
|
|
|
|
std::erase_if( data, [=]( light_record const &light ){ return light.owner == Owner; } );
|
|
}
|
|
|
|
// updates records in the collection
|
|
void
|
|
light_array::update() {
|
|
|
|
for( auto &light : data ) {
|
|
// update light parameters to match current data of the owner
|
|
if( light.index == end::front ) {
|
|
// front light set
|
|
light.position = light.owner->GetPosition() + ( light.owner->VectorFront() * ( std::max( 0.0, light.owner->GetLength() * 0.5 - 2.0 ) ) );// +( light.owner->VectorUp() * 0.25 );
|
|
light.direction = glm::make_vec3( glm::value_ptr(light.owner->VectorFront()) ); // TODO: It is needed to get value_ptr and then make_vec3?
|
|
}
|
|
else {
|
|
// rear light set
|
|
light.position = light.owner->GetPosition() - ( light.owner->VectorFront() * ( std::max( 0.0, light.owner->GetLength() * 0.5 - 2.0 ) ) );// +( light.owner->VectorUp() * 0.25 );
|
|
light.direction = glm::make_vec3( glm::value_ptr(light.owner->VectorFront()) ); // TODO: It is needed to get value_ptr and then make_vec3?
|
|
light.direction.x = -light.direction.x;
|
|
light.direction.z = -light.direction.z;
|
|
}
|
|
// determine intensity of this light set
|
|
if( ( true == light.owner->MoverParameters->Power24vIsAvailable )
|
|
|| ( true == light.owner->MoverParameters->Power110vIsAvailable ) ) {
|
|
// with power on, the intensity depends on the state of activated switches
|
|
// first we cross-check the list of enabled lights with the lights installed in the vehicle...
|
|
auto const lights { light.owner->MoverParameters->iLights[ light.index ] & light.owner->LightList( static_cast<end>( light.index ) ) };
|
|
// ...then check their individual state
|
|
light.count = 0
|
|
+ ( ( lights & light::headlight_left ) ? 1 : 0 )
|
|
+ ( ( lights & light::headlight_right ) ? 1 : 0 )
|
|
+ ( ( lights & light::headlight_upper ) ? 1 : 0 )
|
|
+ ( ( lights & light::highbeamlight_left ) ? 1: 0)
|
|
+ ( ( lights & light::highbeamlight_right ) ? 1 : 0);
|
|
|
|
// set intensity
|
|
if( light.count > 0 ) {
|
|
bool isEnabled = light.index == end::front ? !light.owner->HeadlightsAoff : !light.owner->HeadlightsBoff;
|
|
|
|
light.intensity = std::max(0.0f, std::log((float)light.count + 1.0f));
|
|
if (light.owner->DimHeadlights && !light.owner->HighBeamLights && isEnabled) // tylko przyciemnione
|
|
light.intensity *= static_cast<float>(light.owner->MoverParameters->dimMultiplier);
|
|
else if (!light.owner->DimHeadlights && !light.owner->HighBeamLights && isEnabled) // normalne
|
|
light.intensity *= static_cast<float>(light.owner->MoverParameters->normMultiplier);
|
|
else if (light.owner->DimHeadlights && light.owner->HighBeamLights && isEnabled) // przyciemnione dlugie
|
|
light.intensity *= static_cast<float>(light.owner->MoverParameters->highDimMultiplier);
|
|
else if (!light.owner->DimHeadlights && light.owner->HighBeamLights && isEnabled) // dlugie zwykle
|
|
light.intensity *= static_cast<float>(light.owner->MoverParameters->highMultiplier);
|
|
else if (!isEnabled)
|
|
{
|
|
light.intensity = 0.0f;
|
|
}
|
|
|
|
// TBD, TODO: intensity can be affected further by other factors
|
|
light.state = {
|
|
( ( lights & light::headlight_left | light::highbeamlight_left ) ? 1.f : 0.f ),
|
|
( ( lights & light::headlight_upper ) ? 1.f : 0.f ),
|
|
( ( lights & light::headlight_right | light::highbeamlight_right) ? 1.f : 0.f ) };
|
|
|
|
light.color = {
|
|
static_cast<float>(light.owner->MoverParameters->refR) / 255.0f,
|
|
static_cast<float>(light.owner->MoverParameters->refG) / 255.0f,
|
|
static_cast<float>(light.owner->MoverParameters->refB) / 255.0f
|
|
};
|
|
|
|
if (light.owner->DimHeadlights && !light.owner->HighBeamLights) // tylko przyciemnione
|
|
light.state *= light.owner->MoverParameters->dimMultiplier;
|
|
else if (!light.owner->DimHeadlights && !light.owner->HighBeamLights) // normalne
|
|
light.state *= light.owner->MoverParameters->normMultiplier;
|
|
else if (light.owner->DimHeadlights && light.owner->HighBeamLights) // przyciemnione dlugie
|
|
light.state *= light.owner->MoverParameters->highDimMultiplier;
|
|
else if (!light.owner->DimHeadlights && light.owner->HighBeamLights) // dlugie zwykle
|
|
light.state *= light.owner->MoverParameters->highMultiplier;
|
|
else if (!isEnabled)
|
|
{
|
|
light.state = glm::vec3{0.f};
|
|
}
|
|
}
|
|
else {
|
|
light.intensity = 0.0f;
|
|
light.state = glm::vec3{ 0.f };
|
|
}
|
|
}
|
|
else {
|
|
// with battery off the lights are off
|
|
light.intensity = 0.0f;
|
|
light.count = 0;
|
|
}
|
|
}
|
|
}
|