From ce57488b9fe8f668757c90a8b3922fdfc11a1d73 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Tue, 10 Nov 2015 17:10:15 -0800 Subject: [PATCH] cleanup dead code --- .../src/input-plugins/ViveControllerManager.cpp | 12 +----------- .../src/input-plugins/ViveControllerManager.h | 11 ++++------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp b/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp index 9c95bb9426..88fdff4bce 100644 --- a/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp +++ b/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp @@ -206,16 +206,6 @@ void ViveControllerManager::renderHand(const controller::Pose& pose, gpu::Batch& batch.drawIndexed(gpu::TRIANGLES, mesh->getNumIndices(), 0); } -#ifdef Q_OS_WIN -glm::vec3 ViveControllerManager::getPosition(int hand) const { - const mat4& mat = _trackedDevicePoseMat4[hand ? 3 : 4]; - return extractTranslation(mat); -} -glm::quat ViveControllerManager::getRotation(int hand) const { - const mat4& mat = _trackedDevicePoseMat4[hand ? 3 : 4]; - return glm::quat_cast(mat); -} -#endif void ViveControllerManager::pluginUpdate(float deltaTime, bool jointsCaptured) { _inputDevice->update(deltaTime, jointsCaptured); @@ -263,7 +253,7 @@ void ViveControllerManager::InputDevice::update(float deltaTime, bool jointsCapt bool left = numTrackedControllers == 2; const mat4& mat = _trackedDevicePoseMat4[device]; - + if (!jointsCaptured) { handlePoseEvent(mat, numTrackedControllers - 1); } diff --git a/libraries/input-plugins/src/input-plugins/ViveControllerManager.h b/libraries/input-plugins/src/input-plugins/ViveControllerManager.h index d664326da8..02bdecb10a 100644 --- a/libraries/input-plugins/src/input-plugins/ViveControllerManager.h +++ b/libraries/input-plugins/src/input-plugins/ViveControllerManager.h @@ -31,7 +31,6 @@ namespace vr { class ViveControllerManager : public InputPlugin { Q_OBJECT public: - static const QString NAME; // Plugin functions virtual bool isSupported() const override; @@ -47,12 +46,6 @@ public: void updateRendering(RenderArgs* args, render::ScenePointer scene, render::PendingChanges pendingChanges); void setRenderControllers(bool renderControllers) { _renderControllers = renderControllers; } - - -#ifdef Q_OS_WIN - glm::vec3 getPosition(int device) const; - glm::quat getRotation(int device) const; -#endif private: class InputDevice : public controller::InputDevice { @@ -89,6 +82,10 @@ private: bool _renderControllers { false }; vr::IVRSystem* _hmd { nullptr }; std::shared_ptr _inputDevice { std::make_shared(_hmd) }; + + static const QString NAME; + + }; #endif // hifi__ViveControllerManager