eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-02 05:49:13 +01:00
Code Issues 157 Wiki Activity

feat(editor): the signalling, the hectometre posts and the terrain go to layers of their own: <scenery>_srk.scm, _hektometry.scm, _teren.scm, made by the first of them and included by the scenario file, the active layer left as it is; the station descriptions of the signalling there too

Browse Source
This commit is contained in:
maj00r
2026-10-23 13:07:14 +02:00
parent d14b4534ee
commit fe3dd758ea
10 changed files with 85 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
application/editormode.cpp
View File

@@ -2986,8 +2986,9 @@ bool editor_mode::save()
}
first_step_done(first_step::save);
// the heightmap terrain is kept in files of its own, the scenery only needs the directive which loads it
// the heightmap terrain is kept in files of its own, the scenery only needs the directive which loads it, in a layer of its own
std::vector<std::string> rootstatements;
std::map<scene::layer_handle, std::vector<std::string>> statements;
if (m_streamer.active())
{
std::string error;
@@ -2997,7 +2998,13 @@ bool editor_mode::save()
return false;
}
if (false == scene::Layers.terrain_directive())
rootstatements.emplace_back("heightmap_terrain " + m_streamer.name() + " endheightmap_terrain");
{
auto const directive{"heightmap_terrain " + m_streamer.name() + " endheightmap_terrain"};
if (auto const layer{output_layer("teren")}; layer != null_handle)
statements[layer].push_back(directive);
else
rootstatements.push_back(directive);
}
}
if (m_profile.changed)
@@ -3016,14 +3023,14 @@ bool editor_mode::save()
m_orthophoto_mark = map;
scene::Layers.mark(scene::layer_handle{1}, "//$o", {map});
}
auto const terrainadded{false == rootstatements.empty()};
auto const terrainadded{false == rootstatements.empty() || false == statements.empty()};
auto const controls{turntable_controls(rootstatements)};
auto const noses{nose_controls(rootstatements)};
std::vector<std::string> trailing;
auto const placed{m_vehicle.trainset_lines(trailing)};
if (placed == 0)
starter_trainset(trailing);
auto const result = scene::Layers.save(rootstatements, trailing);
auto const result = scene::Layers.save(rootstatements, trailing, statements);
if (result.success && controls)
m_turntable_included = true;
if (result.success && noses)