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

Rebase fixes

Browse source
This commit is contained in:
Atlante45 2015-11-03 11:37:57 -08:00
parent 52c61f069f
commit 0508091130
5 changed files with 38 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/avatar/AvatarActionHold.cpp
View file

@ -37,6 +37,7 @@ AvatarActionHold::~AvatarActionHold() {
}
#include <plugins/PluginManager.h>
#include <input-plugins/ViveControllerManager.h>
#include <controllers/UserInputMapper.h>
void AvatarActionHold::updateActionWorker(float deltaTimeStep) {
bool gotLock = false;
glm::quat rotation;

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

@ -223,6 +223,7 @@ 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);
@ -231,6 +232,7 @@ glm::quat ViveControllerManager::getRotation(int hand) const {
const mat4& mat = _trackedDevicePoseMat4[hand ? 3 : 4];
return glm::quat_cast(mat);
}
#endif
void ViveControllerManager::update(float deltaTime, bool jointsCaptured) {
#ifdef Q_OS_WIN
@ -418,6 +420,7 @@ void ViveControllerManager::handlePoseEvent(const mat4& mat, bool left) {
const glm::quat signedQuaterZ = glm::angleAxis(sign * PI / 2.0f, glm::vec3(0.0f, 0.0f, 1.0f));
const glm::quat eighthX = glm::angleAxis(PI / 4.0f, glm::vec3(1.0f, 0.0f, 0.0f));
const glm::quat rotationOffset = glm::inverse(signedQuaterZ * eighthX) * yFlip * quarterX;
const glm::vec3 translationOffset = glm::vec3(sign * CONTROLLER_LENGTH_OFFSET / 2.0f,
CONTROLLER_LENGTH_OFFSET / 2.0f,

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

@ -52,9 +52,11 @@ public:
void setRenderControllers(bool renderControllers) { _renderControllers = renderControllers; }
int getNumDevices() const;
#ifdef Q_OS_WIN
glm::vec3 getPosition(int device) const;
glm::quat getRotation(int device) const;
#endif
private:
void renderHand(const controller::Pose& pose, gpu::Batch& batch, int sign);