Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 06:59:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

saving work

Browse source
This commit is contained in:
Dante Ruiz 2017-06-30 19:07:34 +01:00
parent 3a096381ce
commit 3e1aee4d8a
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
plugins/openvr/src/ViveControllerManager.cpp
View file

@ -28,6 +28,8 @@
#include <GLMHelpers.h> #include <GLMHelpers.h>
#include <glm/ext.hpp> #include <glm/ext.hpp>
#include <glm/gtc/quaternion.hpp> #include <glm/gtc/quaternion.hpp>
#include <ui-plugins/PluginContainer.h>
#include <plugins/DisplayPlugin.h>
#include <controllers/UserInputMapper.h> #include <controllers/UserInputMapper.h>
#include <Plugins/InputConfiguration.h> #include <Plugins/InputConfiguration.h>
@ -121,6 +123,13 @@ static QString deviceTrackingResultToString(vr::ETrackingResult trackingResult)
return result; return result;
} }
bool ViveControllerManager::isDesktopMode() {
if (_container) {
return !_container->getActiveDisplayPlugin()->isHmd();
}
return false;
}
void ViveControllerManager::calibrate() { void ViveControllerManager::calibrate() {
if (isSupported()) { if (isSupported()) {
_inputDevice->calibrateNextFrame(); _inputDevice->calibrateNextFrame();
@ -218,6 +227,10 @@ void ViveControllerManager::pluginUpdate(float deltaTime, const controller::Inpu
return; return;
} }
if (isDesktopMode()) {
qDebug() << "In desktop mode";
}
auto userInputMapper = DependencyManager::get<controller::UserInputMapper>(); auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
handleOpenVrEvents(); handleOpenVrEvents();
if (openVrQuitRequested()) { if (openVrQuitRequested()) {

2
plugins/openvr/src/ViveControllerManager.h
View file

@ -189,7 +189,7 @@ private:
}; };
void renderHand(const controller::Pose& pose, gpu::Batch& batch, int sign); void renderHand(const controller::Pose& pose, gpu::Batch& batch, int sign);
bool isDesktopMode();
bool _registeredWithInputMapper { false }; bool _registeredWithInputMapper { false };
bool _modelLoaded { false }; bool _modelLoaded { false };
model::Geometry _modelGeometry; model::Geometry _modelGeometry;