Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 20:55:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make OpenVR windows only for now

Browse source
This commit is contained in:
Bradley Austin Davis 2015-07-27 09:45:15 -04:00
parent 6d8adbf2b5
commit ba9bd6b9b5
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/input-plugins/CMakeLists.txt
View file

@ -21,10 +21,12 @@ add_dependency_external_projects(glm)
find_package(GLM REQUIRED) find_package(GLM REQUIRED)
target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS}) target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
add_dependency_external_projects(OpenVR) if (WIN32)
find_package(OpenVR REQUIRED) add_dependency_external_projects(OpenVR)
target_include_directories(${TARGET_NAME} PRIVATE ${OPENVR_INCLUDE_DIRS}) find_package(OpenVR REQUIRED)
target_link_libraries(${TARGET_NAME} ${OPENVR_LIBRARIES}) target_include_directories(${TARGET_NAME} PRIVATE ${OPENVR_INCLUDE_DIRS})
target_link_libraries(${TARGET_NAME} ${OPENVR_LIBRARIES})
endif()
#add_dependency_external_projects(Sixense) #add_dependency_external_projects(Sixense)
#find_package(Sixense REQUIRED) #find_package(Sixense REQUIRED)

10
libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
View file

@ -22,7 +22,7 @@
#include <plugins/PluginContainer.h> #include <plugins/PluginContainer.h>
#include "UserActivityLogger.h" #include "UserActivityLogger.h"
#ifndef Q_OS_MAC #ifdef Q_OS_WIN
extern vr::IVRSystem* _hmd; extern vr::IVRSystem* _hmd;
extern int hmdRefCount; extern int hmdRefCount;
extern vr::TrackedDevicePose_t _trackedDevicePose[vr::k_unMaxTrackedDeviceCount]; extern vr::TrackedDevicePose_t _trackedDevicePose[vr::k_unMaxTrackedDeviceCount];
@ -64,7 +64,7 @@ ViveControllerManager::ViveControllerManager() :
} }
bool ViveControllerManager::isSupported() const { bool ViveControllerManager::isSupported() const {
#ifndef Q_OS_MAC #ifdef Q_OS_WIN
return vr::VR_IsHmdPresent(); return vr::VR_IsHmdPresent();
#else #else
return false; return false;
@ -72,7 +72,7 @@ bool ViveControllerManager::isSupported() const {
} }
void ViveControllerManager::activate(PluginContainer* container) { void ViveControllerManager::activate(PluginContainer* container) {
#ifndef Q_OS_MAC #ifdef Q_OS_WIN
container->addMenu(MENU_PATH); container->addMenu(MENU_PATH);
container->addMenuItem(MENU_PATH, RENDER_CONTROLLERS, container->addMenuItem(MENU_PATH, RENDER_CONTROLLERS,
[this] (bool clicked) { this->setRenderControllers(clicked); }, [this] (bool clicked) { this->setRenderControllers(clicked); },
@ -136,7 +136,7 @@ void ViveControllerManager::activate(PluginContainer* container) {
} }
void ViveControllerManager::deactivate(PluginContainer* container) { void ViveControllerManager::deactivate(PluginContainer* container) {
#ifndef Q_OS_MAC #ifdef Q_OS_WIN
container->removeMenuItem(MENU_NAME, RENDER_CONTROLLERS); container->removeMenuItem(MENU_NAME, RENDER_CONTROLLERS);
container->removeMenu(MENU_PATH); container->removeMenu(MENU_PATH);
@ -213,7 +213,7 @@ void ViveControllerManager::renderHand(UserInputMapper::PoseValue pose, gpu::Bat
} }
void ViveControllerManager::update(float deltaTime, bool jointsCaptured) { void ViveControllerManager::update(float deltaTime, bool jointsCaptured) {
#ifndef Q_OS_MAC #ifdef Q_OS_WIN
_poseStateMap.clear(); _poseStateMap.clear();
// TODO: This shouldn't be necessary // TODO: This shouldn't be necessary