Revert "Merge pull request #9151 from hyperlogic/bug-fix/reset-sensor-in-desktop-mode"

This reverts commit 119653bceb616479ed5499077cd119928a2a4b20, reversing changes made to a69d77ffbe4f31edbc720515f0f37af459e6f134.

Anthony J. Thibault committed 9 years ago

Commit e8b5b561 parent 119653b3 files · +4 −8Browse files

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

Unified · Split

@@ -4733,13 +4733,13 @@ void Application::renderRearViewMirror(RenderArgs* renderArgs, const QRect& regi · 4732 unmodified lines
4733	renderArgs->_viewport = originalViewport;	4733	renderArgs->_viewport = originalViewport;
4734	}	4734	}
4735		4735
4736	void Application::resetSensors(bool andRecenter) {	4736	void Application::resetSensors(bool andReload) {
4737	DependencyManager::get<Faceshift>()->reset();	4737	DependencyManager::get<Faceshift>()->reset();
4738	DependencyManager::get<DdeFaceTracker>()->reset();	4738	DependencyManager::get<DdeFaceTracker>()->reset();
4739	DependencyManager::get<EyeTracker>()->reset();	4739	DependencyManager::get<EyeTracker>()->reset();
4740	getActiveDisplayPlugin()->resetSensors();	4740	getActiveDisplayPlugin()->resetSensors();
4741	_overlayConductor.centerUI();	4741	_overlayConductor.centerUI();
4742	getMyAvatar()->reset(andRecenter);	4742	getMyAvatar()->reset(andReload);
4743	QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "reset", Qt::QueuedConnection);	4743	QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "reset", Qt::QueuedConnection);
4744	}	4744	}
4745		4745