Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 20:54:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR fixes

Browse source
This commit is contained in:
stojce 2013-10-23 09:30:26 +02:00
parent b728689c6d
commit 9382268ee3
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
interface/src/Application.cpp
View file

@ -69,11 +69,6 @@
#include "ui/TextRenderer.h"
#include "InfoView.h"
#include <QSvgRenderer>
#include <QPainter>
#include <QGLWidget>
#include <SharedUtil.h>
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;