diff --git a/Track.cpp b/Track.cpp index 5e6a28df..759a9902 100644 --- a/Track.cpp +++ b/Track.cpp @@ -2604,7 +2604,9 @@ void TTrack::create_track_rail_profile( gfx::vertex_array &Right, gfx::vertex_array &Left ) { auto const fHTW { 0.5f * std::abs( fTrackWidth ) }; - + float const fHTW2{((iTrapezoid & 2) != 0 ? // ten bit oznacza, że istnieje odpowiednie pNext + 0.5f * std::fabs(trNext->fTrackWidth) : // połowa rozstawu/nawierzchni + fHTW)}; float roll1{ 0.f }, roll2{ 0.f }; @@ -2660,8 +2662,8 @@ TTrack::create_track_rail_profile( gfx::vertex_array &Right, gfx::vertex_array & // trapez albo przechyłki, to oddzielne punkty na końcu Right[ pointcount + i ] = { // position - {( fHTW + szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, - -( fHTW + szyna[ i ].position.x ) * sin2 + szyna[ i ].position.y * cos2, + {( fHTW2 + szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, + -( fHTW2 + szyna[ i ].position.x ) * sin2 + szyna[ i ].position.y * cos2, szyna[ i ].position.z}, // normal { szyna[ i ].normal.x * cos2 + szyna[ i ].normal.y * sin2, @@ -2673,8 +2675,8 @@ TTrack::create_track_rail_profile( gfx::vertex_array &Right, gfx::vertex_array & Left[ pointcount * 2 - 1 - i ] = { // position - {(-fHTW - szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, - -(-fHTW - szyna[ i ].position.x ) * sin2 + szyna[ i ].position.y * cos2, + {(-fHTW2 - szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, + -(-fHTW2 - szyna[ i ].position.x ) * sin2 + szyna[ i ].position.y * cos2, szyna[ i ].position.z}, // normal {-szyna[ i ].normal.x * cos2 + szyna[ i ].normal.y * sin2, diff --git a/parser.cpp b/parser.cpp index f5965e69..19acbfa1 100644 --- a/parser.cpp +++ b/parser.cpp @@ -254,7 +254,7 @@ std::string cParser::readToken( bool ToLower, const char *Break ) { if (false == contains(includefile, "_ter.scm")) { if (Global.ParserLogIncludes) - WriteLog("including: " + includefile); + //WriteLog("including: " + includefile); mIncludeParser = std::make_shared( includefile, buffer_FILE, mPath, LoadTraction, readParameters( *this ) ); mIncludeParser->allowRandomIncludes = allowRandomIncludes; mIncludeParser->autoclear( m_autoclear ); @@ -302,7 +302,7 @@ std::string cParser::readToken( bool ToLower, const char *Break ) { if (false == contains(includefile, "_ter.scm")) { if (Global.ParserLogIncludes) - WriteLog("including: " + includefile); + //WriteLog("including: " + includefile); mIncludeParser = std::make_shared( includefile, buffer_FILE, mPath, LoadTraction, readParameters(includeparser)); mIncludeParser->allowRandomIncludes = allowRandomIncludes;