mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-02-19 11:29:08 -06:00
Added configuration file bypass launcher key option
This commit is contained in:
@@ -1168,7 +1168,7 @@ int main(int argc, char** argv) {
|
||||
QApplication* qaobj = nullptr;
|
||||
LauncherWindow* launchwin = nullptr;
|
||||
bool skipLauncherSinceProfileAndWindowAreConfiguredInCli =
|
||||
(haveCliProfile && haveCliSGCTConfig);
|
||||
(haveCliProfile && haveCliSGCTConfig) || global::configuration.bypassLauncher;
|
||||
|
||||
if (!skipLauncherSinceProfileAndWindowAreConfiguredInCli) {
|
||||
int qac = 0;
|
||||
|
||||
@@ -94,6 +94,7 @@ struct Configuration {
|
||||
glm::dvec3 masterRotation = glm::dvec3(0.0);
|
||||
bool isConsoleDisabled = false;
|
||||
bool usingProfile = false;
|
||||
bool bypassLauncher = false;
|
||||
|
||||
std::map<std::string, ghoul::Dictionary> moduleConfigurations;
|
||||
|
||||
|
||||
@@ -244,3 +244,4 @@ OpenGLDebugContext = {
|
||||
-- FilterSeverity = { }
|
||||
}
|
||||
--RenderingMethod = "ABuffer" -- alternative: "Framebuffer"
|
||||
BypassLauncher = false
|
||||
|
||||
@@ -92,6 +92,7 @@ namespace {
|
||||
|
||||
constexpr const char* KeySgctConfigNameInitialized = "sgctconfiginitializeString";
|
||||
constexpr const char* KeyReadOnlyProfiles = "ProfilesReadOnly";
|
||||
constexpr const char* KeyBypassLauncher = "BypassLauncher";
|
||||
|
||||
template <typename T>
|
||||
void getValue(ghoul::lua::LuaState& L, const char* name, T& value) {
|
||||
@@ -310,6 +311,7 @@ void parseLuaState(Configuration& configuration) {
|
||||
|
||||
getValue(s, KeySgctConfigNameInitialized, c.sgctConfigNameInitialized);
|
||||
getValue(s, KeyReadOnlyProfiles, c.profilesReadOnly);
|
||||
getValue(s, KeyBypassLauncher, c.bypassLauncher);
|
||||
}
|
||||
|
||||
std::string findConfiguration(const std::string& filename) {
|
||||
|
||||
Reference in New Issue
Block a user