History

Moved LookAtTargetAvatar stuff from AvatarManager to MyAvatar.

Andrew Meadows committed 12 years ago

Commit a7ffb7d1 parent 1b99bc95 files · +48 −51Browse files

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

Unified · Split

interface/src/Application.cpp+4−4
@@ -1196,8 +1196,8 @@ void Application::mouseMoveEvent(QMouseEvent* event) { · 1195 unmodified lines
1196 if (activeWindow() == _window) {1196 if (activeWindow() == _window) {
1197 // orbit behavior1197 // orbit behavior
1198 if (_mousePressed && !Menu::getInstance()->isVoxelModeActionChecked()) {1198 if (_mousePressed && !Menu::getInstance()->isVoxelModeActionChecked()) {
1199 if (_avatarManager.getLookAtTargetAvatar()) {1199 if (_myAvatar->getLookAtTargetAvatar()) {
1200 _myAvatar->orbit(_avatarManager.getLookAtTargetAvatar()->getPosition(), deltaX, deltaY);1200 _myAvatar->orbit(_myAvatar->getLookAtTargetAvatar()->getPosition(), deltaX, deltaY);
1201 return;1201 return;
1202 }1202 }
1203 if (_isHoverVoxel) {1203 if (_isHoverVoxel) {
@@ -1256,7 +1256,7 @@ void Application::mousePressEvent(QMouseEvent* event) { · 52 unmodified lines
1256 return;1256 return;
1257 }1257 }
1258 1258
1259 if (!_palette.isActive() && (!_isHoverVoxel || _avatarManager.getLookAtTargetAvatar())) {1259 if (!_palette.isActive() && (!_isHoverVoxel || _myAvatar->getLookAtTargetAvatar())) {
1260 // disable for now1260 // disable for now
1261 // _pieMenu.mousePressEvent(_mouseX, _mouseY);1261 // _pieMenu.mousePressEvent(_mouseX, _mouseY);
1262 }1262 }
@@ -2363,7 +2363,7 @@ void Application::update(float deltaTime) { · 1100 unmodified lines
2363 glm::vec3 lookAtSpot;2363 glm::vec3 lookAtSpot;
2364 2364
2365 updateFaceshift();2365 updateFaceshift();
2366 _avatarManager.updateLookAtTargetAvatar(lookAtSpot);2366 _myAvatar->updateLookAtTargetAvatar(lookAtSpot);
2367 updateMyAvatarLookAtPosition(lookAtSpot);2367 updateMyAvatarLookAtPosition(lookAtSpot);
2368 2368
2369 // Find the voxel we are hovering over, and respond if clicked2369 // Find the voxel we are hovering over, and respond if clicked

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