mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-30 03:50:30 +01:00
fix(cab): the line contactors lamp goes out with the pressure switch (eu07/maszyna#470) The lamp of the open line contactors, which tells the start can be made, went out at 1 bar in the brake cylinders, while the pressure switch cuts the start off only at 2 bar (or below 3.6 bar in the main pipe), so with the brakes partly applied the start could be made with the lamp out. With a pressure switch fitted the lamp now follows it; without one it goes out at 1 bar as before. The same holds for the lamp of the second unit, which used to keep its last state between 1 bar and the cut-off. The condition is TMoverParameters::LineContactorsLampLit(). Tests: tests/unit/test_line_contactors.cpp. refactor: Sonar findings of PR 217 - horn_supply::pneumatic shadowed the pneumatic enumerator of the sound flags (cpp:S1117), it's horn_supply::air; the supplies read with using enum (S6177), - CouplerForce(): the automatic coupling refused or caught without another level of nested ifs (S134), the same outcome: too fast, the coupling is locked; caught, coupled and locked; otherwise left to try again, - CompressorCheck(): the power the compressor doesn't draw yet noted without a TODO (S1135), - tests: the previous crash damage setting in an in-class initializer (S3230), the loops which stop early with break rather than in their conditions (S886), the stand-ins of test::pair in a std::vector rather than an array (S5945), units in the comments of the example without /* */ (S1103). test: the cases the changes of the branch left without a test - Cntrl.: BDelay1 to BDelay4 reach the brake delays (now through std::format), the default start types of the ground and converter overload relays of a multiple unit and of other vehicles (out of the nested conditionals), - the compressor: fed from the low voltage it waits from the low voltage coming on; the pressure switch stops it above the cut-out pressure, without one the excess air is vented (the vented fraction rewritten), - the horns: a vehicle without any air sounds as before, the threshold pressure, an electric horn on 110 V, - the positions of a cab control below zero, and a control without position sounds. refactor(cab): the kind of the train heating switch as a flag Read once with the vehicle definition, rather than compared as text in each of the switch commands. feat(cab): train heating switch springing back (MaSzyna-EU07/maszyna#85) TrainHeating=[toggle]|impulse in the Switches: section of the vehicle definition makes the train heating switch an unstable one: it goes up to switch the heating on, down to switch it off, and back to the middle once let go, instead of staying where it was put. The position of such a switch isn't set from the heating state when the cab is entered. Tests: tests/unit/test_switches.cpp. feat(sound): mirror sounds (MaSzyna-EU07/maszyna#84, eu07/maszyna#322) The sound definitions of a vehicle (.mmd) take mirroropen: and mirrorclose:, played as a mirror sets off unfolding or folding, and the locations section mirrors: <offset>... end, the offsets along the vehicle of the mirror pairs, as for the doors (negative ahead of the centre), each pair at the sides of the vehicle. As the animation, only the mirrors at the occupied cab sound. The start of a move is mirror_moves::motion in vehicle/mirrors.h. Tests: tests/unit/test_mirrors.cpp. feat(cab): joint oil and fuel pump switch (MaSzyna-EU07/maszyna#81) A cab control oilfuelpump_sw: switches both the oil and the fuel pump at once, with the new command oilfuelpumptoggle (no key by default). As a two-state switch it turns both pumps off when both are on and both on otherwise; as an impulse switch it's held to start them, like the separate pump switches. Its position follows the pumps when the cab is entered. refactor(editor): text fields filled without strncpy (MaSzyna-EU07/maszyna#112) The last three strncpy calls Sonar flags (cpp:S5816), in the road and track editors, copy the text into the ImGui field buffers with std::string::copy and terminate it right after; the text gets cut to the buffer as before. fix: automatic coupler crashes, horns, compressor start delay, radio and cab lever sounds - automatic couplers don't catch above the safe collision speed (#86): with crash damage on they couple at a closing speed of 15 km/h at most, a faster hit locks the coupling until the vehicles part and the collision runs its course. On the way: CollisionVelocity() read a head-on 10 + 10 km/h as 14.1 km/h (quaternions turn by half the angle), it's now taken from the touching ends; CollisionDetect() took the other vehicle's speed the wrong way round for vehicles facing each other. Head-on hits now derail sooner, at the intended limit, - a single horn lever can't sound both tones at once (eu07/maszyna#392), - a skid ends once the vehicle stops on locked wheels (eu07/maszyna#479), - electronic destination signs are blanked at the end of the timetable (eu07/maszyna#446), - horns need the air or the voltage to sound (eu07/maszyna#290, #76): HornType=[Pneumatic]|Electric and Horn3Type in Cntrl.; a pneumatic horn needs 0.2 MPa in the main reservoir (or the main pipe without one), an electric one the low voltage; the lever stays where it was put, - compressor start delay (#67): CompressorStartDelay [s] in Brake., counted from the compressor getting its power, after the engine starts say; none by default, - the channel and volume buttons of a radio without power do nothing (eu07/maszyna#429); the power check of the radio is TMoverParameters::RadioPowered(), - a lever moved smoothly sounds the positions it passes (#83). Sonar findings in the functions changed: nesting, nested conditionals, commented-out code, std::format, references to const. Unit tests: test::pair for two vehicles running into each other, test_couplers, test_horn, test_wheelslip, test_compressor, test_radio, test_gauge_positions.
123 lines
4.7 KiB
C++
123 lines
4.7 KiB
C++
#pragma once
|
|
|
|
#include <array>
|
|
#include <memory>
|
|
#include <stdexcept>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include <nlohmann/json.hpp>
|
|
|
|
#include "McZapkie/MOVER.h"
|
|
|
|
namespace test {
|
|
|
|
// thrown for a test vehicle definition which can't be used: missing, malformed, or not taken by the loader
|
|
class definition_error : public std::runtime_error {
|
|
public:
|
|
using std::runtime_error::runtime_error;
|
|
};
|
|
|
|
// definition of a test vehicle: one of the JSON files in tests/unit/data, with the sections and keys
|
|
// of the game's vehicle definitions, changed by the test where it needs to:
|
|
// auto heavy = definition::load("wagon").set("Param", "M", 60000).set("Brake", "BrakeValve", "ESt3");
|
|
class definition {
|
|
public:
|
|
// tests/unit/data/<Name>.json
|
|
static definition load(std::string const &Name);
|
|
|
|
// sets the key of the section, adding either one when it's missing
|
|
definition &set(std::string const &Section, std::string const &Key, nlohmann::ordered_json const &Value);
|
|
// drops the whole section, or one key of it
|
|
definition &remove(std::string const &Section);
|
|
definition &remove(std::string const &Section, std::string const &Key);
|
|
|
|
// the definition in the form the game's vehicle loader reads
|
|
std::string text() const;
|
|
|
|
private:
|
|
nlohmann::ordered_json m_sections;
|
|
};
|
|
|
|
// conditions the vehicle runs in: straight track of the given friction and gradient (rise/run)
|
|
struct track {
|
|
double friction{0.15};
|
|
double gradient{0.0};
|
|
};
|
|
|
|
// one vehicle created the way TDynamicObject::Init() creates it, from the given definition
|
|
class vehicle {
|
|
public:
|
|
explicit vehicle(definition const &Definition, double Velocity = 0.0, std::string const &Name = "test");
|
|
|
|
TMoverParameters &mover() { return *m_mover; }
|
|
TMoverParameters *operator->() { return m_mover.get(); }
|
|
|
|
// keeps the brake pipe at the given pressure [bar], as a locomotive coupled to the vehicle would;
|
|
// a negative value leaves the pipe alone
|
|
void hold_brake_pipe(double Pressure) { m_pipepressure = Pressure; }
|
|
|
|
// advances the physics by one step of Dt, the way the simulation loop does
|
|
void step(track const &Track = {}, double Dt = 0.01);
|
|
// advances the physics by Seconds in steps of Dt
|
|
void run(double Seconds, track const &Track = {}, double Dt = 0.01);
|
|
|
|
// vehicle speed in kilometres per hour, negative when moving backwards
|
|
double speed() const { return m_mover->V * 3.6; }
|
|
|
|
private:
|
|
friend class pair;
|
|
|
|
// the two halves of a step: the forces, taken by all the vehicles in the scene first, then the movement,
|
|
// the vehicle placed at Location. returns the distance travelled [m], positive forwards
|
|
void compute_forces(double Dt);
|
|
double compute_movement(track const &Track, double Dt, TLocation const &Location);
|
|
|
|
std::unique_ptr<TMoverParameters> m_mover;
|
|
double m_pipepressure{-1.0};
|
|
};
|
|
|
|
// two vehicles on a straight track, the FirstEnd of the first one facing the SecondEnd of the second one Gap metres
|
|
// away (from coupler to coupler), with nothing else around. a step runs them the way the simulation runs the
|
|
// vehicles of a scene (vehicle_table::update()): each one finds its neighbour, then both take the forces, the
|
|
// coupler and buffer ones among them (CouplerForce()), then both move and handle the collisions (CollisionDetect()).
|
|
// they couple and part on their own, as the couplers let them; the speed of each runs along its own axis
|
|
// test::pair pair{moving, end::front, standing, end::rear, 1.0}; // 1 m apart
|
|
// pair.run(5.0); // for 5 s
|
|
// CHECK(pair.coupled());
|
|
class pair {
|
|
public:
|
|
pair(vehicle &First, int FirstEnd, vehicle &Second, int SecondEnd, double Gap);
|
|
~pair();
|
|
pair(pair const &) = delete;
|
|
pair &operator=(pair const &) = delete;
|
|
// the vehicles point at the stand-ins of the pair, which stay where they are
|
|
pair(pair &&) = delete;
|
|
pair &operator=(pair &&) = delete;
|
|
|
|
// advances both vehicles by one step of Dt
|
|
void step(track const &Track = {}, double Dt = 0.01);
|
|
// advances both vehicles by Seconds in steps of Dt
|
|
void run(double Seconds, track const &Track = {}, double Dt = 0.01);
|
|
// distance between the facing couplers [m], negative while the buffers are pressed in
|
|
double gap() const;
|
|
// type of the coupling between the vehicles, coupling::faux when they aren't coupled
|
|
int coupling() const;
|
|
bool coupled() const { return coupling() != coupling::faux; }
|
|
|
|
private:
|
|
struct placement {
|
|
vehicle *owner{nullptr};
|
|
int end{0}; // the end facing the other vehicle
|
|
double position{0.0}; // of the middle of the vehicle along the track [m]
|
|
double heading{1.0}; // +1 when the vehicle runs forwards towards the growing position, -1 otherwise
|
|
std::vector<std::byte> standin; // what the other vehicle sees as this one, see vehicle.cpp
|
|
};
|
|
|
|
void find_neighbours();
|
|
|
|
std::array<placement, 2> m_vehicles;
|
|
};
|
|
|
|
} // namespace test
|