Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 01:39:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14630 from jherico/fix/20284_master

Browse source 
Fix for Oculus reset view issue
This commit is contained in:
Adam Smith 2018-12-28 16:24:40 -08:00 committed by GitHub
commit 833ad936c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -6691,6 +6691,7 @@ void Application::resetSensors(bool andReload) {
DependencyManager::get<DdeFaceTracker>()->reset(); DependencyManager::get<DdeFaceTracker>()->reset();
DependencyManager::get<EyeTracker>()->reset(); DependencyManager::get<EyeTracker>()->reset();
_overlayConductor.centerUI(); _overlayConductor.centerUI();
getActiveDisplayPlugin()->resetSensors();
getMyAvatar()->reset(true, andReload); getMyAvatar()->reset(true, andReload);
QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "reset", Qt::QueuedConnection); QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "reset", Qt::QueuedConnection);
} }

2
interface/src/Application.h
View file

@ -120,7 +120,7 @@ class Application : public QApplication,
public: public:
// virtual functions required for PluginContainer // virtual functions required for PluginContainer
virtual ui::Menu* getPrimaryMenu() override; virtual ui::Menu* getPrimaryMenu() override;
virtual void requestReset() override { resetSensors(true); } virtual void requestReset() override { resetSensors(false); }
virtual void showDisplayPluginsTools(bool show) override; virtual void showDisplayPluginsTools(bool show) override;
virtual GLWidget* getPrimaryWidget() override; virtual GLWidget* getPrimaryWidget() override;
virtual MainWindow* getPrimaryWindow() override; virtual MainWindow* getPrimaryWindow() override;