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

multi viewports (temporaily disable VAO)

This commit is contained in:
milek7
2019-03-12 00:53:34 +01:00
parent 3693c1660e
commit e85d588851
14 changed files with 314 additions and 173 deletions

View File

@@ -833,6 +833,17 @@ global_settings::ConfigParse(cParser &Parser) {
Parser >> network_client->first;
Parser >> network_client->second;
}
else if (token == "extraviewport")
{
Parser.getTokens(3 + 16, false);
extraviewport_config conf;
Parser >> conf.monitor >> conf.width >> conf.height;
for (size_t i = 0; i < 16; i++)
Parser >> conf.transform[i / 4][i % 4];
extra_viewports.push_back(conf);
}
} while ((token != "") && (token != "endconfig")); //(!Parser->EndOfFile)
// na koniec trochę zależności
if (!bLoadTraction) // wczytywanie drutów i słupów