History

Merge pull request #1141 from stojce/19447

Code Review for Job #19447

ZappoMan committed 13 years ago

Commit 375ef342 parents 0ea60c1 77655696 files · +95 −26Browse files

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

Unified · Split

interface/src/Application.cpp+14−5
@@ -89,6 +89,8 @@ const int MIRROR_VIEW_TOP_PADDING = 5; · 88 unmodified lines
8989 const int MIRROR_VIEW_LEFT_PADDING = 10;
9090 const int MIRROR_VIEW_WIDTH = 265;
9191 const int MIRROR_VIEW_HEIGHT = 215;
92+const float MAX_ZOOM_DISTANCE = 0.3f;
93+const float MIN_ZOOM_DISTANCE = 2.0f;
9294
9395 void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString &message) {
9496 fprintf(stdout, "%s", message.toLocal8Bit().constData());
@@ -384,7 +386,7 @@ void Application::paintGL() { · 289 unmodified lines
384386
385387 } else if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
386388 _myCamera.setTightness(0.0f);
387− _myCamera.setDistance(0.3f);
389+ _myCamera.setDistance(MAX_ZOOM_DISTANCE);
388390 _myCamera.setTargetPosition(_myAvatar.getHead().calculateAverageEyePosition());
389391 _myCamera.setTargetRotation(_myAvatar.getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PIf, 0.0f)));
390392 }
@@ -434,8 +436,15 @@ void Application::paintGL() { · 43 unmodified lines
434436 _glowEffect.render();
435437
436438 if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {
437− _mirrorCamera.setDistance(0.3f);
438− _mirrorCamera.setTargetPosition(_myAvatar.getHead().calculateAverageEyePosition());
439+
440+ if (_rearMirrorTools->getZoomLevel() == BODY) {
441+ _mirrorCamera.setDistance(MIN_ZOOM_DISTANCE);
442+ _mirrorCamera.setTargetPosition(_myAvatar.getChestJointPosition());
443+ } else { // HEAD zoom level
444+ _mirrorCamera.setDistance(MAX_ZOOM_DISTANCE);
445+ _mirrorCamera.setTargetPosition(_myAvatar.getHead().calculateAverageEyePosition());
446+ }
447+
439448 _mirrorCamera.setTargetRotation(_myAvatar.getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PIf, 0.0f)));
440449 _mirrorCamera.update(1.0f/_fps);
441450
@@ -1322,8 +1331,8 @@ void Application::terminate() { · 880 unmodified lines
13221331 // close(serial_fd);
13231332
13241333 LeapManager::terminate();
1325−
13261334 Menu::getInstance()->saveSettings();
1335+ _rearMirrorTools->saveSettings(_settings);
13271336 _settings->sync();
13281337
13291338 if (_enableNetworkThread) {
@@ -1719,7 +1728,7 @@ void Application::init() { · 389 unmodified lines
17191728
17201729 _audio.init(_glWidget);
17211730
1722− _rearMirrorTools = new RearMirrorTools(_glWidget, _mirrorViewRect);
1731+ _rearMirrorTools = new RearMirrorTools(_glWidget, _mirrorViewRect, _settings);
17231732 connect(_rearMirrorTools, SIGNAL(closeView()), SLOT(closeMirrorView()));
17241733 connect(_rearMirrorTools, SIGNAL(restoreView()), SLOT(restoreMirrorView()));
17251734 connect(_rearMirrorTools, SIGNAL(shrinkView()), SLOT(shrinkMirrorView()));

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