From c358b9f0fd5458e11ff339cf60c8ba63c0b48678 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Thu, 14 Nov 2013 10:19:35 -0800 Subject: [PATCH 1/2] Don't track the mouse in mirror mode. --- interface/src/Application.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 697d5d3b35..32a93a942e 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2012,14 +2012,14 @@ void Application::updateMyAvatarLookAtPosition(glm::vec3& lookAtSpot, glm::vec3& bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); PerformanceWarning warn(showWarnings, "Application::updateMyAvatarLookAtPosition()"); - if (!_lookatTargetAvatar) { + if (_myCamera.getMode() == CAMERA_MODE_MIRROR) { + lookAtSpot = _myCamera.getPosition(); + + } else if (!_lookatTargetAvatar) { if (_isHoverVoxel) { // Look at the hovered voxel lookAtSpot = getMouseVoxelWorldCoordinates(_hoverVoxel); - } else if (_myCamera.getMode() == CAMERA_MODE_MIRROR) { - lookAtSpot = _myCamera.getPosition(); - } else { // Just look in direction of the mouse ray const float FAR_AWAY_STARE = TREE_SCALE; From d3d2c344e698d4f6446f97b9612637a7d565a8f1 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Thu, 14 Nov 2013 10:46:56 -0800 Subject: [PATCH 2/2] Set the head scale for other avatars. --- interface/src/avatar/Avatar.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index 8e8225200d..829c4f4464 100755 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -398,6 +398,7 @@ void Avatar::simulate(float deltaTime, Transmitter* transmitter) { headPosition = _bodyBall[BODY_BALL_HEAD_BASE].position; } _head.setPosition(headPosition); + _head.setScale(_scale); _head.setSkinColor(glm::vec3(SKIN_COLOR[0], SKIN_COLOR[1], SKIN_COLOR[2])); _head.simulate(deltaTime, false);