eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 03:09:18 +02:00
Code Issues 121 Wiki Activity

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2018-06-30 18:45:58 +02:00
parent 76bb4be325 30e31cdfd0
commit dc584c140e
37 changed files with 672 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Track.cpp
View File

@@ -924,6 +924,25 @@ bool TTrack::AssignForcedEvents(TEvent *NewEventPlus, TEvent *NewEventMinus)
return false;
};
void TTrack::QueueEvents( event_sequence const &Events, TDynamicObject const *Owner ) {
for( auto const &event : Events ) {
if( event.second != nullptr ) {
simulation::Events.AddToQuery( event.second, Owner );
}
}
}
void TTrack::QueueEvents( event_sequence const &Events, TDynamicObject const *Owner, double const Delaylimit ) {
for( auto const &event : Events ) {
if( ( event.second != nullptr )
&& ( event.second->fDelay <= Delaylimit) ) {
simulation::Events.AddToQuery( event.second, Owner );
}
}
}
std::string TTrack::IsolatedName()
{ // podaje nazwę odcinka izolowanego, jesli nie ma on jeszcze przypisanych zdarzeń
if (pIsolated)
@@ -1191,7 +1210,7 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) {
{ szyna[ i ].texture.x,
szyna[ i ].texture.y } };
if( false == iTrapezoid ) { continue; }
if( iTrapezoid == 0 ) { continue; }
// trapez albo przechyłki, to oddzielne punkty na końcu
rpts1[ 12 + i ] = {