mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-19 19:14:59 +01:00
feat: light programmer positions can switch the cab light (eu07/maszyna#529)
An optional third column in the LightsList rows of the .fiz sets the cab interior light when the driver moves the light preset selector to that position: 0 off, 1 on, 3 on dimmed (bit 2 the dimmer). Rows without the column, or with a negative value, leave the cab light to its own switch, so the existing tables work as before; a stray note after the two light columns (e.g. "38 38 / A") is not read as the flag. The light follows the occupied cab, or all cabs of a JointCabs vehicle, as with the interior light commands; the dimmer switch is moved along. The lightsset custom position and the AI leave the cab light alone. Covered by tests/unit/test_lights_preset_cablight.cpp. (eu07/maszyna#529)
This commit is contained in:
@@ -17,6 +17,7 @@ http://mozilla.org/MPL/2.0/.
|
||||
#include "utilities/parser.h"
|
||||
#include "simulation/simulation.h"
|
||||
|
||||
#include <charconv>
|
||||
#include <cmath>
|
||||
#include <format>
|
||||
//---------------------------------------------------------------------------
|
||||
@@ -9493,10 +9494,38 @@ bool TMoverParameters::readLightsList(std::string const &Input)
|
||||
return false;
|
||||
}
|
||||
parser >> Lights[0][idx] >> Lights[1][idx];
|
||||
// optional third column: the cab interior light the preset sets (eu07/maszyna#529). anything but a whole number
|
||||
// (some rows carry stray notes after the two columns) leaves the cab light to its own switch
|
||||
LightsCabLight[idx] = -1;
|
||||
if (true == parser.getTokens(1, false))
|
||||
{
|
||||
std::string cablight;
|
||||
parser >> cablight;
|
||||
int flags{-1};
|
||||
auto const [end, error]{std::from_chars(cablight.data(), cablight.data() + cablight.size(), flags)};
|
||||
if (error == std::errc{} && end == cablight.data() + cablight.size() && flags >= 0)
|
||||
{
|
||||
LightsCabLight[idx] = flags;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
std::optional<lights_preset_cablight> TMoverParameters::LightsPresetCabLight(int const Position) const
|
||||
{
|
||||
if (Position < 1 || Position > static_cast<int>(LightsCabLight.size()))
|
||||
{
|
||||
return std::nullopt;
|
||||
}
|
||||
auto const flags{LightsCabLight[Position - 1]};
|
||||
if (flags < 0)
|
||||
{
|
||||
return std::nullopt;
|
||||
}
|
||||
return lights_preset_cablight{(flags & lights_preset_cablight::light_on) != 0, (flags & lights_preset_cablight::light_dimmed) != 0};
|
||||
}
|
||||
|
||||
bool TMoverParameters::readCompressorList(std::string const &Input)
|
||||
{
|
||||
|
||||
|
||||
Reference in New Issue
Block a user