From 9cf0d6c8512a4249251a63f88d71ed2f0c4413ca Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Tue, 22 Jul 2014 19:19:13 -0700 Subject: [PATCH 1/7] Fix for shadows in close-up inset mirror. --- interface/src/Application.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 8b00bface7..925f5aca3c 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2981,6 +2981,13 @@ void Application::renderRearViewMirror(const QRect& region, bool billboard) { attachment->setTranslation(attachment->getTranslation() + delta); } + // and lo, even the shadow matrices + glm::mat4 savedShadowMatrices[CASCADED_SHADOW_MATRIX_COUNT]; + for (int i = 0; i < CASCADED_SHADOW_MATRIX_COUNT; i++) { + savedShadowMatrices[i] = _shadowMatrices[i]; + _shadowMatrices[i] = glm::transpose(glm::transpose(_shadowMatrices[i]) * glm::translate(-delta)); + } + displaySide(_mirrorCamera, true); // restore absolute translations @@ -2989,6 +2996,11 @@ void Application::renderRearViewMirror(const QRect& region, bool billboard) { for (int i = 0; i < absoluteAttachmentTranslations.size(); i++) { _myAvatar->getAttachmentModels().at(i)->setTranslation(absoluteAttachmentTranslations.at(i)); } + + // restore the shadow matrices + for (int i = 0; i < CASCADED_SHADOW_MATRIX_COUNT; i++) { + _shadowMatrices[i] = savedShadowMatrices[i]; + } } else { displaySide(_mirrorCamera, true); } From b6cb19c2f6d5318a4aa42733a189d76ecf7f8563 Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Wed, 23 Jul 2014 16:55:59 +0200 Subject: [PATCH 2/7] FEATURE: Allows detecting simulated cursors in JS, this allows JS-developers to track all cursors separately. By using the deviceID. (deviceID 0 = default mouse-cursor , 1500 and 1501 hydra cursors) --- examples/multipleCursorsExample.js | 79 +++++++++++++++++++ interface/src/Application.cpp | 19 ++--- interface/src/Application.h | 10 +-- interface/src/devices/SixenseManager.cpp | 20 ++--- interface/src/devices/SixenseManager.h | 5 +- .../scripting/ControllerScriptingInterface.h | 6 +- interface/src/ui/ApplicationOverlay.cpp | 4 +- libraries/script-engine/src/EventTypes.cpp | 4 +- libraries/script-engine/src/EventTypes.h | 3 +- 9 files changed, 118 insertions(+), 32 deletions(-) create mode 100644 examples/multipleCursorsExample.js diff --git a/examples/multipleCursorsExample.js b/examples/multipleCursorsExample.js new file mode 100644 index 0000000000..3f2430d3db --- /dev/null +++ b/examples/multipleCursorsExample.js @@ -0,0 +1,79 @@ +// +// multipleCursorsExample.js +// examples +// +// Created by Thijs Wenker on 7/23/14. +// Copyright 2014 High Fidelity, Inc. +// +// This is an example script that demonstrates use of multiple cursors +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +var wantDebugging = false; + +var cursors = {}; + +function Cursor(event) { + this.deviceID = event.deviceID; + + this.held_buttons = { + LEFT: false, + MIDDLE: false, + RIGHT: false + } + this.updatePosition = function(event) { + this.x = event.x; + this.y = event.y; + }; + this.pressEvent = function(event) { + if (this.held_buttons[event.button] != undefined) { + this.held_buttons[event.button] = true; + } + }; + this.releaseEvent = function(event) { + if (this.held_buttons[event.button] != undefined) { + this.held_buttons[event.button] = false; + } + }; + this.updatePosition(event); +} + +function mousePressEvent(event) { + if (cursors[event.deviceID] == undefined) { + cursors[event.deviceID] = new Cursor(event); + } + cursors[event.deviceID].pressEvent(event); +} + +function mouseReleaseEvent(event) { + if (cursors[event.deviceID] == undefined) { + cursors[event.deviceID] = new Cursor(event); + } + cursors[event.deviceID].releaseEvent(event); +} + +function mouseMoveEvent(event) { + if (cursors[event.deviceID] == undefined) { + cursors[event.deviceID] = new Cursor(event); + } else { + cursors[event.deviceID].updatePosition(event); + } +} + +var lastOutputString = ""; +function checkCursors() { + if(lastOutputString != JSON.stringify(cursors)) { + lastOutputString = JSON.stringify(cursors); + // outputs json string of all cursors only when a change occured + print(lastOutputString); + } +} + +Script.update.connect(checkCursors); + +// Map the mouse events to our functions +Controller.mousePressEvent.connect(mousePressEvent); +Controller.mouseMoveEvent.connect(mouseMoveEvent); +Controller.mouseReleaseEvent.connect(mouseReleaseEvent); \ No newline at end of file diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index aad9c4de58..8e51d1f897 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -155,7 +155,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : _mouseX(0), _mouseY(0), _lastMouseMove(usecTimestampNow()), - _lastMouseMoveType(QEvent::MouseMove), + _lastMouseMoveWasSimulated(false), _mouseHidden(false), _seenMouseMove(false), _touchAvgX(0.0f), @@ -1141,18 +1141,19 @@ void Application::focusOutEvent(QFocusEvent* event) { _keysPressed.clear(); } -void Application::mouseMoveEvent(QMouseEvent* event) { +void Application::mouseMoveEvent(QMouseEvent* event, unsigned int deviceID) { bool showMouse = true; + + // Used by application overlay to determine how to draw cursor(s) + _lastMouseMoveWasSimulated = deviceID > 0; + // If this mouse move event is emitted by a controller, dont show the mouse cursor - if (event->type() == CONTROLLER_MOVE_EVENT) { + if (_lastMouseMoveWasSimulated) { showMouse = false; } - // Used by application overlay to determine how to draw cursor(s) - _lastMouseMoveType = event->type(); - - _controllerScriptingInterface.emitMouseMoveEvent(event); // send events to any registered scripts + _controllerScriptingInterface.emitMouseMoveEvent(event, deviceID); // send events to any registered scripts // if one of our scripts have asked to capture this event, then stop processing it if (_controllerScriptingInterface.isMouseCaptured()) { @@ -1171,7 +1172,7 @@ void Application::mouseMoveEvent(QMouseEvent* event) { _mouseY = event->y(); } -void Application::mousePressEvent(QMouseEvent* event) { +void Application::mousePressEvent(QMouseEvent* event, unsigned int deviceID) { _controllerScriptingInterface.emitMousePressEvent(event); // send events to any registered scripts // if one of our scripts have asked to capture this event, then stop processing it @@ -1204,7 +1205,7 @@ void Application::mousePressEvent(QMouseEvent* event) { } } -void Application::mouseReleaseEvent(QMouseEvent* event) { +void Application::mouseReleaseEvent(QMouseEvent* event, unsigned int deviceID) { _controllerScriptingInterface.emitMouseReleaseEvent(event); // send events to any registered scripts // if one of our scripts have asked to capture this event, then stop processing it diff --git a/interface/src/Application.h b/interface/src/Application.h index d956a949ac..0259fe3b08 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -159,9 +159,9 @@ public: void focusOutEvent(QFocusEvent* event); void focusInEvent(QFocusEvent* event); - void mouseMoveEvent(QMouseEvent* event); - void mousePressEvent(QMouseEvent* event); - void mouseReleaseEvent(QMouseEvent* event); + void mouseMoveEvent(QMouseEvent* event, unsigned int deviceID = 0); + void mousePressEvent(QMouseEvent* event, unsigned int deviceID = 0); + void mouseReleaseEvent(QMouseEvent* event, unsigned int deviceID = 0); void touchBeginEvent(QTouchEvent* event); void touchEndEvent(QTouchEvent* event); @@ -207,7 +207,7 @@ public: const glm::vec3& getMouseRayDirection() const { return _mouseRayDirection; } int getMouseX() const { return _mouseX; } int getMouseY() const { return _mouseY; } - unsigned int getLastMouseMoveType() const { return _lastMouseMoveType; } + bool getLastMouseMoveWasSimulated() const { return _lastMouseMoveWasSimulated;; } Faceplus* getFaceplus() { return &_faceplus; } Faceshift* getFaceshift() { return &_faceshift; } Visage* getVisage() { return &_visage; } @@ -507,7 +507,7 @@ private: int _mouseDragStartedX; int _mouseDragStartedY; quint64 _lastMouseMove; - unsigned int _lastMouseMoveType; + bool _lastMouseMoveWasSimulated; bool _mouseHidden; bool _seenMouseMove; diff --git a/interface/src/devices/SixenseManager.cpp b/interface/src/devices/SixenseManager.cpp index a79e2cee74..089d478198 100644 --- a/interface/src/devices/SixenseManager.cpp +++ b/interface/src/devices/SixenseManager.cpp @@ -373,6 +373,8 @@ void SixenseManager::emulateMouse(PalmData* palm, int index) { Qt::MouseButton bumperButton; Qt::MouseButton triggerButton; + unsigned int deviceID = index == 0 ? CONTROLLER_0_EVENT : CONTROLLER_1_EVENT; + if (Menu::getInstance()->getInvertSixenseButtons()) { bumperButton = Qt::LeftButton; triggerButton = Qt::RightButton; @@ -405,14 +407,14 @@ void SixenseManager::emulateMouse(PalmData* palm, int index) { if (_bumperPressed[index]) { QMouseEvent mouseEvent(QEvent::MouseButtonRelease, pos, bumperButton, bumperButton, 0); - application->mouseReleaseEvent(&mouseEvent); + application->mouseReleaseEvent(&mouseEvent, deviceID); _bumperPressed[index] = false; } if (_triggerPressed[index]) { QMouseEvent mouseEvent(QEvent::MouseButtonRelease, pos, triggerButton, triggerButton, 0); - application->mouseReleaseEvent(&mouseEvent); + application->mouseReleaseEvent(&mouseEvent, deviceID); _triggerPressed[index] = false; } @@ -421,17 +423,17 @@ void SixenseManager::emulateMouse(PalmData* palm, int index) { //If position has changed, emit a mouse move to the application if (pos.x() != _oldX[index] || pos.y() != _oldY[index]) { - QMouseEvent mouseEvent(static_cast(CONTROLLER_MOVE_EVENT), pos, Qt::NoButton, Qt::NoButton, 0); + QMouseEvent mouseEvent(QEvent::MouseMove, pos, Qt::NoButton, Qt::NoButton, 0); //Only send the mouse event if the opposite left button isnt held down. //This is specifically for edit voxels if (triggerButton == Qt::LeftButton) { if (!_triggerPressed[(int)(!index)]) { - application->mouseMoveEvent(&mouseEvent); + application->mouseMoveEvent(&mouseEvent, deviceID); } } else { if (!_bumperPressed[(int)(!index)]) { - application->mouseMoveEvent(&mouseEvent); + application->mouseMoveEvent(&mouseEvent, deviceID); } } } @@ -456,12 +458,12 @@ void SixenseManager::emulateMouse(PalmData* palm, int index) { QMouseEvent mouseEvent(QEvent::MouseButtonPress, pos, bumperButton, bumperButton, 0); - application->mousePressEvent(&mouseEvent); + application->mousePressEvent(&mouseEvent, deviceID); } } else if (_bumperPressed[index]) { QMouseEvent mouseEvent(QEvent::MouseButtonRelease, pos, bumperButton, bumperButton, 0); - application->mouseReleaseEvent(&mouseEvent); + application->mouseReleaseEvent(&mouseEvent, deviceID); _bumperPressed[index] = false; } @@ -473,12 +475,12 @@ void SixenseManager::emulateMouse(PalmData* palm, int index) { QMouseEvent mouseEvent(QEvent::MouseButtonPress, pos, triggerButton, triggerButton, 0); - application->mousePressEvent(&mouseEvent); + application->mousePressEvent(&mouseEvent, deviceID); } } else if (_triggerPressed[index]) { QMouseEvent mouseEvent(QEvent::MouseButtonRelease, pos, triggerButton, triggerButton, 0); - application->mouseReleaseEvent(&mouseEvent); + application->mouseReleaseEvent(&mouseEvent, deviceID); _triggerPressed[index] = false; } diff --git a/interface/src/devices/SixenseManager.h b/interface/src/devices/SixenseManager.h index bae9e1c6d6..91f9e9884f 100644 --- a/interface/src/devices/SixenseManager.h +++ b/interface/src/devices/SixenseManager.h @@ -27,8 +27,9 @@ const unsigned int BUTTON_3 = 1U << 3; const unsigned int BUTTON_4 = 1U << 4; const unsigned int BUTTON_FWD = 1U << 7; -// Event type that represents moving the controller -const unsigned int CONTROLLER_MOVE_EVENT = 1500U; +// Event type that represents using the controller +const unsigned int CONTROLLER_0_EVENT = 1500U; +const unsigned int CONTROLLER_1_EVENT = 1501U; const float DEFAULT_SIXENSE_RETICLE_MOVE_SPEED = 37.5f; const bool DEFAULT_INVERT_SIXENSE_MOUSE_BUTTONS = false; diff --git a/interface/src/scripting/ControllerScriptingInterface.h b/interface/src/scripting/ControllerScriptingInterface.h index cf5414554e..d980639685 100644 --- a/interface/src/scripting/ControllerScriptingInterface.h +++ b/interface/src/scripting/ControllerScriptingInterface.h @@ -57,9 +57,9 @@ public: void emitKeyPressEvent(QKeyEvent* event) { emit keyPressEvent(KeyEvent(*event)); } void emitKeyReleaseEvent(QKeyEvent* event) { emit keyReleaseEvent(KeyEvent(*event)); } - void emitMouseMoveEvent(QMouseEvent* event) { emit mouseMoveEvent(MouseEvent(*event)); } - void emitMousePressEvent(QMouseEvent* event) { emit mousePressEvent(MouseEvent(*event)); } - void emitMouseReleaseEvent(QMouseEvent* event) { emit mouseReleaseEvent(MouseEvent(*event)); } + void emitMouseMoveEvent(QMouseEvent* event, unsigned int deviceID = 0) { emit mouseMoveEvent(MouseEvent(*event, deviceID)); } + void emitMousePressEvent(QMouseEvent* event, unsigned int deviceID = 0) { emit mousePressEvent(MouseEvent(*event, deviceID)); } + void emitMouseReleaseEvent(QMouseEvent* event, unsigned int deviceID = 0) { emit mouseReleaseEvent(MouseEvent(*event, deviceID)); } void emitTouchBeginEvent(const TouchEvent& event) { emit touchBeginEvent(event); } void emitTouchEndEvent(const TouchEvent& event) { emit touchEndEvent(event); } diff --git a/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp index 89ae2fbb46..3badde4042 100644 --- a/interface/src/ui/ApplicationOverlay.cpp +++ b/interface/src/ui/ApplicationOverlay.cpp @@ -535,7 +535,7 @@ void ApplicationOverlay::renderPointers() { glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, _crosshairTexture); - if (OculusManager::isConnected() && application->getLastMouseMoveType() == QEvent::MouseMove) { + if (OculusManager::isConnected() && !application->getLastMouseMoveWasSimulated()) { //If we are in oculus, render reticle later _reticleActive[MOUSE] = true; _magActive[MOUSE] = true; @@ -546,7 +546,7 @@ void ApplicationOverlay::renderPointers() { _reticleActive[LEFT_CONTROLLER] = false; _reticleActive[RIGHT_CONTROLLER] = false; - } else if (application->getLastMouseMoveType() == CONTROLLER_MOVE_EVENT && Menu::getInstance()->isOptionChecked(MenuOption::SixenseMouseInput)) { + } else if (application->getLastMouseMoveWasSimulated() && Menu::getInstance()->isOptionChecked(MenuOption::SixenseMouseInput)) { //only render controller pointer if we aren't already rendering a mouse pointer _reticleActive[MOUSE] = false; _magActive[MOUSE] = false; diff --git a/libraries/script-engine/src/EventTypes.cpp b/libraries/script-engine/src/EventTypes.cpp index 3bd6303d02..9cf6c5b1a0 100644 --- a/libraries/script-engine/src/EventTypes.cpp +++ b/libraries/script-engine/src/EventTypes.cpp @@ -298,9 +298,10 @@ MouseEvent::MouseEvent() : }; -MouseEvent::MouseEvent(const QMouseEvent& event) : +MouseEvent::MouseEvent(const QMouseEvent& event, const unsigned int deviceID) : x(event.x()), y(event.y()), + deviceID(deviceID), isLeftButton(event.buttons().testFlag(Qt::LeftButton)), isRightButton(event.buttons().testFlag(Qt::RightButton)), isMiddleButton(event.buttons().testFlag(Qt::MiddleButton)), @@ -334,6 +335,7 @@ QScriptValue mouseEventToScriptValue(QScriptEngine* engine, const MouseEvent& ev obj.setProperty("x", event.x); obj.setProperty("y", event.y); obj.setProperty("button", event.button); + obj.setProperty("deviceID", event.deviceID); obj.setProperty("isLeftButton", event.isLeftButton); obj.setProperty("isRightButton", event.isRightButton); obj.setProperty("isMiddleButton", event.isMiddleButton); diff --git a/libraries/script-engine/src/EventTypes.h b/libraries/script-engine/src/EventTypes.h index ed7aabc3c9..7d4076dbf0 100644 --- a/libraries/script-engine/src/EventTypes.h +++ b/libraries/script-engine/src/EventTypes.h @@ -44,9 +44,10 @@ public: class MouseEvent { public: MouseEvent(); - MouseEvent(const QMouseEvent& event); + MouseEvent(const QMouseEvent& event, const unsigned int deviceID = 0); int x; int y; + unsigned int deviceID; QString button; bool isLeftButton; bool isRightButton; From e36891fdf22012466331e3d4ea4cc8d5b3b74c16 Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Wed, 23 Jul 2014 18:56:34 +0200 Subject: [PATCH 3/7] removed unused variable --- examples/multipleCursorsExample.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/multipleCursorsExample.js b/examples/multipleCursorsExample.js index 3f2430d3db..db994be2e2 100644 --- a/examples/multipleCursorsExample.js +++ b/examples/multipleCursorsExample.js @@ -11,8 +11,6 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -var wantDebugging = false; - var cursors = {}; function Cursor(event) { From 49fcd302f40ba85a20f3c4bc6fd6754d6c633229 Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Thu, 24 Jul 2014 00:16:00 +0200 Subject: [PATCH 4/7] AbstractControllerScriptingInterface matches ControllerScriptingInterface --- .../src/AbstractControllerScriptingInterface.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/script-engine/src/AbstractControllerScriptingInterface.h b/libraries/script-engine/src/AbstractControllerScriptingInterface.h index 1f58e5f5c9..78e36a3740 100644 --- a/libraries/script-engine/src/AbstractControllerScriptingInterface.h +++ b/libraries/script-engine/src/AbstractControllerScriptingInterface.h @@ -89,9 +89,9 @@ signals: void keyPressEvent(const KeyEvent& event); void keyReleaseEvent(const KeyEvent& event); - void mouseMoveEvent(const MouseEvent& event); - void mousePressEvent(const MouseEvent& event); - void mouseReleaseEvent(const MouseEvent& event); + void mouseMoveEvent(const MouseEvent& event, unsigned int deviceID = 0); + void mousePressEvent(const MouseEvent& event, unsigned int deviceID = 0); + void mouseReleaseEvent(const MouseEvent& event, unsigned int deviceID = 0); void touchBeginEvent(const TouchEvent& event); void touchEndEvent(const TouchEvent& event); From 4cf27a00993a4ba980c6408974a94563ac4cb57e Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 23 Jul 2014 17:44:38 -0700 Subject: [PATCH 5/7] check in sixense not Sixense --- interface/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index e1d93394c7..138ae02b48 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -16,7 +16,7 @@ set(FACEPLUS_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/faceplus") set(FACESHIFT_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/faceshift") set(LIBOVR_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/oculus") set(PRIOVR_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/priovr") -set(SIXENSE_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/Sixense") +set(SIXENSE_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/sixense") set(VISAGE_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/visage") set(LEAPMOTION_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/leapmotion") set(RTMIDI_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/rtmidi") From bc96975700f82f2465df4c6b9a0cce412c04c08f Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 23 Jul 2014 17:49:38 -0700 Subject: [PATCH 6/7] don't look for debug sixense on UNIX to avoid missing symbol --- cmake/modules/FindSixense.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/FindSixense.cmake b/cmake/modules/FindSixense.cmake index 9b8209ef29..829383ed0c 100644 --- a/cmake/modules/FindSixense.cmake +++ b/cmake/modules/FindSixense.cmake @@ -24,7 +24,7 @@ find_path(SIXENSE_INCLUDE_DIRS sixense.h PATH_SUFFIXES include HINTS ${SIXENSE_S if (APPLE) find_library(SIXENSE_LIBRARY_RELEASE lib/osx_x64/release_dll/libsixense_x64.dylib HINTS ${SIXENSE_SEARCH_DIRS}) - find_library(SIXENSE_LIBRARY_DEBUG lib/osx_x64/debug_dll/libsixensed_x64.dylib HINTS ${SIXENSE_SEARCH_DIRS}) + # find_library(SIXENSE_LIBRARY_DEBUG lib/osx_x64/debug_dll/libsixensed_x64.dylib HINTS ${SIXENSE_SEARCH_DIRS}) elseif (UNIX) find_library(SIXENSE_LIBRARY_RELEASE lib/linux_x64/release/libsixense_x64.so HINTS ${SIXENSE_SEARCH_DIRS}) find_library(SIXENSE_LIBRARY_DEBUG lib/linux_x64/debug/libsixensed_x64.so HINTS ${SIXENSE_SEARCH_DIRS}) From e182f541804695629ca92a38615919dfce8e65db Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 23 Jul 2014 17:52:50 -0700 Subject: [PATCH 7/7] exclude sixense debug on UNIX only, not APPLE --- cmake/modules/FindSixense.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/modules/FindSixense.cmake b/cmake/modules/FindSixense.cmake index 829383ed0c..94d211fdac 100644 --- a/cmake/modules/FindSixense.cmake +++ b/cmake/modules/FindSixense.cmake @@ -24,10 +24,10 @@ find_path(SIXENSE_INCLUDE_DIRS sixense.h PATH_SUFFIXES include HINTS ${SIXENSE_S if (APPLE) find_library(SIXENSE_LIBRARY_RELEASE lib/osx_x64/release_dll/libsixense_x64.dylib HINTS ${SIXENSE_SEARCH_DIRS}) - # find_library(SIXENSE_LIBRARY_DEBUG lib/osx_x64/debug_dll/libsixensed_x64.dylib HINTS ${SIXENSE_SEARCH_DIRS}) + find_library(SIXENSE_LIBRARY_DEBUG lib/osx_x64/debug_dll/libsixensed_x64.dylib HINTS ${SIXENSE_SEARCH_DIRS}) elseif (UNIX) find_library(SIXENSE_LIBRARY_RELEASE lib/linux_x64/release/libsixense_x64.so HINTS ${SIXENSE_SEARCH_DIRS}) - find_library(SIXENSE_LIBRARY_DEBUG lib/linux_x64/debug/libsixensed_x64.so HINTS ${SIXENSE_SEARCH_DIRS}) + # find_library(SIXENSE_LIBRARY_DEBUG lib/linux_x64/debug/libsixensed_x64.so HINTS ${SIXENSE_SEARCH_DIRS}) elseif (WIN32) find_library(SIXENSE_LIBRARY_RELEASE lib/win32/release_dll/sixense.lib HINTS ${SIXENSE_SEARCH_DIRS}) find_library(SIXENSE_LIBRARY_DEBUG lib/win32/debug_dll/sixensed.lib HINTS ${SIXENSE_SEARCH_DIRS})