History

Renaming for clarity.

Andrzej Kapolka committed 13 years ago

Commit 63efecc1 parent c6268562 files · +15 −18Browse files

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

Unified · Split

interface/src/Application.cpp+12−15
@@ -116,7 +116,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 115 unmodified lines
116116 _nudgeStarted(false),
117117 _lookingAlongX(false),
118118 _lookingAwayFromOrigin(true),
119− _isLookingAtOtherAvatar(false),
119+ _lookatTargetAvatar(NULL),
120120 _lookatIndicatorScale(1.0f),
121121 _perfStatsOn(false),
122122 _chatEntryOn(false),
@@ -974,7 +974,7 @@ void Application::mousePressEvent(QMouseEvent* event) { · 851 unmodified lines
974974
975975 maybeEditVoxelUnderCursor();
976976
977− if (!_palette.isActive() && (!_isHoverVoxel || _isLookingAtOtherAvatar)) {
977+ if (!_palette.isActive() && (!_isHoverVoxel || _lookatTargetAvatar)) {
978978 _pieMenu.mousePressEvent(_mouseX, _mouseY);
979979 }
980980
@@ -1503,7 +1503,7 @@ void Application::setListenModeSingleSource() { · 522 unmodified lines
15031503 glm::vec3 eyePositionIgnored;
15041504 uint16_t nodeID;
15051505
1506− if (isLookingAtOtherAvatar(mouseRayOrigin, mouseRayDirection, eyePositionIgnored, nodeID)) {
1506+ if (findLookatTargetAvatar(mouseRayOrigin, mouseRayDirection, eyePositionIgnored, nodeID)) {
15071507 _audio.addListenSource(nodeID);
15081508 }
15091509 }
@@ -1600,8 +1600,8 @@ const float HEAD_SPHERE_RADIUS = 0.07; · 90 unmodified lines
16001600 static uint16_t DEFAULT_NODE_ID_REF = 1;
16011601
16021602
1603−Avatar* Application::isLookingAtOtherAvatar(glm::vec3& mouseRayOrigin, glm::vec3& mouseRayDirection,
1604− glm::vec3& eyePosition, uint16_t& nodeID = DEFAULT_NODE_ID_REF) {
1603+Avatar* Application::findLookatTargetAvatar(const glm::vec3& mouseRayOrigin, const glm::vec3& mouseRayDirection,
1604+ glm::vec3& eyePosition, uint16_t& nodeID = DEFAULT_NODE_ID_REF) {
16051605
16061606 NodeList* nodeList = NodeList::getInstance();
16071607 for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
@@ -1748,8 +1748,8 @@ void Application::update(float deltaTime) { · 140 unmodified lines
17481748 _faceshift.getEstimatedEyePitch(), _faceshift.getEstimatedEyeYaw(), 0.0f))) * glm::vec3(0.0f, 0.0f, -1.0f);
17491749 }
17501750
1751− _isLookingAtOtherAvatar = isLookingAtOtherAvatar(lookAtRayOrigin, lookAtRayDirection, lookAtSpot);
1752− if (_isLookingAtOtherAvatar) {
1751+ _lookatTargetAvatar = findLookatTargetAvatar(lookAtRayOrigin, lookAtRayDirection, lookAtSpot);
1752+ if (_lookatTargetAvatar) {
17531753 // If the mouse is over another avatar's head...
17541754 _myAvatar.getHead().setLookAtPosition(lookAtSpot);
17551755 } else if (_isHoverVoxel && !_faceshift.isActive()) {
@@ -2063,15 +2063,15 @@ void Application::updateAvatar(float deltaTime) { · 307 unmodified lines
20632063 const float MIDPOINT_OF_SCREEN = 0.5;
20642064
20652065 // Only use gyro to set lookAt if mouse hasn't selected an avatar
2066− if (!_isLookingAtOtherAvatar) {
2066+ if (!_lookatTargetAvatar) {
20672067
20682068 // Set lookAtPosition if an avatar is at the center of the screen
20692069 glm::vec3 screenCenterRayOrigin, screenCenterRayDirection;
20702070 _viewFrustum.computePickRay(MIDPOINT_OF_SCREEN, MIDPOINT_OF_SCREEN, screenCenterRayOrigin, screenCenterRayDirection);
20712071
20722072 glm::vec3 eyePosition;
2073− _isLookingAtOtherAvatar = isLookingAtOtherAvatar(screenCenterRayOrigin, screenCenterRayDirection, eyePosition);
2074− if (_isLookingAtOtherAvatar) {
2073+ _lookatTargetAvatar = findLookatTargetAvatar(screenCenterRayOrigin, screenCenterRayDirection, eyePosition);
2074+ if (_lookatTargetAvatar) {
20752075 glm::vec3 myLookAtFromMouse(eyePosition);
20762076 _myAvatar.getHead().setLookAtPosition(myLookAtFromMouse);
20772077 }
@@ -2540,7 +2540,7 @@ void Application::displaySide(Camera& whichCamera) { · 462 unmodified lines
25402540 Menu::getInstance()->isOptionChecked(MenuOption::AvatarAsBalls));
25412541 _myAvatar.setDisplayingLookatVectors(Menu::getInstance()->isOptionChecked(MenuOption::LookAtVectors));
25422542
2543− if (Menu::getInstance()->isOptionChecked(MenuOption::LookAtIndicator) && _isLookingAtOtherAvatar) {
2543+ if (Menu::getInstance()->isOptionChecked(MenuOption::LookAtIndicator) && _lookatTargetAvatar) {
25442544 renderLookatIndicator(_lookatOtherPosition, whichCamera);
25452545 }
25462546 }
@@ -3342,10 +3342,7 @@ void Application::toggleFollowMode() { · 795 unmodified lines
33423342 mouseRayOrigin, mouseRayDirection);
33433343 glm::vec3 eyePositionIgnored;
33443344 uint16_t nodeIDIgnored;
3345− Avatar* leadingAvatar = isLookingAtOtherAvatar(mouseRayOrigin,
3346− mouseRayDirection,
3347− eyePositionIgnored,
3348− nodeIDIgnored);
3345+ Avatar* leadingAvatar = findLookatTargetAvatar(mouseRayOrigin, mouseRayDirection, eyePositionIgnored, nodeIDIgnored);
33493346
33503347 _myAvatar.follow(leadingAvatar);
33513348 }

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