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

Merge branch 'tmj-dev' into nogfx

Browse Source
This commit is contained in:
milek7
2017-08-21 13:16:36 +02:00
parent 5104d7f4fd 318dd9a0fe
commit 2829a8430c
13 changed files with 757 additions and 922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Globals.cpp
View File

@@ -86,6 +86,7 @@ int Global::DynamicLightCount = 7;
bool Global::ScaleSpecularValues = false;
float Global::BaseDrawRange { 2500.f };
bool Global::RenderShadows { false };
bool Global::BasicRenderer { false };
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
@@ -541,6 +542,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();
@@ -1301,7 +1309,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)