Merge pull request #712 from overte-org/fix/no_vr

Revert Merge pull request #705
overte-org · Nov 8, 2023 · 8dfc9a9 · 8dfc9a9
2 parents 95b6e03 + 438893a
commit 8dfc9a9
Showing 1 changed file with 13 additions and 16 deletions.
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
@@ -763,7 +763,19 @@ bool setupEssentials(int& argc, char** argv, const QCommandLineParser& parser, b
         }
     }
 
-
+    // Tell the plugin manager about our statically linked plugins
+    DependencyManager::set<ScriptInitializers>();
+    DependencyManager::set<PluginManager>();
+    auto pluginManager = PluginManager::getInstance();
+    pluginManager->setInputPluginProvider([] { return getInputPlugins(); });
+    pluginManager->setDisplayPluginProvider([] { return getDisplayPlugins(); });
+    pluginManager->setInputPluginSettingsPersister([](const InputPluginList& plugins) { saveInputPluginSettings(plugins); });
+    if (auto steamClient = pluginManager->getSteamClientPlugin()) {
+        steamClient->init();
+    }
+    if (auto oculusPlatform = pluginManager->getOculusPlatformPlugin()) {
+        oculusPlatform->init();
+    }
 
     PROFILE_SET_THREAD_NAME("Main Thread");
 
@@ -8751,21 +8763,6 @@ void Application::sendLambdaEvent(const std::function<void()>& f) {
 }
 
 void Application::initPlugins(const QCommandLineParser& parser) {
-    // Tell the plugin manager about our statically linked plugins
-    DependencyManager::set<ScriptInitializers>();
-    DependencyManager::set<PluginManager>();
-    auto pluginManager = PluginManager::getInstance();
-    pluginManager->setInputPluginProvider([] { return getInputPlugins(); });
-    pluginManager->setDisplayPluginProvider([] { return getDisplayPlugins(); });
-    pluginManager->setInputPluginSettingsPersister([](const InputPluginList& plugins) { saveInputPluginSettings(plugins); });
-    if (auto steamClient = pluginManager->getSteamClientPlugin()) {
-        steamClient->init();
-    }
-    if (auto oculusPlatform = pluginManager->getOculusPlatformPlugin()) {
-        oculusPlatform->init();
-    }
-
-
     if (parser.isSet("display")) {
         auto preferredDisplays = parser.value("display").split(',', Qt::SkipEmptyParts);
         qInfo() << "Setting prefered display plugins:" << preferredDisplays;