eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 19:29:19 +02:00
Code Issues 123 Wiki Activity

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2019-09-07 02:25:43 +02:00
parent ffec1e3f37 68a45db21a
commit 6190060b1a
31 changed files with 6383 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
driveruipanels.cpp
View File

@@ -20,6 +20,7 @@ http://mozilla.org/MPL/2.0/.
#include "Camera.h"
#include "mtable.h"
#include "Train.h"
#include "Button.h"
#include "Driver.h"
#include "AnimModel.h"
#include "DynObj.h"
@@ -135,12 +136,14 @@ drivingaid_panel::update() {
}
}
}
std::string textline =
( true == TestFlag( mover->SecuritySystem.Status, s_aware ) ?
std::string textline = (
( ( true == TestFlag( mover->SecuritySystem.Status, s_aware ) )
&& ( train != nullptr )
&& ( train->fBlinkTimer > 0 ) ) ?
locale::strings[ locale::string::driver_aid_alerter ] :
" " );
textline +=
( true == TestFlag( mover->SecuritySystem.Status, s_active ) ?
textline += (
( true == TestFlag( mover->SecuritySystem.Status, s_active ) ) ?
locale::strings[ locale::string::driver_aid_shp ] :
" " );
@@ -963,6 +966,13 @@ debug_panel::update_section_scenario( std::vector<text_line> &Output ) {
textline = "Cloud cover: " + to_string( Global.Overcast, 3 );
textline += "\nLight level: " + to_string( Global.fLuminance, 3 );
if( Global.FakeLight ) { textline += "(*)"; }
textline +=
"\nWind: azimuth "
+ to_string( simulation::Environment.wind_azimuth(), 0 ) // ma być azymut, czyli 0 na północy i rośnie na wschód
+ " "
+ std::string( "N NEE SES SWW NW" )
.substr( 0 + 2 * std::floor( std::fmod( 8 + ( glm::radians( simulation::Environment.wind_azimuth() ) + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 )
+ ", " + to_string( glm::length( simulation::Environment.wind() ), 1 ) + " m/s";
textline += "\nAir temperature: " + to_string( Global.AirTemperature, 1 ) + " deg C";
Output.emplace_back( textline, Global.UITextColor );