18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-19 22:44:59 +01:00
Commit Graph

3697 Commits

Author SHA1 Message Date
jerrrrycho
5bac4e1cf1 Fix the four issues failing the Sonar quality gate on master (#323)
* fix(scripting): forward the object in push_object of the Lua screens (cpp:S5417)

push_object takes a forwarding reference and called std::move on it, which
SonarCloud reports as a blocker bug. It only worked because every caller
passes an rvalue: with an lvalue Type_ is deduced as a reference, and
new Type_(std::move(Object)) doesn't even compile.

The object is now forwarded, and the userdata is sized and built for
std::remove_cvref_t<Type_>, the type collect<> and check_object<> are used
with: an rvalue is moved in, an lvalue would be copied. Every caller passes
an rvalue of lua_image, bitmap_font or glyph, so they move the object in
exactly as before.

* fix(simulation): turbidity from the overcast without branches of the same value (cpp:S3923)

The chain of conditionals setting Global.fTurbidity had pairs of branches
with the same result (<= 0.10 and <= 0.20 both 4, and so on, the last two
both 9), which SonarCloud reports as a bug. The thresholds that changed
nothing are gone and the mapping is a small function: up to 0.20 gives 4,
up to 0.40 5, up to 0.60 6, up to 0.70 7, up to 0.80 8, anything else 9.
The comparisons are the same ones, in the same order, so every overcast
value gives the turbidity it gave before.

* test: script screen tests keep their files in the build folder, not in the temporary one (cpp:S5443)

The folders of the script screen host tests were made in the system's
temporary directory, and the sandbox test put its "outside.txt" straight
into that directory. SonarCloud reports both uses as vulnerabilities:
the directory is writable by everyone.

The folders are now made in the build folder of the unit tests, passed to
them as EU07_UNIT_TESTS_SCRATCH, the way EU07_UNIT_TESTS_DATA is. The
scripts are one level down in the folder of a test, so the file the sandbox
test puts outside the folder of the scripts is still inside the folder of
the test and goes with it. Nothing depends on the working directory, and
nothing is left behind.
2026-11-11 06:04:31 +01:00
maj00r
b251b6fe42 feat(blackbox): a black box of the session: the run, the cab, the signals and the stations to a file (#322)
* feat(blackbox): a recorder of the run, the cab, the signals and the stations to a file

With the physics logs on (and the new eu07.ini setting blackbox, on by
default), the simulator writes a black box of the session to
physicslog/*.blackbox: the scenery map (tracks, signals, W4 stop points
with their heading, W6 horn points), the timetables of the user's train,
and at 10 Hz the cab of the vehicle the user sits in (speed, controllers,
brakes, pressures, lights with the pattern the run asks for, the movement
kind), the AI's reference for the same place (target speed, next limit,
braking distance), the consist, the cameras and the vehicles around.
Changes go in as they happen: switches, signal aspects, commands,
signals passed with their aspect, stations stopped at, passed or missed,
horn requests, the autopilot switched on or off, couplings and vehicles
removed.

The driving aid's next speed limit moved from the UI panel to
TController::next_speed_limit(), so the panel and the recorder read the
same. The format is described in blackbox_doc.md; the writer and the
reader of the records have unit tests.

* fix(blackbox): the aspect a signal had when passed, the lamps the ends have, vehicles taken off

- A passed signal is written with the aspect the train had of it, kept in
  the speed table, not the one its memory cell shows when the pass is
  noticed: by then the train itself on the track behind has often set
  it to stop, and most passes were written as at stop.
- The cab record gains the lamps the vehicles at the head and the tail
  have at their outer ends (136 bytes), so a reader can check the light
  pattern against them as the driver does (no upper headlight, the
  auxiliary lamps, the rear-end signals only).
- A vehicle taken off the scenery and still pointed at by a coupler or
  the camera gets no new number; the camera lets go of it.
- The timetable written before a station goes under the vehicle the
  user is in now, not the one of the last look.
- The file buffer is given once the file is open: MSVC passed over one
  given before.
- The doc tells the AI fields before the consist is started and when
  entering a vehicle is a driver change.

* fix(blackbox): the stop of an automatic block signal passed is written as a stop

The speed table keeps the stop of an automatic block signal (SetVelocity 0 x) as the speed allowed after it, with spStopOnSBL; a pass of it was written as that speed with no flag. It is written as 0 with the flag of an automatic block stop again.

* feat(blackbox): the doors, the brakes of the whole train, a diesel's engine and the rest of the cab

The cab record grows from 136 to 190 bytes, so that a reader can check
everything the driver did:

- the doors: the permits on each side, the departure signal, the steps,
  the door lock and whether the doors are locked;
- the brakes: the equalizing reservoir of the driver's valve, the main
  reservoir pipe, the highest brake cylinder pressure of the train, the
  hand brake, the releaser, the setting (G/P/R/Mg) and the mode
  (PS/PN/EP/MED);
- what drives the vehicle (electric, induction, diesel, diesel-electric,
  steam, none), its power, a diesel's oil pressure, water, oil and engine
  temperatures, overheating, fuel and oil pumps, clutch and torque
  converter, the motor fans;
- the cruise control and its speed, the integrated driving handle of a
  unit, the radio channel, the horn's tones.

New device bits use the upper half of the 32-bit field; the new fields
come at the end of the record, so older readers still read it.

* fix(blackbox): the driver's valve field is what its gauge shows, the radio channel has no none

Handle->GetCP() is the equalizing reservoir of most valves but the time reservoir of the FV4a, empty but after an overcharge: the field is named and documented as what the valve shows. With no driver the radio channel reads as the first one, not 0.

---------

Co-authored-by: maj00r <maj00r@host>
2026-11-11 04:30:52 +01:00
maj00r
18c56359ee fix(ai): the stop point on a W4 kept the margin of a passenger stop from the platform's end (#321)
The W4 stop point was shifted with fMinProximityDist (8 m), while the
train comes to a stand anywhere up to the margin of a passenger stop
(10-15 m by the number of vehicles) short of it. A train stopping by
the middle of a platform could so stand with its tail a few metres past
the platform's end (L053: Swoszowice 204.5 m of 201, Tumlin 244.3 m of
242). The point is now shifted with the same margin the stop is judged
by, so the tail stays inside (197.5 m and 240.4 m on the same run).

Co-authored-by: maj00r <maj00r@host>
2026-11-11 04:30:13 +01:00
5764e942a7 build(linux): load the shared libraries from the game folder and ship them in the build (#320) 2026-11-11 04:29:36 +01:00
226155d430 feat(physics): physical coupler model for the player's train and those it closes in on, plastic hit on solid buffers 2026-11-11 03:15:58 +01:00
aba8687678 feat(ui): repair the broken coupler next to the camera from the driving aid 2026-11-11 02:52:00 +01:00
8e97277bcb feat(debug): coupler section in the debug panel, with the parameters of the physical model 2026-11-11 02:28:46 +01:00
c85aab4f3f feat(physics): physical coupler model with slack, hysteresis and breaking 2026-11-11 01:43:46 +01:00
39e855d3a5 Merge pull request #319 from MaSzyna-EU07/docs/agents-md
docs: AGENTS.md as the one set of rules for every coding agent
2026-11-10 23:40:52 +00:00
b42d2f7b66 docs: AGENTS.md as the one set of rules for every coding agent build-docs-agents-md 2026-11-11 00:40:27 +01:00
b3e6e02779 ci(windows): build lua51.dll for the unit tests 2026-11-11 00:34:59 +01:00
maj00r
5c8cc6d9a5 feat(ai): PointVelocity, a speed limit for the head of the train at a point beyond the cell (#304)
* feat(ai): PointVelocity, a speed limit for the head of the train at a point beyond the cell

A memory cell (or putvalues) with "PointVelocity v d" tells the train that the head has to be at v km/h
at the point d metres beyond the cell (v -1: no limit). The cell is read by the speed table scan like a
signal, live until the head passes it; what it says then is kept for the point, later changes of the
cell don't concern that train. The limit ends when the head passes the point, it doesn't hold the rest
of the train and doesn't extend or break a speed limit of the line, like W27 of length 0 moved d metres
on. The AI brakes so the head reaches the point at v; for a human driver it only shows as the next
speed limit of the driving aid, the security systems don't see it.

It is made for the warning disc of a level crossing (TOP, Osp1/Osp2), which has to give 20 km/h at the
crossing about 500 m beyond the disc, as the disc showed when the train passed it.

The cell with PointVelocity as its first command makes its getvalues scanned (passive) as SetVelocity
does; PutCommand ignores it when such an event runs. Old commands keep working as they did,
SetProximityVelocity included.

* fix(ai): a point limit isn't a signal, and a PointVelocity 0 can be released

From the review of the PointVelocity commit:
- a cell rewritten from SetVelocity or ShuntVelocity to PointVelocity drops the flags of a signal, so it
  can't count as a semaphor or report a signal passed at danger;
- PointVelocity 0 is read on after the head passes the cell, as a stop of a signal is, otherwise the
  train would stand short of the point for good;
- a point limit doesn't become eSignNext, so a W4 between the disc and the crossing keeps its release.

* fix(ai): a PointVelocity limit outlives a rebuilt speed table, and holds when shunting

The state of the cell, latched when the head passes it, is now kept by the
controller apart from the speed table, and the distance to the point is
measured by the movement of the consist in the world. Stopping, backing up
and going on between the cell and the point, coupling or a takeover no longer
lose the limit or read the cell anew, unless the head backs up past the cell,
when the cell is read again.

Near the point the desired speed is capped to the limit, so a train that
coasts within its tolerance (as a shunting one does) reaches the point at it.

* fix(ai): review of the latched point limits

- a point the head has passed already isn't latched, and a latched limit at
  or behind the head isn't applied (it asked for a full brake for a cycle);
- a latched limit is dropped once the head backs up behind its cell, so it
  can't follow the consist onto another track; the table reads the cell again;
- a cell latched already, found under the consist by a rebuilt table, is
  ignored whatever it shows now (a 0 for the next train no longer stops it);
- PointVelocity 0 stops at the usual distance, not from the approach;
- the heading follows the track under the measured vehicle, not the chord of
  the consist, which a long consist on a tight curve holds far off the track;
- vehicles coupled or uncoupled at the end towards the point move the head;
- a jump of the consist (moved elsewhere) drops the latched limits.

* fix(ai): a cab change and curves don't move the latched point limits

- the end of the consist towards the point is taken into the distance only
  when the consist changes (its end vehicles or its length), not when another
  vehicle is measured from (a cab change at a reversal) nor when a curve
  shortens its projection;
- the way of travel follows the direction of the driver's vehicle against
  its own couplers, not the chord of the consist, which on a balloon loop
  points against it.

* fix(ai): a coupling with a cab change in one order still moves the head of a latched point limit

The end of the consist measured from the previous vehicle is moved to the place of the new one, so a coupling or an uncoupling followed at once by a change of direction to the other cab (the shunting orders) is taken into the distance to the point.

---------

Co-authored-by: maj00r <maj00r@host>
2026-11-10 18:44:33 +01:00
ee6f9a0aa2 Merge branch 'master' of https://github.com/MaSzyna-EU07/maszyna into feat/wasm-screens 2026-11-10 16:23:35 +01:00
e433b43fef Script screens: led_post and resize of the Lua screens on the gpu 2026-11-10 16:22:35 +01:00
c4924f756d Lua script screens beside the WebAssembly ones 2026-11-10 15:29:25 +01:00
a73585dca0 Dont copy entire python env when already present 2026-11-10 01:05:58 +01:00
18c333b089 wasm display support 2026-11-10 00:57:37 +01:00
c9792672c6 fix(render): textures of a far vehicle no longer come back black with gfx.resource.move (#308) 2026-11-10 00:41:14 +01:00
Claude
fabbfdc782 feat(editor): the wheel held and dragged pans the perspective view too, the ground under the cursor going along with it
Pressing the mouse wheel and dragging pans the top view; now it pans the perspective view as well. The camera moves over the
ground, its height and its turn kept, by as much of the ground as the cursor crosses where it was pressed: metres to a pixel
taken from the distance to what is under the cursor, and a pixel up the screen counted as more of the ground than one across
as the camera looks down less steeply. With nothing under the cursor (the sky) it doesn't start.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ
2026-11-09 23:24:50 +01:00
Claude
6684baefc3 feat(editor): the points of the roads picked on the screen, also under the terrain; Alt+drag their height
The points where the pieces of a road meet were picked only by the ground clicked: one more than 3 m above or below the
ground under the cursor (a road taken down into a cutting, under an embankment) couldn't be picked again. Now the point
nearest to the cursor on the screen (within 12 px, the one nearer to the camera of those about as near) is picked first,
the ground as before after it.

Alt+LMB on a point and dragging up or down changes the height of the selected points (Ctrl: ten times finer); the change
shows as yellow lines and a label by the cursor while dragging, and is applied, as one step of the history, when the button
is let go.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ
2026-11-09 23:16:38 +01:00
maj00r
685258d787 Merge pull request #274 from MaSzyna-EU07/feat/elf-master-controller-emergency-brake
Elf: emergency brake position in the master controller (eu07/maszyna#413)
2026-11-09 18:59:12 +01:00
jerrrrycho
dfb2329fb5 Merge remote-tracking branch 'origin/master' into feat/persistent-odometer-store
# Conflicts:
#	vehicle/Train.cpp
2026-11-09 16:33:48 +01:00
jerrrrycho
ada2b0ec23 Merge remote-tracking branch 'origin/master' into feat/mains-before-pantographs 2026-11-09 16:33:34 +01:00
jerrrrycho
8809ce3162 Merge remote-tracking branch 'origin/master' into fix/freight-brake-setting-cw1 2026-11-09 16:33:32 +01:00
jerrrrycho
c440243fad Merge remote-tracking branch 'origin/master' into fix/et42-fans-compressor-lamps-et22-louvre 2026-11-09 16:33:31 +01:00
jerrrrycho
12299bb1fa Merge remote-tracking branch 'origin/master' into feat/elf-master-controller-emergency-brake 2026-11-09 16:33:31 +01:00
jerrrrycho
b256c3efa9 refactor: MOVER.h includes the odometer's plain data only
odometer::reading moves to vehicle/odometerreading.h, the store with its files stays in vehicle/odometer.h, so the
physics header doesn't pull in the filesystem and the streams
2026-11-09 16:31:43 +01:00
jerrrrycho
8029740770 fix: read the odometer files of the koliber screens too, say why the unit renderers' drop a letter
the renderers of the units (elf_v1, impuls_v1) keep the unit's state, their cars are named after the unit and the
letter of the car (EN76-022a .. EN76-022d), so they drop the last character. the koliber screens of scripts/ keep
theirs in scripts/kilometry by the whole name, which wasn't read
2026-11-09 16:27:45 +01:00
1760c90934 Merge pull request #271 from MaSzyna-EU07/feat/diesel-throttle-position-marker
Throttle position marker for diesel locomotives (#74)
2026-11-09 15:23:17 +00:00
jerrrrycho
7a9f3e2c39 Merge remote-tracking branch 'origin/master' into feat/mains-before-pantographs
# Conflicts:
#	McZapkie/MOVER.h
2026-11-09 16:13:51 +01:00
jerrrrycho
6f1055e09d fix: a duplicated cab control keeps its scale table
MirrorCopy() of a duplicate: yes control (#285) now copies the scaletable: of the
duplicate's definition too, so the copy is animated on the same non-uniform scale.
build-feat-diesel-throttle-position-marker
2026-11-09 16:13:43 +01:00
jerrrrycho
ee42a80188 docs: the odometer store is keyed by the vehicle's name in the scenario 2026-11-09 16:12:44 +01:00
jerrrrycho
acf0716a9c fix: keep the odometers of the vehicles with a driver's cab only
every vehicle which ran got a line in the store, the wagons of the AI's trains in every scenario too. the store
records a vehicle with a driver's brake valve (BrakeHandle in the .fiz), which can show its odometer; the locomotives
and units the AI runs before a player's cab loads them still get in with their replaceable made up states. the
states already in the file stay as they are
2026-11-09 16:12:13 +01:00
jerrrrycho
478727850d Merge remote-tracking branch 'origin/master' into feat/diesel-throttle-position-marker
# Conflicts:
#	vehicle/Gauge.h
#	vehicle/Train.cpp
2026-11-09 16:07:48 +01:00
jerrrrycho
729f15e878 fix: a test run neither reads nor saves the player's odometer store
the autotests (--test, Global.test.enabled) run the vehicles of the player's game: their odometers count from the
legacy or made up states in a store of their own, and nothing is written to eu07_odometers.txt
2026-11-09 16:01:16 +01:00
jerrrrycho
e8735f1564 fix: the copies of the odometer counter (duplicate: yes) drop their offset too
the counter's offset no longer applies once it shows the odometer, the copies of the control which master added
kept theirs and showed it on top
2026-11-09 15:54:10 +01:00
jerrrrycho
d53f3cc21a Merge remote-tracking branch 'origin/master' into feat/persistent-odometer-store
# Conflicts:
#	vehicle/Gauge.h
2026-11-09 15:33:03 +01:00
jerrrrycho
91dab65369 Merge remote-tracking branch 'origin/master' into fix/freight-brake-setting-cw1
# Conflicts:
#	CMakeLists.txt
#	utilities/Globals.cpp
2026-11-09 15:32:03 +01:00
jerrrrycho
7ccd2f0431 Merge remote-tracking branch 'origin/master' into fix/et42-fans-compressor-lamps-et22-louvre
# Conflicts:
#	McZapkie/MOVER.h
2026-11-09 15:31:09 +01:00
jerrrrycho
cf3080c1f3 Merge remote-tracking branch 'origin/master' into feat/elf-master-controller-emergency-brake
# Conflicts:
#	McZapkie/Mover.cpp
2026-11-09 15:30:38 +01:00
d5e524ee60 Merge pull request #231 from dos1/aiui
driveruipanels: Allow to toggle AI driver from the driving aid
2026-11-09 13:00:26 +00:00
f908ae307b Merge pull request #265 from pwarszawski/feat/ai-braking-gradients
AI on up gradients: hold a train coming to a stand, start on the train brake
2026-11-09 12:59:34 +00:00
d6b9a94079 Merge pull request #267 from MaSzyna-EU07/fix/light-programmer-coupled-side-headlights
Light programmer: switch off the lights at the coupled end, not the opposite one (eu07/maszyna#395)
2026-11-09 12:58:57 +00:00
7c103b5d2d Merge pull request #268 from MaSzyna-EU07/fix/ws-hold-coil-lever-bistable
Bistable hold coil lever of the line breaker (eu07/maszyna#364)
2026-11-09 12:57:49 +00:00
f61a4ab2e7 Merge pull request #269 from MaSzyna-EU07/fix/diesel-smoke-after-ignition
Diesel exhaust smoke only once the engine fires (eu07/maszyna#523)
2026-11-09 12:57:02 +00:00
7edf23b8ff Merge pull request #270 from MaSzyna-EU07/fix/fpslimit-frame-pacing
fpslimit: pace frames in integer clock ticks, show the real frame rate (eu07/maszyna#416)
2026-11-09 12:56:40 +00:00
fa00fff594 Merge pull request #273 from MaSzyna-EU07/feat/6dg-power-demand-5pct-steps
6Dg: power demand in 5% steps (eu07/maszyna#412)
2026-11-09 12:55:39 +00:00
ff88868d32 Merge pull request #275 from MaSzyna-EU07/fix/sm42-shunt-mode-toggle
SM42: shunt mode at the first move of the switch, CA off in the shunt mode
2026-11-09 12:54:21 +00:00
889aa2d5db Merge pull request #278 from MaSzyna-EU07/feat/shunt-lock-resistive
Field shunting locked at zero and on resistive positions (eu07/maszyna#402)
2026-11-09 12:53:57 +00:00
4a9ab1447e Merge pull request #279 from MaSzyna-EU07/fix/multiple-unit-electric-diesel
No multiple-unit control between electric and diesel locomotives (eu07/maszyna#520)
2026-11-09 12:53:30 +00:00