|
|
1c28809dd7
|
Sonar fixes
|
2026-10-09 14:42:55 +02:00 |
|
|
|
ff25e71e90
|
Merge branch 'feat/modern-editor' into feat/mini-generation
|
2026-10-09 13:13:33 +02:00 |
|
|
|
3e3317d26f
|
feat(editor): the toolbar as buttons with icons and names, the chosen tool standing out as the chosen field of work does, the names left out when the row is too narrow for them; the fields of work with icons of their own (surroundings, tracks, roads, terrain) and both rows captioned at their left end (work modes, tools); the tools of the toolbar and of the left edge of the 3d view from one list; Polish translation
|
2026-10-09 12:49:45 +02:00 |
|
|
|
645a54a739
|
feat(editor): icons over the 3d view: the tools of the field of work along its left edge (the edit modes of the surroundings, the track tools, the road tools with the lanes, the terrain tools with the orthophoto), the modes of the gizmo at its top, the axes of the world as the camera sees them in its top right corner, a click on one looking along it, with the top view under them; the icons drawn by editor/icons/editor_icons.py into a png which CMake writes out as an array built into the executable; the gizmo modes and the top view left out of the toolbar; Polish translation
|
2026-10-09 11:54:47 +02:00 |
|
|
|
f2e73812d9
|
feat(editor): View menu with the top view, the lanes of the roads, the structure gauge and a window of the weather and time (time of day, day of the year, visibility, clouds, air temperature, seen in the editor only); the orthophoto settings in a window of their own again; the tracks and roads menus left out, their tools being in the row of the field of work; End drops the models onto the same ground the insert puts them on, the terrain tile models and the terrain patches of the editor included; the loading screen kept in the main window; Polish translation
|
2026-10-09 11:46:42 +02:00 |
|
|
|
f94100ffe7
|
feat(editor): more models selected at once (Shift+LMB), moved and turned by the gizmo together, undone in one step; Ctrl+C / Ctrl+V copy the selected models with their groups and paste them at the cursor; Ctrl+G groups the selection, Ctrl+Shift+G takes a group apart, groups written to the scenery as group ... endgroup and loaded as groups of their own; End drops each model of the selection and of their groups onto the ground; menu of the selection at the cursor on Ctrl+RMB; Edit menu with undo, redo, the clipboard, grouping, deleting; Help > Keyboard shortcuts (F1) with the keys of every field of work, F2-F5 choose the fields of work, the tracks menu lists the track tools with their keys, the keys and descriptions in the menus and tooltips; self-test commands for the selection; Polish translation
|
2026-10-09 01:12:46 +02:00 |
|
|
|
791d5d052c
|
feat(editor): fields of work in a row of their own over the toolbar (surroundings, tracks, roads, terrain), twice as high, with bigger bold text, and the tools of the one chosen in the toolbar under it: the edit modes of the node bank, the track tools in groups with the vehicle and the structure gauge, the road tools with what the place tool puts, the terrain tools (sculpt, smooth, chunks, orthophoto); the tool options window keeps the settings of the tool; the node bank shows a big preview of the entry pointed at for a moment, with its model and skin; the green colours by default again; Polish translation
|
2026-10-09 00:42:17 +02:00 |
|
|
|
f184ce7a6a
|
feat(editor): colours of the editor: amber accents on grey panels as in the design of the layout, the rest of the simulator stays green (colours of the ui chosen by the ui of the mode drawn; Editor Settings > General, kept in eu07_editor.ini), docking preview in the accent colour in both; keys 1-5 choose the edit modes in the order of the toolbar, shown in its tooltips; Mode windows merged into Windows: the windows of the editor, model sets among them, window layout reset and unpinning of the docks; Polish translation
|
2026-10-09 00:15:14 +02:00 |
|
|
|
4b451622de
|
feat(editor): pins of the docks: an unpinned dock hides its windows in a strip at the edge of the main window, a tab of the strip shows its window over the 3d view when pointed at for a moment or clicked, and it goes back when the cursor leaves it or on a click elsewhere, but not while it's in use (button held, popup open, typing, drag); pin in the tab bar of each dock, or Unpin in its window menu where the tabs leave no room; pin in the title of the shown window, or docking it by hand, puts the dock back next to the docks at that edge; Ctrl+Space (also in Mode windows) unpins all docks for the most of the view, or pins them back the way they were; unpinned docks kept in imgui.ini, cleared by Reset window layout; Polish translation
|
2026-10-08 23:27:17 +02:00 |
|
|
|
4e69d8f86c
|
feat(editor): fields of work chosen in the toolbar, one at a time: edit modes, tracks, signals, vehicle, roads, terrain; Toolset split into Tool options (tools of the field of work and the gizmo), Inspector (what it has selected: node with array and bend, path, road) and Node bank (list only); Scene window with the models of the scenery by layer and group, filtered by name or uuid, a click selects, a double click flies the camera to it; track window replaced by a palette of the track tools in groups (build, by the track, checks) with the tools under it, the selected path in the inspector, results of the speed, joints and infrastructure checks in a docked window; road window split into the tools in tool options and the selection in the inspector; terrain tools moved out of the editor settings into tool options together with the orthophoto settings (map menu opens them), leaving the terrain puts sculpting and chunk editing away; default layout: tool options and scene on the left, inspector on the right, node bank and checks at the bottom; Polish translation
|
2026-10-08 22:41:51 +02:00 |
|
maj00r
|
5d075e75fe
|
show compass in ortho view
|
2026-10-08 22:00:19 +02:00 |
|
maj00r
|
95d4581da2
|
pan ortho view with middle mouse
|
2026-10-08 22:00:04 +02:00 |
|
maj00r
|
4d7f5f0f0c
|
move parallel track to lay and selection
|
2026-10-08 21:56:28 +02:00 |
|
|
|
60c7250683
|
feat(editor): docked layout: windows of the editor docked around the 3d view (dockspace over the main window, default layout built when there's none or on Mode windows > Reset window layout), menu shown all the time, toolbar with the edit modes, track and road windows, gizmo operations and the top view, status bar with the outcome of the last operation and the selected node; dockspace submitted also when the frame was started by the ui of another mode, so docked windows don't come undocked on the change of mode; stable ids of the editor windows, no auto resize of the dockable ones; hints of the track and road tools placed in the part of the window the 3d view is seen in; Polish translation
|
2026-10-08 21:39:31 +02:00 |
|
|
|
476f3bf1b7
|
feat(ui): panels can be docked together and dragged out of the simulator window into windows of their own (imgui multi-viewports, ui.viewports yes by default, off where the renderer or the platform can't do it, e.g. wayland); imgui coordinates kept relative to the main window by the glfw backend, so the overlays, picking and gizmo of the editor work unchanged; overlays of the 3d view drawn on the main viewport; keys pressed in the separate windows passed on to the simulator, so the shortcuts of the editor work there too
|
2026-10-08 21:04:58 +02:00 |
|
|
|
344034ec70
|
feat(ui): imgui 1.91.9b-docking in place of 1.73: local changes of the backends carried over (glad as the gl loader, srgb and gamma of the ui, gles glsl string), BufferingBar/Spinner kept, imgui_tables in cmake; cursor position, cursor enter and focus of the main window passed to the glfw backend, which works with events now; code adapted to the api: ImGuiListClipper::Begin, BeginListBox, ImTextureID as an integer, ImageButton with an id, ImGuiKey without GetKeyIndex, logarithmic sliders in place of the removed power argument; ImGuizmo with the math operators defined before imgui.h and SetNextFrameWantCaptureMouse
|
2026-10-08 20:38:13 +02:00 |
|
maj00r
|
c11480ce2e
|
fix flipped ortophot + clear cache
|
2026-10-08 20:20:12 +02:00 |
|
maj00r
|
b02fe0ac2b
|
feat(editor): Signals mode of the Tracks window (H): semaphores, block, warning, shunting, stop, substitute signals and repeaters placed by the track from the templates of the scenery, described by //$e signal: (kind, mount, lamps, lean, the event the train reads them by) which tools/editor/signal_headers.py writes into them; a click by a track puts the signal on that side 2.25 m from the axis at the rail heads, facing the trains which have it on their right, a drag along turns it to the trains going the way of the drag; its (p1)_sem_info goes to event1 or event2 of the path, warning signals and repeaters, which the train doesn't read, get none; a head leaning away from the track swapped for its counterpart; the plate named like the signal; signals dragged along the track with their event, removed with it, renamed in the node properties with it, each a single step of the undo history; Polish translation
|
2026-10-08 03:12:16 +02:00 |
|
maj00r
|
d4791f6a29
|
feat(editor): a model or an include standing by a track bent along it (B, or the Bend along the track section of the toolset): it stays where it stood and follows the track, through the joined tracks as far as it reaches; reference point at its start, origin, middle, end or a point picked on the model, across at its origin, the side facing the track, the far side or its middle, up at its origin, bottom, top or the top of its edge by the track; the blue cross of a bent model dragged for its offset, with Shift for its height and with Ctrl along the track, the values shown at the cursor; a bent model clicked to edit; one step of the undo history; scale of the model kept, parts lit only at night left out; edges of platforms told by the name of the model and by the overhang of their edge over the foot: put 1.725 m from the axis at the height the name gives, turned with the edge to the track when they stood the other way; platforms stand on the plane of the rail heads carried on to their edge (PKP PLK ST-T2), the gauge widening led in from the tracks beyond the ends and from the other path of a switch; gaps between the pieces of a sweep filled with the paths which join them; Platforms and models tab left out of the track editor; laid track eased into the curvature of the one it joins with a transition curve; File > Open scenery... starts the editor again with the scenery picked from a list; the camera saved with the scenery; T and Shift+T turn each turntable to its next and previous position by event launchers written on each save; a turntable track deleted with its template; a scenery with no trainset gets a WMB10 on its first track; vehicle placed where the track is clicked; gauge check takes in the bent models; Polish translation of the editor
|
2026-10-08 00:51:40 +02:00 |
|
|
|
9d6aa24af4
|
Merge branch 'feat/modern-editor' of https://github.com/MaSzyna-EU07/maszyna into feat/modern-editor
|
2026-10-06 22:53:04 +02:00 |
|
|
|
8dd666d4d8
|
feat(editor): array of the selected model in the toolset, after the array modifier of Blender: fixed count or fit length, relative and constant offset along the axes of the model, turn per copy, copies following the ground; the array follows its settings until something else is selected or changed, and is a single step of the undo history
|
2026-10-06 22:52:42 +02:00 |
|
maj00r
|
24923dd472
|
feat(editor): track editor driven by what the cursor is over: the outline and a label show what a click or a drag does, snapping to free ends on the screen, handles and ends dragged directly, no rotation gizmo; laying from a free end the same in every mode, straight with Shift, the curve of a switch going on past its diverging end; height 0 where there's no terrain; placed switch leaves the switch mode, double slips listed apart, a drive of the switch placed with it by the //$e switch description of its template; compound curves of any number of radii; dragged end of a straight fits the curve beside it; name of a path, followed by the memory cells and the includes taking it; turntable placed from a template described as one, tracks led out of it and the tracks around fitted to it, its positions written to the include; infrastructure bound to the path whose events read its memory cell; terrain made where the route has none and shaped to the formation under the ballast; models along the track over the selected path and on along the joined ones while dragged, rarely used settings folded; vehicles and trainsets placed on any path, switches included, facing the way the arrow shows; joined paths spread into the selection; New scenery in the File menu starts the editor again with the wizard; ortho zoom towards the cursor; scripted self tests; Polish translation
|
2026-10-06 22:19:54 +02:00 |
|
|
|
c4a22eabd5
|
feat(editor): nodes placed with the brush and the area fill go without names; name of a model instance set in the node properties and written to its definition on save; redo of a deletion finds nodes which have no name
|
2026-10-06 21:58:57 +02:00 |
|
|
|
2e631dcbd6
|
feat(terrain): binary terrain files (.btf) made out of text terrain files (.txtf) named by terrain directives, checked against length and checksum of the text and loaded section by section when needed; -btf command line conversion; SBT files no longer generated, only loaded
|
2026-10-06 01:55:38 +02:00 |
|
maj00r
|
a13a5548df
|
feat(terrain): grade line fitted to the ground under the route within the limits; editor terrain shaped to the grade line with a formation and rounded slopes, with one step back; scenery ground triangles of chosen materials converted to editor terrain and taken out of the files on save, with a dated backup of each file; crack-free simplified terrain mesh, terrain streamed as far as the scenery is drawn, the nearest chunks first; smoothing brush
|
2026-10-05 02:21:55 +02:00 |
|
maj00r
|
3731520e33
|
feat(tracks): track editor in one movable Tracks window with exclusive modes, a guide of what can be done in the current step and the rarely used fields folded; vertical profile window with the ground of the scenery triangles; plain pieces added at a free end, freehand only on request; curve mode edits the single curve clicked
|
2026-10-05 01:21:11 +02:00 |
|
|
|
012ffc7470
|
Merge branch 'feat/modern-editor' of https://github.com/MaSzyna-EU07/maszyna into feat/modern-editor
|
2026-10-04 21:58:19 +02:00 |
|
|
|
27a94509c4
|
feat(roads): right of way and lane turns at junctions, road weights, kerbs, medians and forking roads, banks to the ground, roundabouts, pedestrian crossings, spawn sets by count; fix(editor): model skin export, placement on the ground under the orthophoto
|
2026-10-04 01:55:35 +02:00 |
|
maj00r
|
d57215877f
|
feat: structure gauge window in the menu bar, gauge tunnel around the hit, fixed reach
|
2026-10-04 01:54:17 +02:00 |
|
maj00r
|
b0c363b586
|
feat: structure gauge along the line of the selected path in the OpenGL view
|
2026-10-04 01:27:41 +02:00 |
|
maj00r
|
c85a52d5b1
|
refactor(editor): track observer instead of the function hooks
|
2026-10-04 00:37:26 +02:00 |
|
maj00r
|
8778353b22
|
feat(editor): infrastructure bound to the paths follows their changes
|
2026-10-04 00:14:03 +02:00 |
|
maj00r
|
7371b18910
|
feat(editor): vertical profile editor, grade lines kept in the scenery
|
2026-10-04 00:14:03 +02:00 |
|
|
|
d37dff11e1
|
fix(editor): ground lookups sorted once instead of walking every terrain model, orthophoto kept under the roads; feat(roads): junction sides, stop lines and junction options
|
2026-10-03 23:13:01 +02:00 |
|
|
|
502c609b13
|
feat(roads): single piece widening with generated transitions, point height tools, fix for the frame rate drop in the road tools
|
2026-10-03 22:18:53 +02:00 |
|
|
|
daeed40f15
|
feat(roads): junctions, height above the ground and rounded profile following the terrain
|
2026-10-03 20:28:37 +02:00 |
|
|
|
e4083d507f
|
feat(roads): editor menu and window for building roads, lanes shown as trajectories
|
2026-10-03 18:21:10 +02:00 |
|
maj00r
|
bf24c3983a
|
feat(editor): no sub-metre straights, switches snap, K splits path
|
2026-10-03 02:41:34 +02:00 |
|
maj00r
|
8a50d352fb
|
feat(editor): shift with 4 points, single path curves, undo
|
2026-10-03 02:41:34 +02:00 |
|
maj00r
|
a5955f322e
|
feat(editor): context editor for geometry, paths behind switches, switch textures
|
2026-10-03 02:41:34 +02:00 |
|
maj00r
|
1985758a86
|
feat(editor): insert switches by dragging, paths from free ends
|
2026-10-03 02:41:34 +02:00 |
|
maj00r
|
5caefa297b
|
feat(editor): context from path, modifier keys, radius grip, viewport hints
|
2026-10-03 02:41:34 +02:00 |
|
maj00r
|
e910af4712
|
feat(editor): break and S-curve with mouse
|
2026-10-03 02:41:34 +02:00 |
|
maj00r
|
9198840d0f
|
feat(editor): straights include switches, drag to edit
|
2026-10-03 02:41:34 +02:00 |
|
maj00r
|
78c4b9f6df
|
feat(editor): add orthographic top view toggle
|
2026-10-03 02:41:34 +02:00 |
|
maj00r
|
b19f3de0d4
|
feat(editor): recognize collinear straights, measure
|
2026-10-03 02:41:34 +02:00 |
|
maj00r
|
7ede96df5f
|
chore(editor): cleanup comments
|
2026-10-03 02:41:34 +02:00 |
|
maj00r
|
8f2a34b3cf
|
feat(editor): route design with curves and transitions
|
2026-10-03 02:41:34 +02:00 |
|
maj00r
|
b93c5dde60
|
feat(editor): edit tracks loaded from the scenery
|
2026-10-03 02:41:34 +02:00 |
|
|
|
521c4f9ebb
|
feat(editor): keep content added by the editor ahead of FirstInit
|
2026-10-03 01:59:13 +02:00 |
|
