eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 20:39:18 +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

24
Globals.cpp
View File

@@ -179,12 +179,6 @@ global_settings::ConfigParse(cParser &Parser) {
Parser.getTokens();
Parser >> DisabledLogTypes;
}
else if( token == "adjustscreenfreq" )
{
// McZapkie-240403 - czestotliwosc odswiezania ekranu
Parser.getTokens();
Parser >> bAdjustScreenFreq;
}
else if (token == "mousescale")
{
// McZapkie-060503 - czulosc ruchu myszy (krecenia glowa)
@@ -375,6 +369,18 @@ global_settings::ConfigParse(cParser &Parser) {
Parser.getTokens();
Parser >> RenderCabShadowsRange;
}
else if( token == "gfx.smoke" ) {
// smoke visualization toggle
Parser.getTokens();
Parser >> Smoke;
}
else if( token == "gfx.smoke.fidelity" ) {
// smoke visualization fidelity
float smokefidelity;
Parser.getTokens();
Parser >> smokefidelity;
SmokeFidelity = clamp( smokefidelity, 1.f, 4.f );
}
else if (token == "smoothtraction")
{
// podwójna jasność ambient
@@ -668,7 +674,7 @@ global_settings::ConfigParse(cParser &Parser) {
>> uart_conf.updatetime;
}
else if( token == "uarttune" ) {
Parser.getTokens( 14 );
Parser.getTokens( 16 );
Parser
>> uart_conf.mainbrakemin
>> uart_conf.mainbrakemax
@@ -683,7 +689,9 @@ global_settings::ConfigParse(cParser &Parser) {
>> uart_conf.hvmax
>> uart_conf.hvuart
>> uart_conf.currentmax
>> uart_conf.currentuart;
>> uart_conf.currentuart
>> uart_conf.lvmax
>> uart_conf.lvuart;
}
else if( token == "uartfeature" ) {
Parser.getTokens( 4 );