History

Merge pull request #14727 from wayne-chen/oculusLoginFeature

Jeff Clinton committed 7 years ago

Commit f78fdff2 parents 17b8f65 1c6521430 files · +983 −215Browse files

Showing the changes to interface/src/Application.cpp (1 of 30 files). Show all

Unified · Split

interface/src/Application.cpp+6−1
@@ -120,6 +120,7 @@ · 119 unmodified lines
120120 #include <plugins/PluginManager.h>
121121 #include <plugins/PluginUtils.h>
122122 #include <plugins/SteamClientPlugin.h>
123+#include <plugins/OculusPlatformPlugin.h>
123124 #include <plugins/InputConfiguration.h>
124125 #include <RecordingScriptingInterface.h>
125126 #include <render/EngineStats.h>
@@ -800,7 +801,6 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 674 unmodified lines
800801 if (auto steamClient = pluginManager->getSteamClientPlugin()) {
801802 steamClient->init();
802803 }
803−
804804 PROFILE_SET_THREAD_NAME("Main Thread");
805805
806806 #if defined(Q_OS_WIN)
@@ -2737,6 +2737,7 @@ Application::~Application() { · 1930 unmodified lines
27372737 if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
27382738 steamClient->shutdown();
27392739 }
2740+
27402741 DependencyManager::destroy<PluginManager>();
27412742
27422743 DependencyManager::destroy<CompositorHelper>(); // must be destroyed before the FramebufferCache
@@ -4873,6 +4874,10 @@ void Application::idle() { · 2130 unmodified lines
48734874 steamClient->runCallbacks();
48744875 }
48754876
4877+ if (auto oculusPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) {
4878+ oculusPlugin->handleOVREvents();
4879+ }
4880+
48764881 float secondsSinceLastUpdate = (float)_lastTimeUpdated.nsecsElapsed() / NSECS_PER_MSEC / MSECS_PER_SECOND;
48774882 _lastTimeUpdated.start();
48784883