16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 14:49:19 +02:00

build 170820. tweaks and fixes to car detection, proximity scanning, car handling; support for basic diffuse-only gfx renderer mode

This commit is contained in:
tmj-fstate
2017-08-21 01:29:01 +02:00
parent 4ee618a3c1
commit 318dd9a0fe
12 changed files with 743 additions and 914 deletions

View File

@@ -86,7 +86,8 @@ float Global::BaseDrawRange { 2500.f };
opengl_light Global::DayLight;
int Global::DynamicLightCount { 3 };
bool Global::ScaleSpecularValues { true };
bool Global::RenderShadows { false };
bool Global::BasicRenderer { false };
bool Global::RenderShadows { true };
Global::shadowtune_t Global::shadowtune = { 2048, 250.f, 250.f, 500.f };
bool Global::bRollFix = true; // czy wykonać przeliczanie przechyłki
bool Global::bJoinEvents = false; // czy grupować eventy o tych samych nazwach
@@ -545,6 +546,13 @@ void Global::ConfigParse(cParser &Parser)
Parser.getTokens();
Parser >> Global::ScaleSpecularValues;
}
else if( token == "gfxrenderer" ) {
// shadow render toggle
std::string gfxrenderer;
Parser.getTokens();
Parser >> gfxrenderer;
Global::BasicRenderer = ( gfxrenderer == "simple" );
}
else if( token == "shadows" ) {
// shadow render toggle
Parser.getTokens();
@@ -1304,7 +1312,7 @@ double Global::Min0RSpeed(double vel1, double vel2)
{
vel2 = std::numeric_limits<double>::max();
}
return Min0R(vel1, vel2);
return std::min(vel1, vel2);
};
double Global::CutValueToRange(double min, double value, double max)