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
120#include <plugins/PluginManager.h>120#include <plugins/PluginManager.h>
121#include <plugins/PluginUtils.h>121#include <plugins/PluginUtils.h>
122#include <plugins/SteamClientPlugin.h>122#include <plugins/SteamClientPlugin.h>
123#include <plugins/OculusPlatformPlugin.h>
123#include <plugins/InputConfiguration.h>124#include <plugins/InputConfiguration.h>
124#include <RecordingScriptingInterface.h>125#include <RecordingScriptingInterface.h>
125#include <render/EngineStats.h>126#include <render/EngineStats.h>
@@ -800,7 +801,6 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 674 unmodified lines
800 if (auto steamClient = pluginManager->getSteamClientPlugin()) {801 if (auto steamClient = pluginManager->getSteamClientPlugin()) {
801 steamClient->init();802 steamClient->init();
802 }803 }
803
804 PROFILE_SET_THREAD_NAME("Main Thread");804 PROFILE_SET_THREAD_NAME("Main Thread");
805 805
806#if defined(Q_OS_WIN)806#if defined(Q_OS_WIN)
@@ -2737,6 +2737,7 @@ Application::~Application() { · 1930 unmodified lines
2737 if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {2737 if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
2738 steamClient->shutdown();2738 steamClient->shutdown();
2739 }2739 }
2740
2740 DependencyManager::destroy<PluginManager>();2741 DependencyManager::destroy<PluginManager>();
2741 2742
2742 DependencyManager::destroy<CompositorHelper>(); // must be destroyed before the FramebufferCache2743 DependencyManager::destroy<CompositorHelper>(); // must be destroyed before the FramebufferCache
@@ -4873,6 +4874,10 @@ void Application::idle() { · 2130 unmodified lines
4873 steamClient->runCallbacks();4874 steamClient->runCallbacks();
4874 }4875 }
4875 4876
4877 if (auto oculusPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) {
4878 oculusPlugin->handleOVREvents();
4879 }
4880
4876 float secondsSinceLastUpdate = (float)_lastTimeUpdated.nsecsElapsed() / NSECS_PER_MSEC / MSECS_PER_SECOND;4881 float secondsSinceLastUpdate = (float)_lastTimeUpdated.nsecsElapsed() / NSECS_PER_MSEC / MSECS_PER_SECOND;
4877 _lastTimeUpdated.start();4882 _lastTimeUpdated.start();
4878 4883