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)
320 lines
9.4 KiB
C++
320 lines
9.4 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 "world/EvLaunch.h"
|
|
|
|
#include "utilities/Globals.h"
|
|
#include "utilities/Logs.h"
|
|
#include "world/Event.h"
|
|
#include "world/MemCell.h"
|
|
#include "utilities/Timer.h"
|
|
#include "utilities/parser.h"
|
|
#include "Console.h"
|
|
#include "simulation/simulationtime.h"
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
// encodes expected key in a short, where low byte represents the actual key,
|
|
// and the high byte holds modifiers: 0x1 = shift, 0x2 = ctrl, 0x4 = alt
|
|
int vk_to_glfw_key( int const Keycode ) {
|
|
char modifier = 0;
|
|
char key = 0;
|
|
|
|
if (Keycode < 'A') {
|
|
key = static_cast<char>(Keycode);
|
|
} else if (Keycode <= 'Z') {
|
|
key = static_cast<char>(Keycode);
|
|
modifier = GLFW_MOD_SHIFT;
|
|
} else if (Keycode < 'a') {
|
|
key = static_cast<char>(Keycode);
|
|
} else if (Keycode <= 'z') {
|
|
key = static_cast<char>(Keycode - 32);
|
|
} else {
|
|
ErrorLog("unknown key: " + std::to_string(Keycode));
|
|
}
|
|
|
|
return (int)modifier << 8 | key;
|
|
}
|
|
|
|
bool TEventLauncher::Load(cParser *parser)
|
|
{ // wczytanie wyzwalacza zdarzeń
|
|
std::string token;
|
|
parser->getTokens();
|
|
*parser >> dRadius; // promień działania
|
|
if (dRadius > 0.0)
|
|
dRadius *= dRadius; // do kwadratu, pod warunkiem, że nie jest ujemne
|
|
parser->getTokens(); // klawisz sterujący
|
|
*parser >> token;
|
|
if (token != "none") {
|
|
|
|
if( token.size() == 1 ) {
|
|
// single char, assigned activation key
|
|
iKey = vk_to_glfw_key( token[ 0 ] );
|
|
}
|
|
else {
|
|
// this launcher may be activated by radio message
|
|
std::map<std::string, int, std::less<>> messages {
|
|
{ "radio_call1", radio_message::call1 },
|
|
{ "radio_call3", radio_message::call3 }
|
|
};
|
|
auto lookup = messages.find( token );
|
|
iKey = lookup != messages.end() ? lookup->second :
|
|
// a jak więcej, to jakby numer klawisza jest
|
|
vk_to_glfw_key(stol_def(token, 0));
|
|
}
|
|
}
|
|
parser->getTokens();
|
|
*parser >> DeltaTime;
|
|
parser->getTokens();
|
|
*parser >> token;
|
|
asEvent1Name = token; // pierwszy event
|
|
parser->getTokens();
|
|
*parser >> token;
|
|
asEvent2Name = token; // drugi event
|
|
if (asEvent2Name == "end" || asEvent2Name == "condition" || asEvent2Name == "traintriggered")
|
|
{ // drugiego eventu może nie być, bo są z tym problemy, ale ciii...
|
|
token = asEvent2Name; // rozpoznane słowo idzie do dalszego przetwarzania
|
|
asEvent2Name = "none"; // a drugiego eventu nie ma
|
|
}
|
|
else
|
|
{ // gdy są dwa eventy
|
|
parser->getTokens();
|
|
*parser >> token;
|
|
//str = AnsiString(token.c_str());
|
|
}
|
|
if (token == "condition")
|
|
{ // obsługa wyzwalania warunkowego
|
|
parser->getTokens();
|
|
*parser >> token;
|
|
asMemCellName = token;
|
|
parser->getTokens();
|
|
*parser >> token;
|
|
szText = token;
|
|
if (token != "*") //*=nie brać command pod uwagę
|
|
iCheckMask |= basic_event::flags::text;
|
|
parser->getTokens();
|
|
*parser >> token;
|
|
if (token != "*") //*=nie brać wartości 1. pod uwagę
|
|
{
|
|
iCheckMask |= basic_event::flags::value1;
|
|
fVal1 = atof(token.c_str());
|
|
}
|
|
else
|
|
fVal1 = 0;
|
|
parser->getTokens();
|
|
*parser >> token;
|
|
if (token.compare("*") != 0) //*=nie brać wartości 2. pod uwagę
|
|
{
|
|
iCheckMask |= basic_event::flags::value2;
|
|
fVal2 = atof(token.c_str());
|
|
}
|
|
else
|
|
fVal2 = 0;
|
|
parser->getTokens(); // słowo zamykające
|
|
*parser >> token;
|
|
}
|
|
if (token == "traintriggered")
|
|
{
|
|
train_triggered = true;
|
|
}
|
|
|
|
if( DeltaTime < 0 )
|
|
DeltaTime = -DeltaTime; // dla ujemnego zmieniamy na dodatni
|
|
else if( DeltaTime > 0 ) { // wartość dodatnia oznacza wyzwalanie o określonej godzinie
|
|
iMinute = int( DeltaTime ) % 100; // minuty są najmłodszymi cyframi dziesietnymi
|
|
iHour = int( DeltaTime - iMinute ) / 100; // godzina to setki
|
|
DeltaTime = 0; // bez powtórzeń
|
|
// potentially shift the provided time by requested offset
|
|
if( auto const timeoffset{ static_cast<int>( Global.ScenarioTimeOffset * 60 ) }; timeoffset != 0 ) {
|
|
auto const adjustedtime{ clamp_circular( iHour * 60 + iMinute + timeoffset, 24 * 60 ) };
|
|
iHour = adjustedtime / 60 % 24;
|
|
iMinute = adjustedtime % 60;
|
|
}
|
|
|
|
WriteLog(
|
|
"EventLauncher at "
|
|
+ std::to_string( iHour ) + ":"
|
|
+ ( iMinute < 10 ? "0" : "" ) + std::to_string( iMinute )
|
|
+ " (" + asEvent1Name
|
|
+ ( asEvent2Name != "none" ? " / " + asEvent2Name : "" )
|
|
+ ")" ); // wyświetlenie czasu
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool TEventLauncher::check_activation_key() const {
|
|
if (iKey <= 0)
|
|
return false;
|
|
|
|
char key = iKey & 0xff;
|
|
|
|
bool result = Console::Pressed(key);
|
|
|
|
auto modifier = static_cast<char>(iKey >> 8);
|
|
if (modifier & GLFW_MOD_SHIFT)
|
|
result &= Global.shiftState;
|
|
if (modifier & GLFW_MOD_CONTROL)
|
|
result &= Global.ctrlState;
|
|
|
|
return result;
|
|
}
|
|
|
|
bool TEventLauncher::check_activation() {
|
|
|
|
auto bCond { false };
|
|
|
|
if (DeltaTime == 10000.0) {
|
|
if (UpdatedTime == 0.0)
|
|
bCond = true;
|
|
UpdatedTime = 1.0;
|
|
}
|
|
else if( DeltaTime > 0 ) {
|
|
if( UpdatedTime > DeltaTime ) {
|
|
UpdatedTime = 0; // naliczanie od nowa
|
|
bCond = true;
|
|
}
|
|
else {
|
|
// aktualizacja naliczania czasu
|
|
UpdatedTime += Timer::GetDeltaTime();
|
|
}
|
|
}
|
|
else {
|
|
// jeśli nie cykliczny, to sprawdzić czas
|
|
if( simulation::Time.data().wHour == iHour ) {
|
|
// zgodność czasu uruchomienia
|
|
if (simulation::Time.data().wMinute == iMinute && UpdatedTime < 10) {
|
|
UpdatedTime = 20; // czas do kolejnego wyzwolenia?
|
|
bCond = true;
|
|
}
|
|
}
|
|
else {
|
|
UpdatedTime = 1;
|
|
}
|
|
}
|
|
|
|
return bCond;
|
|
}
|
|
|
|
bool TEventLauncher::check_conditions() const {
|
|
|
|
auto bCond { true };
|
|
|
|
if( iCheckMask != 0
|
|
&& MemCell != nullptr ) {
|
|
// sprawdzanie warunku na komórce pamięci
|
|
bCond = MemCell->Compare( szText, fVal1, fVal2, iCheckMask );
|
|
}
|
|
|
|
return bCond; // sprawdzanie dRadius w Ground.cpp
|
|
}
|
|
|
|
// sprawdzenie, czy jest globalnym wyzwalaczem czasu
|
|
bool TEventLauncher::IsGlobal() const {
|
|
|
|
return DeltaTime == 0 && iHour >= 0 && iMinute >= 0 && dRadius < 0.0; // bez ograniczenia zasięgu
|
|
}
|
|
|
|
bool TEventLauncher::IsRadioActivated() const {
|
|
|
|
return iKey < 0;
|
|
}
|
|
|
|
// radius() subclass details, calculates node's bounding radius
|
|
float
|
|
TEventLauncher::radius_() {
|
|
|
|
return static_cast<float>(std::sqrt( dRadius ));
|
|
}
|
|
|
|
// serialize() subclass details, sends content of the subclass to provided stream
|
|
void
|
|
TEventLauncher::serialize_( std::ostream &Output ) const {
|
|
|
|
// TODO: implement
|
|
}
|
|
// deserialize() subclass details, restores content of the subclass from provided stream
|
|
void
|
|
TEventLauncher::deserialize_( std::istream &Input ) {
|
|
|
|
// TODO: implement
|
|
}
|
|
|
|
// export() subclass details, sends basic content of the class in legacy (text) format to provided stream
|
|
void
|
|
TEventLauncher::export_as_text_( std::ostream &Output ) const {
|
|
// header
|
|
Output << "eventlauncher ";
|
|
// location
|
|
Output
|
|
<< location().x << ' '
|
|
<< location().y << ' '
|
|
<< location().z << ' ';
|
|
// activation radius
|
|
Output
|
|
<< ( dRadius > 0 ? std::sqrt( dRadius ) : dRadius ) << ' ';
|
|
// activation key
|
|
if( iKey != 0 ) {
|
|
auto key { iKey & 0xff };
|
|
|
|
if (auto const modifier { iKey >> 8 }; key >= 'A' && key <= 'Z' && !(modifier & GLFW_MOD_SHIFT))
|
|
key += 32;
|
|
|
|
Output << (char)key;
|
|
}
|
|
else {
|
|
Output << "none ";
|
|
}
|
|
// activation interval or hour
|
|
if( DeltaTime != 0.0 ) {
|
|
// cyclical launcher
|
|
Output << -DeltaTime << ' ';
|
|
}
|
|
else {
|
|
// single activation at specified time
|
|
if( iHour < 0
|
|
&& iMinute < 0 ) {
|
|
Output << DeltaTime << ' ';
|
|
}
|
|
else {
|
|
// NOTE: activation hour might be affected by user-requested time offset
|
|
auto const timeoffset{ static_cast<int>( Global.ScenarioTimeOffset * 60 ) };
|
|
auto const adjustedtime{ clamp_circular( iHour * 60 + iMinute - timeoffset, 24 * 60 ) };
|
|
Output
|
|
<< adjustedtime / 60 % 24
|
|
<< ( adjustedtime % 60 )
|
|
<< ' ';
|
|
}
|
|
}
|
|
// associated event(s)
|
|
Output << ( asEvent1Name.empty() ? "none" : asEvent1Name ) << ' ';
|
|
Output << ( asEvent2Name.empty() ? "none" : asEvent2Name ) << ' ';
|
|
if( false == asMemCellName.empty() ) {
|
|
// conditional event
|
|
Output
|
|
<< "condition "
|
|
<< asMemCellName << ' '
|
|
<< szText << ' '
|
|
<< ( ( iCheckMask & basic_event::flags::value1 ) != 0 ? std::to_string( fVal1 ) : "*" ) << ' '
|
|
<< ( ( iCheckMask & basic_event::flags::value2 ) != 0 ? std::to_string( fVal2 ) : "*" ) << ' ';
|
|
}
|
|
// footer
|
|
Output
|
|
<< "end"
|
|
<< "\n";
|
|
}
|
|
|
|
//---------------------------------------------------------------------------
|