History

Merge pull request #1103 from ey6es/master

As a temporary measure, restore the full screen mirror as a menu option.

ZappoMan committed 13 years ago

Commit 55294e12 parents c87ddd2 5334d903 files · +28 −3Browse files

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

Unified · Split

interface/src/Application.cpp+25−2
@@ -382,6 +382,20 @@ void Application::paintGL() { · 381 unmodified lines
382 } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {382 } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
383 _myCamera.setTargetPosition(_myAvatar.getUprightHeadPosition());383 _myCamera.setTargetPosition(_myAvatar.getUprightHeadPosition());
384 _myCamera.setTargetRotation(_myAvatar.getHead().getCameraOrientation());384 _myCamera.setTargetRotation(_myAvatar.getHead().getCameraOrientation());
385
386 } else if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
387 _myCamera.setTightness(0.0f);
388 _myCamera.setDistance(0.3f);
389 glm::vec3 targetPosition = _myAvatar.getUprightHeadPosition();
390 if (_myAvatar.getHead().getBlendFace().isActive()) {
391 // make sure we're aligned to the blend face eyes
392 glm::vec3 leftEyePosition, rightEyePosition;
393 if (_myAvatar.getHead().getBlendFace().getEyePositions(leftEyePosition, rightEyePosition, true)) {
394 targetPosition = (leftEyePosition + rightEyePosition) * 0.5f;
395 }
396 }
397 _myCamera.setTargetPosition(targetPosition);
398 _myCamera.setTargetRotation(_myAvatar.getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PIf, 0.0f)));
385 }399 }
386 400
387 // Update camera position401 // Update camera position
@@ -885,7 +899,11 @@ void Application::keyPressEvent(QKeyEvent* event) { · 497 unmodified lines
885 updateProjectionMatrix();899 updateProjectionMatrix();
886 break;900 break;
887 case Qt::Key_H:901 case Qt::Key_H:
888 Menu::getInstance()->triggerOption(MenuOption::Mirror);902 if (isShifted) {
903 Menu::getInstance()->triggerOption(MenuOption::Mirror);
904 } else {
905 Menu::getInstance()->triggerOption(MenuOption::FullscreenMirror);
906 }
889 break;907 break;
890 case Qt::Key_F:908 case Qt::Key_F:
891 if (isShifted) {909 if (isShifted) {
@@ -2127,7 +2145,12 @@ void Application::update(float deltaTime) { · 1235 unmodified lines
2127 }2145 }
2128 2146
2129 if (!OculusManager::isConnected()) { 2147 if (!OculusManager::isConnected()) {
2130 if (Menu::getInstance()->isOptionChecked(MenuOption::FirstPerson)) {2148 if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {
2149 if (_myCamera.getMode() != CAMERA_MODE_MIRROR) {
2150 _myCamera.setMode(CAMERA_MODE_MIRROR);
2151 _myCamera.setModeShiftRate(100.0f);
2152 }
2153 } else if (Menu::getInstance()->isOptionChecked(MenuOption::FirstPerson)) {
2131 if (_myCamera.getMode() != CAMERA_MODE_FIRST_PERSON) {2154 if (_myCamera.getMode() != CAMERA_MODE_FIRST_PERSON) {
2132 _myCamera.setMode(CAMERA_MODE_FIRST_PERSON);2155 _myCamera.setMode(CAMERA_MODE_FIRST_PERSON);
2133 _myCamera.setModeShiftRate(1.0f);2156 _myCamera.setModeShiftRate(1.0f);

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