From 9382268ee30613321dd3254298df5f55657d1ca8 Mon Sep 17 00:00:00 2001 From: stojce Date: Wed, 23 Oct 2013 09:30:26 +0200 Subject: [PATCH] CR fixes --- interface/src/Application.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 554f798d47..3e15067054 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -69,11 +69,6 @@ #include "ui/TextRenderer.h" #include "InfoView.h" -#include -#include -#include -#include - using namespace std; // Starfield information @@ -264,12 +259,12 @@ void Application::restoreSizeAndPosition() { settings->beginGroup("Window"); - int x = (int) loadSetting(settings, "x", 0); - int y = (int) loadSetting(settings, "y", 0); + int x = (int)loadSetting(settings, "x", 0); + int y = (int)loadSetting(settings, "y", 0); _window->move(x, y); - int width = (int) loadSetting(settings, "width", available.width()); - int height = (int) loadSetting(settings, "height", available.height()); + int width = (int)loadSetting(settings, "width", available.width()); + int height = (int)loadSetting(settings, "height", available.height()); _window->resize(width, height); settings->endGroup(); @@ -1069,7 +1064,6 @@ void Application::mousePressEvent(QMouseEvent* event) { } if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) { - QRect closeIconRect = QRect(MIRROR_CLOSE_ICON_PADDING + _mirrorViewRect.left(), MIRROR_CLOSE_ICON_PADDING + _mirrorViewRect.top(), MIRROR_ICON_SIZE, MIRROR_ICON_SIZE); if (closeIconRect.contains(_mouseX, _mouseY)) { @@ -2125,7 +2119,7 @@ void Application::update(float deltaTime) { } if (Menu::getInstance()->isOptionChecked(MenuOption::OffAxisProjection)) { - float xSign = _myCamera.getMode() != CAMERA_MODE_MIRROR ? 1.0f : -1.0f; + float xSign = _myCamera.getMode() == CAMERA_MODE_MIRROR ? 1.0f : -1.0f; if (_faceshift.isActive()) { const float EYE_OFFSET_SCALE = 0.025f; glm::vec3 position = _faceshift.getHeadTranslation() * EYE_OFFSET_SCALE;