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.5 KiB
C++
163 lines
4.5 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 "vehicle/Button.h"
|
|
#include "utilities/parser.h"
|
|
#include "model/Model3d.h"
|
|
#include "vehicle/DynObj.h"
|
|
#include "Console.h"
|
|
#include "utilities/Logs.h"
|
|
#include "rendering/renderer.h"
|
|
|
|
void TButton::Clear(int i)
|
|
{
|
|
*this = TButton();
|
|
if( i >= 0 ) {
|
|
FeedbackBitSet( i );
|
|
}
|
|
Update(); // kasowanie bitu Feedback, o ile jakiś ustawiony
|
|
};
|
|
|
|
bool TButton::Init( std::string const &asName, TModel3d const *pModel, bool bNewOn ) {
|
|
|
|
if( pModel == nullptr ) { return false; }
|
|
|
|
pModelOn = pModel->GetFromName( asName + "_on" );
|
|
pModelOff = pModel->GetFromName( asName + "_off" );
|
|
m_state = bNewOn;
|
|
Update();
|
|
|
|
return pModelOn != nullptr || pModelOff != nullptr;
|
|
};
|
|
|
|
void TButton::Load( cParser &Parser, TDynamicObject const *Owner ) {
|
|
|
|
std::string submodelname;
|
|
|
|
Parser.getTokens();
|
|
if( Parser.peek() != "{" ) {
|
|
// old fixed size config
|
|
Parser >> submodelname;
|
|
}
|
|
else {
|
|
// new, block type config
|
|
// TODO: rework the base part into yaml-compatible flow style mapping
|
|
submodelname = Parser.getToken<std::string>( false );
|
|
while( true == Load_mapping( Parser ) ) {
|
|
// all work done by while()
|
|
}
|
|
}
|
|
|
|
// bind defined sounds with the button owner
|
|
m_soundfxincrease.owner( Owner );
|
|
m_soundfxdecrease.owner( Owner );
|
|
|
|
std::array<TModel3d *, 3> sources { Owner->mdKabina, Owner->mdLowPolyInt, Owner->mdModel };
|
|
for( auto const *source : sources ) {
|
|
if( true == Init( submodelname, source, false ) ) {
|
|
// got what we wanted, don't need to search further
|
|
break;
|
|
}
|
|
}
|
|
if( pModelOn == nullptr
|
|
&& pModelOff == nullptr ) {
|
|
// if we failed to locate even one state submodel, cry
|
|
ErrorLog( "Bad model: failed to locate sub-model \"" + submodelname + "\" in 3d model(s) of \"" + Owner->name() + "\"", logtype::model );
|
|
}
|
|
|
|
// pass submodel location to defined sounds
|
|
auto const nulloffset { glm::vec3{} };
|
|
auto const offset { model_offset() };
|
|
if( m_soundfxincrease.offset() == nulloffset ) {
|
|
m_soundfxincrease.offset( offset );
|
|
}
|
|
if( m_soundfxdecrease.offset() == nulloffset ) {
|
|
m_soundfxdecrease.offset( offset );
|
|
}
|
|
}
|
|
|
|
bool
|
|
TButton::Load_mapping( cParser &Input ) {
|
|
|
|
// token can be a key or block end
|
|
std::string const key { Input.getToken<std::string>( true, "\n\r\t ,;" ) };
|
|
if( true == key.empty() || key == "}" ) { return false; }
|
|
// if not block end then the key is followed by assigned value or sub-block
|
|
if( key == "soundinc:" ) { m_soundfxincrease.deserialize( Input, sound_type::single ); }
|
|
else if( key == "sounddec:" ) { m_soundfxdecrease.deserialize( Input, sound_type::single ); }
|
|
|
|
return true; // return value marks a key: value pair was extracted, nothing about whether it's recognized
|
|
}
|
|
|
|
// returns offset of submodel associated with the button from the model centre
|
|
glm::vec3
|
|
TButton::model_offset() const {
|
|
|
|
auto const
|
|
submodel { (
|
|
pModelOn ? pModelOn :
|
|
pModelOff ? pModelOff :
|
|
nullptr ) };
|
|
|
|
return submodel != nullptr ? submodel->offset(std::numeric_limits<float>::max()) : glm::vec3();
|
|
}
|
|
|
|
void
|
|
TButton::Turn( bool const State ) {
|
|
|
|
if( State != m_state ) {
|
|
|
|
m_state = State;
|
|
play();
|
|
Update();
|
|
}
|
|
}
|
|
|
|
void TButton::Update( bool const Power ) {
|
|
// TODO: remove passing manually power state when LD is in place
|
|
|
|
|
|
if( auto const state { Power && ( bData ? *bData : m_state ) }; state != m_state ) {
|
|
|
|
m_state = state;
|
|
play();
|
|
}
|
|
|
|
if( pModelOn != nullptr ) { pModelOn->iVisible = m_state; }
|
|
if( pModelOff != nullptr ) { pModelOff->iVisible = !m_state; }
|
|
|
|
#ifdef _WIN32
|
|
if (iFeedbackBit) {
|
|
// jeżeli generuje informację zwrotną
|
|
if (m_state) // zapalenie
|
|
Console::BitsSet(iFeedbackBit);
|
|
else
|
|
Console::BitsClear(iFeedbackBit);
|
|
}
|
|
#endif
|
|
};
|
|
|
|
void TButton::AssignBool(bool const *bValue) {
|
|
|
|
bData = bValue;
|
|
}
|
|
|
|
void
|
|
TButton::play() {
|
|
if( m_state == true ) { m_soundfxincrease.play(); }
|
|
else { m_soundfxdecrease.play(); }
|
|
}
|
|
|
|
void
|
|
TButton::gain(float new_volume) {
|
|
m_soundfxincrease.gain(new_volume);
|
|
m_soundfxdecrease.gain(new_volume);
|
|
}
|