Merge pull request #6996 from thoys/hydra-scaling-fix

Fix for controller palm movement for scaled avatars

Seth Alves committed 10 years ago

Commit 753fc442 parents b553c84 8f6e7011 file · +1 −1Browse files

Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all

Unified · Split

@@ -5006,7 +5006,7 @@ void Application::setPalmData(Hand* hand, const controller::Pose& pose, float de · 5005 unmodified lines
5006	palm.setActive(pose.isValid());	5006	palm.setActive(pose.isValid());
5007		5007
5008	// transform from sensor space, to world space, to avatar model space.	5008	// transform from sensor space, to world space, to avatar model space.
5009	glm::mat4 poseMat = createMatFromQuatAndPos(pose.getRotation(), pose.getTranslation());	5009	glm::mat4 poseMat = createMatFromQuatAndPos(pose.getRotation(), pose.getTranslation() * myAvatar->getScale());
5010	glm::mat4 sensorToWorldMat = myAvatar->getSensorToWorldMatrix();	5010	glm::mat4 sensorToWorldMat = myAvatar->getSensorToWorldMatrix();
5011	glm::mat4 modelMat = createMatFromQuatAndPos(myAvatar->getOrientation(), myAvatar->getPosition());	5011	glm::mat4 modelMat = createMatFromQuatAndPos(myAvatar->getOrientation(), myAvatar->getPosition());
5012	glm::mat4 objectPose = glm::inverse(modelMat) * sensorToWorldMat * poseMat;	5012	glm::mat4 objectPose = glm::inverse(modelMat) * sensorToWorldMat * poseMat;