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

cleanup dead code

Browse source
This commit is contained in:
Atlante45 2015-11-10 17:10:15 -08:00
parent 4f1420a5ee
commit ce57488b9f
2 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -206,16 +206,6 @@ void ViveControllerManager::renderHand(const controller::Pose& pose, gpu::Batch&
batch.drawIndexed(gpu::TRIANGLES, mesh->getNumIndices(), 0); 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) { void ViveControllerManager::pluginUpdate(float deltaTime, bool jointsCaptured) {
_inputDevice->update(deltaTime, jointsCaptured); _inputDevice->update(deltaTime, jointsCaptured);

11
libraries/input-plugins/src/input-plugins/ViveControllerManager.h
View file

@ -31,7 +31,6 @@ namespace vr {
class ViveControllerManager : public InputPlugin { class ViveControllerManager : public InputPlugin {
Q_OBJECT Q_OBJECT
public: public:
static const QString NAME;
// Plugin functions // Plugin functions
virtual bool isSupported() const override; virtual bool isSupported() const override;
@ -48,12 +47,6 @@ public:
void setRenderControllers(bool renderControllers) { _renderControllers = renderControllers; } void setRenderControllers(bool renderControllers) { _renderControllers = renderControllers; }
#ifdef Q_OS_WIN
glm::vec3 getPosition(int device) const;
glm::quat getRotation(int device) const;
#endif
private: private:
class InputDevice : public controller::InputDevice { class InputDevice : public controller::InputDevice {
public: public:
@ -89,6 +82,10 @@ private:
bool _renderControllers { false }; bool _renderControllers { false };
vr::IVRSystem* _hmd { nullptr }; vr::IVRSystem* _hmd { nullptr };
std::shared_ptr<InputDevice> _inputDevice { std::make_shared<InputDevice>(_hmd) }; std::shared_ptr<InputDevice> _inputDevice { std::make_shared<InputDevice>(_hmd) };
static const QString NAME;
}; };
#endif // hifi__ViveControllerManager #endif // hifi__ViveControllerManager