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

openvr WIP

This commit is contained in:
milek7
2020-09-29 22:27:13 +02:00
parent ffa01f8e6d
commit 936effa9db
21 changed files with 693 additions and 65 deletions

View File

@@ -943,7 +943,7 @@ global_settings::ConfigParse(cParser &Parser) {
extra_viewports.push_back(conf);
if (gl::vao::use_vao && conf.monitor != "MAIN") {
gl::vao::use_vao = false;
WriteLog("using multiple viewports, disabling vao!");
WriteLog("using multiple windows, disabling vao!");
}
}
else if (token == "map.highlightdistance") {
@@ -968,6 +968,14 @@ global_settings::ConfigParse(cParser &Parser) {
Parser >> headtrack_conf.rot_axes[0] >> headtrack_conf.rot_axes[1] >> headtrack_conf.rot_axes[2];
Parser >> headtrack_conf.rot_mul[0] >> headtrack_conf.rot_mul[1] >> headtrack_conf.rot_mul[2];
}
else if (token == "vr.enabled") {
Parser.getTokens(1);
Parser >> vr;
}
else if (token == "vr.backend") {
Parser.getTokens(1);
Parser >> vr_backend;
}
} while ((token != "") && (token != "endconfig")); //(!Parser->EndOfFile)
// na koniec trochę zależności
if (!bLoadTraction) // wczytywanie drutów i słupów
@@ -975,6 +983,10 @@ global_settings::ConfigParse(cParser &Parser) {
bEnableTraction = false; // false = pantograf się nie połamie
bLiveTraction = false; // false = pantografy zawsze zbierają 95% MaxVoltage
}
if (vr) {
gfx_skippipeline = false;
VSync = false;
}
/*
fFpsMin = fFpsAverage -
fFpsDeviation; // dolna granica FPS, przy której promień scenerii będzie zmniejszany