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

Merge pull request #10649 from sethalves/fix-head-puck-broken-eyes

Browse source 
Fix head puck broken eyes
This commit is contained in:
Seth Alves 2017-06-09 12:50:53 -07:00 committed by GitHub
commit 3f425a5f02
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/Application.cpp
View file

@ -4126,10 +4126,10 @@ void Application::updateMyAvatarLookAtPosition() {
} }
} else { } else {
// I am not looking at anyone else, so just look forward // I am not looking at anyone else, so just look forward
if (isHMD) { auto headPose = myAvatar->getHeadControllerPoseInSensorFrame();
glm::mat4 worldHeadMat = myAvatar->getSensorToWorldMatrix() * if (headPose.isValid()) {
myAvatar->getHeadControllerPoseInSensorFrame().getMatrix(); glm::mat4 worldHeadMat = myAvatar->getSensorToWorldMatrix() * headPose.getMatrix();
lookAtSpot = transformPoint(worldHeadMat, glm::vec3(0.0f, 0.0f, -TREE_SCALE)); lookAtSpot = transformPoint(worldHeadMat, glm::vec3(0.0f, 0.0f, TREE_SCALE));
} else { } else {
lookAtSpot = myAvatar->getHead()->getEyePosition() + lookAtSpot = myAvatar->getHead()->getEyePosition() +
(myAvatar->getHead()->getFinalOrientationInWorldFrame() * glm::vec3(0.0f, 0.0f, -TREE_SCALE)); (myAvatar->getHead()->getFinalOrientationInWorldFrame() * glm::vec3(0.0f, 0.0f, -TREE_SCALE));

6
interface/src/avatar/MyAvatar.cpp
View file

@ -2664,8 +2664,8 @@ bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, co
return (offset.y > CYLINDER_TOP) || (offset.y < CYLINDER_BOTTOM); return (offset.y > CYLINDER_TOP) || (offset.y < CYLINDER_BOTTOM);
} }
void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix, bool hasDriveInput) { void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix,
_desiredBodyMatrix = desiredBodyMatrix; const glm::mat4& currentBodyMatrix, bool hasDriveInput) {
if (myAvatar.getHMDLeanRecenterEnabled()) { if (myAvatar.getHMDLeanRecenterEnabled()) {
if (!isActive(Rotation) && shouldActivateRotation(myAvatar, desiredBodyMatrix, currentBodyMatrix)) { if (!isActive(Rotation) && shouldActivateRotation(myAvatar, desiredBodyMatrix, currentBodyMatrix)) {
@ -2679,7 +2679,7 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat
} }
} }
glm::mat4 desiredWorldMatrix = myAvatar.getSensorToWorldMatrix() * _desiredBodyMatrix; glm::mat4 desiredWorldMatrix = myAvatar.getSensorToWorldMatrix() * desiredBodyMatrix;
glm::mat4 currentWorldMatrix = myAvatar.getSensorToWorldMatrix() * currentBodyMatrix; glm::mat4 currentWorldMatrix = myAvatar.getSensorToWorldMatrix() * currentBodyMatrix;
AnimPose followWorldPose(currentWorldMatrix); AnimPose followWorldPose(currentWorldMatrix);

1
interface/src/avatar/MyAvatar.h
View file

@ -702,7 +702,6 @@ private:
Vertical, Vertical,
NumFollowTypes NumFollowTypes
}; };
glm::mat4 _desiredBodyMatrix;
float _timeRemaining[NumFollowTypes]; float _timeRemaining[NumFollowTypes];
void deactivate(); void deactivate();