eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-17 03:59:19 +02:00
Code Issues 150 Wiki Activity

fix(track): at a crossing at nearly a right angle the tip of a guard rail under the wheels of the other track takes their rolling surface on its top, bright under a used track and rusty under an unused one, with the sides staying matte, instead of the whole tip going matte because the plain span of the tread was laid as a band between two lines it does not have; plain spans of treads are painted in the debug colour of EU07_EDITOR_TREADS too

Browse Source
This commit is contained in:
maj00r
2026-10-14 13:09:44 +02:00
parent 1fa7dee5d6
commit 55abd24ead
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
world/RailLayer.cpp
View File

@@ -299,6 +299,8 @@ struct grooved_profile {
float wallu { -1.f };
};
glm::vec3 const plain_mark { 0.f, 1.f, 1.f };
bool treads_marked() {
static auto const marked { std::getenv( "EU07_EDITOR_TREADS" ) != nullptr };
@@ -480,6 +482,7 @@ private:
grooved_profile split_grooved( gfx::vertex_array const &Outline ) const;
std::vector<rail_cut> top_cuts( gfx::vertex_array const &Top ) const;
void running( rail_piece const &Whole, knots::line const &Rolled, piece_ends const &Ends );
void plain( rail_piece Whole, rail_tread const &Tread, piece_ends const &Ends );
void treaded( rail_piece Whole, rail_tread const &Tread, piece_ends const &Ends );
gfx::vertex_array lay_sides( rail_piece const &Whole, piece_ends const &Ends );
void lay_top( gfx::vertex_array const &Top, rail_piece const &Whole, glm::dvec2 const &Reach, std::vector<double> const &Splits, std::vector<top_band> const &Bands, std::function<std::vector<double>( double )> const &Edges, piece_ends const &Ends );
@@ -640,7 +643,10 @@ void TTrack::rail_layer::lay_treads( rail_piece const &Whole, std::vector<rail_t
part.capfrom = ( k == 1 && Whole.capfrom );
part.capto = ( k + 1 == splits.size() && Whole.capto );
auto const *tread { tread_at( Treads, 0.5 * ( part.from + part.to ) ) };
if( tread != nullptr && m_topfirst < m_toplast ) {
if( tread != nullptr && m_topfirst < m_toplast && tread->edge.empty() ) {
plain( part, *tread, ends );
}
else if( tread != nullptr && m_topfirst < m_toplast ) {
treaded( part, *tread, ends );
}
else {
@@ -717,7 +723,7 @@ void TTrack::rail_layer::lay_cuts( gfx::vertex_array const &Shape, std::vector<r
for( std::size_t k = 1; k < splits.size(); ++k ) {
auto const *tread { tread_at( active, 0.5 * ( splits[ k - 1 ] + splits[ k ] ) ) };
rail_piece const whole {
.material = tread_material( tread ),
.material = ( tread != nullptr && treads_marked() ? paint( tread->material, plain_mark ) : tread_material( tread ) ),
.from = splits[ k - 1 ],
.to = splits[ k ],
.offsets = pieceoffsets,
@@ -946,6 +952,17 @@ void TTrack::rail_layer::running( rail_piece const &Whole, knots::line const &Ro
Ends );
}
void TTrack::rail_layer::plain( rail_piece Whole, rail_tread const &Tread, piece_ends const &Ends ) {
Whole.material = null_handle;
auto const top { lay_sides( Whole, Ends ) };
Whole.material = ( treads_marked() ? paint( Tread.material, plain_mark ) : Tread.material );
Whole.capfrom = false;
Whole.capto = false;
Whole.rolled = true;
piece( top, Whole, Ends );
}
void TTrack::rail_layer::treaded( rail_piece Whole, rail_tread const &Tread, piece_ends const &Ends ) {
Whole.material = null_handle;