eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'milek-dev' into gfx-work

Browse Source
This commit is contained in:
milek7
2018-10-12 18:51:12 +02:00
parent 570990e2a1 2a00d52525
commit b7a61071ba
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Driver.cpp
View File

@@ -499,6 +499,10 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle)
tLast = nullptr; //żaden nie sprawdzony
SemNextIndex = -1;
SemNextStopIndex = -1;
if( VelSignalLast == 0.0 ) {
// don't allow potential red light overrun keep us from reversing
VelSignalLast = -1.0;
}
fTrackLength = pTrack->Length(); //skasowanie zmian w zmiennej żeby poprawnie liczyło w dalszych krokach
MoveDistanceReset(); // AI startuje 1s po zaczęciu jazdy i mógł już coś przejechać
}

8
Traction.cpp
View File

@@ -287,14 +287,12 @@ TTraction::create_geometry( gfx::geometrybank_handle const &Bank ) {
// Przewody pionowe (wieszaki) 'Marcin, poprawki na 2 przewody jezdne 'Winger
if( Wires > 1 ) {
auto const flo { static_cast<float>( Wires == 4 ? 0.25f * fHeightDifference : 0 ) };
auto const flo1 { static_cast<float>( Wires == 4 ? +0.05 : 0 ) };
for( int i = 0; i < iNumSections - 1; ++i ) {
float flo, flo1;
flo = ( Wires == 4 ? 0.25f * fHeightDifference : 0 );
flo1 = ( Wires == 4 ? +0.05 : 0 );
pt3 = pPoint3 + v1 * f;
pt4 = pPoint1 + v2 * f;
t = ( 1 - std::fabs( f - mid ) * 2 );
if( ( i % 2 ) == 0 ) {
startvertex.position =
glm::vec3(
@@ -319,7 +317,7 @@ TTraction::create_geometry( gfx::geometrybank_handle const &Bank ) {
glm::vec3(
pt4.x + ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - m_origin.x,
pt4.y - m_origin.y,
pt4.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - m_origin.z );
pt4.z + ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - m_origin.z );
vertices.emplace_back( startvertex );
vertices.emplace_back( endvertex );
}

2
material.cpp
View File

@@ -182,7 +182,7 @@ opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool c
// seasonal textures override generic textures
// skip the opening bracket
auto const value { Input.getToken<std::string>( true, "\n\r\t ;" ) };
while( true == deserialize_mapping( Input, 1, Loadnow ) ) {
while( true == deserialize_mapping( Input, Priority + 1, Loadnow ) ) {
; // all work is done in the header
}
}

2
version.h
View File

@@ -1 +1 @@
#define VERSION_INFO "M7 (GL3) 11.10.2018, based on master-c0d3cfda, tmj-67211a43"
#define VERSION_INFO "M7 (GL3) 12.10.2018, based on milek-2a00d525, tmj-44b652c"