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

Merge branch 'gfx-work' into udpnetwork

Browse Source
This commit is contained in:
milek7
2019-01-29 23:49:29 +01:00
parent ec34720ad6 bc445893a2
commit 7b17cc4242
5 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Globals.cpp
View File

@@ -386,7 +386,8 @@ global_settings::ConfigParse(cParser &Parser) {
{
// przyspieszenie czasu, zmienna do testów
Parser.getTokens(1, false);
Parser >> fTimeSpeed;
Parser >> default_timespeed;
fTimeSpeed = default_timespeed;
}
else if (token == "multisampling")
{
@@ -698,6 +699,13 @@ global_settings::ConfigParse(cParser &Parser) {
Parser.getTokens(1);
Parser >> gfx_shadowmap_enabled;
}
else if (token == "fpslimit")
{
Parser.getTokens(1);
float fpslimit;
Parser >> fpslimit;
minframetime = std::chrono::duration<float>(1.0f / fpslimit);
}
else if (token == "gfx.envmap.enabled")
{
Parser.getTokens(1);