eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-25 00:57:36 +02:00
Code Issues 152 Wiki Activity

feat(track): rails and ballast blended into those of the tracks joined, where their textures differ

Browse Source
This commit is contained in:
Hirek
2026-10-21 22:34:57 +02:00
parent 407a555803
commit c5a894a674
19 changed files with 721 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
editor/editorTrack.cpp
View File

@@ -157,6 +157,7 @@ editor_track::state editor_track::capture(TTrack const &Track)
result.sleeper_ballast = Track.m_sleeper_ballast_z;
result.timber_model = Track.m_timber_model_name;
result.timber_skin = Track.m_timber_skin_name;
result.blend = Track.m_blend;
result.rail_profile = Track.m_profile1;
for (int i = 0; i < 6; ++i)
result.events[i] = events(const_cast<TTrack &>(Track), i);
@@ -262,6 +263,7 @@ void editor_track::apply(TTrack &Track, state const &State)
Track.m_sleeper_ballast_z = State.sleeper_ballast;
Track.m_timber_model_name = State.timber_model;
Track.m_timber_skin_name = State.timber_skin;
Track.m_blend = State.blend;
Track.m_profile1 = State.rail_profile;
for (int i = 0; i < 6; ++i)
events(Track, i) = State.events[i];
@@ -3033,6 +3035,9 @@ void write_ending(std::ostream &Text, TTrack const &Style)
Text << "sleepermodel " << Style.m_sleeper_frequency << ' ' << Style.m_sleeper_model_name << ' ' << (Style.m_sleeper_skin_name.empty() ? std::string{"none"} : Style.m_sleeper_skin_name) << ' ' << Style.m_sleeper_offset.x << ' ' << Style.m_sleeper_offset.y << ' ' << Style.m_sleeper_offset.z << ' ' << Style.m_sleeper_ballast_z << ' ';
if (false == Style.m_timber_model_name.empty())
Text << "timbermodel " << Style.m_timber_model_name << ' ' << (Style.m_timber_skin_name.empty() ? std::string{"none"} : Style.m_timber_skin_name) << ' ';
for (std::size_t end = 0; end < Style.m_blend.size(); ++end)
if (Style.m_blend[end] != track_blend::default_length)
Text << "blend " << end + 1 << ' ' << Style.m_blend[end] << ' ';
Text << "endtrack\n";
}

2
editor/editorTrack.hpp
View File

@@ -21,6 +21,7 @@ http:
#include "editor/editorAlignment.hpp"
#include "editor/editorSwitchDesign.hpp"
#include "utilities/Classes.h"
#include "world/TrackBlend.h"
class TTrack;
class basic_event;
@@ -70,6 +71,7 @@ class editor_track
float sleeper_ballast{0.f};
std::string timber_model;
std::string timber_skin;
std::array<float, 3> blend{track_blend::default_length, track_blend::default_length, track_blend::default_length};
std::pair<std::string, int> rail_profile;
std::array<std::vector<std::pair<std::string, basic_event *>>, 6> events;
std::string name;