Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 08:52:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed camera mode issue

Browse source
This commit is contained in:
Sam Gondelman 2015-06-23 11:45:08 -07:00
parent 824c219fa0
commit 778e19ac11
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -889,7 +889,7 @@ void Application::paintGL() {
glEnable(GL_LINE_SMOOTH);
if (!(Menu::getInstance()->isOptionChecked(MenuOption::IndependentMode) || Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror))); {
if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON || _myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPerson, _myAvatar->getBoomLength() <= MyAvatar::ZOOM_MIN);
Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, !(_myAvatar->getBoomLength() <= MyAvatar::ZOOM_MIN));
Application::getInstance()->cameraMenuChanged();

4
interface/src/Camera.cpp
View file

@ -103,7 +103,7 @@ PickRay Camera::computePickRay(float x, float y) {
void Camera::setModeString(const QString& mode) {
CameraMode targetMode = stringToMode(mode);
switch (targetMode) {
case CAMERA_MODE_FIRST_PERSON:
Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPerson, true);
@ -121,7 +121,7 @@ void Camera::setModeString(const QString& mode) {
break;
}
Application::getInstance()->cameraMenuChanged();
qApp->cameraMenuChanged();
if (_mode != targetMode) {
setMode(targetMode);