History

Need to set lookat position to camera position before simulating in mirror mode.

Andrzej Kapolka committed 13 years ago

Commit 5f696bd1 parent 8b6174f1 file · +5 −3Browse files

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

Unified · Split

interface/src/Application.cpp+5−3
@@ -1924,10 +1924,15 @@ void Application::update(float deltaTime) { · 1923 unmodified lines
1924 if (_lookatTargetAvatar && !_faceshift.isActive()) {1924 if (_lookatTargetAvatar && !_faceshift.isActive()) {
1925 // If the mouse is over another avatar's head...1925 // If the mouse is over another avatar's head...
1926 _myAvatar.getHead().setLookAtPosition(lookAtSpot);1926 _myAvatar.getHead().setLookAtPosition(lookAtSpot);
1927
1927 } else if (_isHoverVoxel && !_faceshift.isActive()) {1928 } else if (_isHoverVoxel && !_faceshift.isActive()) {
1928 // Look at the hovered voxel1929 // Look at the hovered voxel
1929 lookAtSpot = getMouseVoxelWorldCoordinates(_hoverVoxel);1930 lookAtSpot = getMouseVoxelWorldCoordinates(_hoverVoxel);
1930 _myAvatar.getHead().setLookAtPosition(lookAtSpot);1931 _myAvatar.getHead().setLookAtPosition(lookAtSpot);
1932
1933 } else if (_myCamera.getMode() == CAMERA_MODE_MIRROR && !_faceshift.isActive()) {
1934 _myAvatar.getHead().setLookAtPosition(_myCamera.getPosition());
1935
1931 } else {1936 } else {
1932 // Just look in direction of the mouse ray1937 // Just look in direction of the mouse ray
1933 const float FAR_AWAY_STARE = TREE_SCALE;1938 const float FAR_AWAY_STARE = TREE_SCALE;
@@ -2784,9 +2789,6 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 850 unmodified lines
2784 }2789 }
2785 2790
2786 // Render my own Avatar2791 // Render my own Avatar
2787 if (whichCamera.getMode() == CAMERA_MODE_MIRROR && !_faceshift.isActive()) {
2788 _myAvatar.getHead().setLookAtPosition(whichCamera.getPosition());
2789 }
2790 _myAvatar.render(whichCamera.getMode() == CAMERA_MODE_MIRROR,2792 _myAvatar.render(whichCamera.getMode() == CAMERA_MODE_MIRROR,
2791 Menu::getInstance()->isOptionChecked(MenuOption::AvatarAsBalls));2793 Menu::getInstance()->isOptionChecked(MenuOption::AvatarAsBalls));
2792 _myAvatar.setDisplayingLookatVectors(Menu::getInstance()->isOptionChecked(MenuOption::LookAtVectors));2794 _myAvatar.setDisplayingLookatVectors(Menu::getInstance()->isOptionChecked(MenuOption::LookAtVectors));

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t