Showing the changes to interface/src/Application.cpp (1 of 9 files). Show all
Unified · Split
| @@ -621,8 +621,8 @@ void Application::paintGL() { · 620 unmodified lines | ||
| 621 | 621 | |
| 622 | 622 | } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) { |
| 623 | 623 | static const float THIRD_PERSON_CAMERA_DISTANCE = 1.5f; |
| 624 | − _myCamera.setPosition(_myAvatar->getUprightHeadPosition() + | |
| 625 | − _myAvatar->getOrientation() * glm::vec3(0.0f, 0.0f, 1.0f) * THIRD_PERSON_CAMERA_DISTANCE * _myAvatar->getScale()); | |
| 624 | + _myCamera.setPosition(_myAvatar->getDefaultEyePosition() + | |
| 625 | + _myAvatar->getOrientation() * glm::vec3(0.0f, 0.0f, 1.0f) * THIRD_PERSON_CAMERA_DISTANCE * _myAvatar->getScale()); | |
| 626 | 626 | if (OculusManager::isConnected()) { |
| 627 | 627 | _myCamera.setRotation(_myAvatar->getWorldAlignedOrientation()); |
| 628 | 628 | } else { |
| @@ -1982,6 +1982,9 @@ void Application::init() { · 1353 unmodified lines | ||
| 1982 | 1982 | connect(getAudio(), &Audio::preProcessOriginalInboundAudio, &_audioReflector, |
| 1983 | 1983 | &AudioReflector::preProcessOriginalInboundAudio,Qt::DirectConnection); |
| 1984 | 1984 | |
| 1985 | + connect(getAudio(), &Audio::muteToggled, AudioDeviceScriptingInterface::getInstance(), | |
| 1986 | + &AudioDeviceScriptingInterface::muteToggled, Qt::DirectConnection); | |
| 1987 | + | |
| 1985 | 1988 | // save settings when avatar changes |
| 1986 | 1989 | connect(_myAvatar, &MyAvatar::transformChanged, this, &Application::bumpSettings); |
| 1987 | 1990 | } |