mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-19 18:05:01 +01:00
feat: controller position marker of the diesel locomotives (#74)
The mainctrlact: gauge showed MainCtrlActualPos, which nothing sets for DieselEngine/DieselElectric without an EIM controller, so the ST43's marker never moved. For those it now follows MainCtrlPos (vehicle/mainctrlact.h); every other vehicle reads what it did before. New optional gauge key scaletable: [ value scaled, ... ] in the block form gives a non-uniform scale, interpolated linearly between its points, in the units of value * scale + offset; without it gauges behave as before. Assets: none needed. To get the true ST43 scale, the line "mainctrlact: stery_1 rot -0.016 0 0.0" of dynamic/pkp/st43_v1/*.mmd is to become a block with a scaletable: of the 25 positions read off the cab's scale; until then the marker moves linearly with -0.016 turn per position.
This commit is contained in:
31
vehicle/mainctrlact.h
Normal file
31
vehicle/mainctrlact.h
Normal file
@@ -0,0 +1,31 @@
|
||||
/*
|
||||
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/.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "McZapkie/MOVER.h"
|
||||
|
||||
// the position the controller position marker of the cab (mainctrlact:) shows
|
||||
namespace main_ctrl_act {
|
||||
|
||||
// the diesel engines work the controller position straight away, they have no camshaft or relays of their own that
|
||||
// would follow it, and nothing sets their MainCtrlActualPos; only with a controller of the EIM kind (EIMCtrlType)
|
||||
// it is kept up to date (CheckEIMIC). so their marker shows the position of the controller (MaSzyna-EU07/maszyna#74)
|
||||
inline bool follows_controller(TMoverParameters const &Vehicle) {
|
||||
return (Vehicle.EngineType == TEngineType::DieselEngine || Vehicle.EngineType == TEngineType::DieselElectric) && Vehicle.EIMCtrlType == 0;
|
||||
}
|
||||
|
||||
inline float position(TMoverParameters const &Vehicle) {
|
||||
auto const controller{follows_controller(Vehicle)};
|
||||
auto const main{controller ? Vehicle.MainCtrlPos : Vehicle.MainCtrlActualPos};
|
||||
auto const scnd{controller ? Vehicle.ScndCtrlPos : Vehicle.ScndCtrlActualPos};
|
||||
return static_cast<float>(Vehicle.CoupledCtrl ? main + scnd : main);
|
||||
}
|
||||
|
||||
} // namespace main_ctrl_act
|
||||
Reference in New Issue
Block a user