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

removed _mouse{X,Y}

Browse source
This commit is contained in:
Atlante45 2014-12-05 17:02:49 -08:00
parent 469c958c98
commit ee124f580d
2 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
interface/src/Application.cpp
View file

@ -165,8 +165,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
_scaleMirror(1.0f), _scaleMirror(1.0f),
_rotateMirror(0.0f), _rotateMirror(0.0f),
_raiseMirror(0.0f), _raiseMirror(0.0f),
_mouseX(0),
_mouseY(0),
_lastMouseMove(usecTimestampNow()), _lastMouseMove(usecTimestampNow()),
_lastMouseMoveWasSimulated(false), _lastMouseMoveWasSimulated(false),
_mouseHidden(false), _mouseHidden(false),
@ -1282,9 +1280,6 @@ void Application::mouseMoveEvent(QMouseEvent* event, unsigned int deviceID) {
_mouseHidden = false; _mouseHidden = false;
_seenMouseMove = true; _seenMouseMove = true;
} }
_mouseX = event->x();
_mouseY = event->y();
} }
void Application::mousePressEvent(QMouseEvent* event, unsigned int deviceID) { void Application::mousePressEvent(QMouseEvent* event, unsigned int deviceID) {
@ -1302,8 +1297,6 @@ void Application::mousePressEvent(QMouseEvent* event, unsigned int deviceID) {
if (activeWindow() == _window) { if (activeWindow() == _window) {
if (event->button() == Qt::LeftButton) { if (event->button() == Qt::LeftButton) {
_mouseX = event->x();
_mouseY = event->y();
_mouseDragStartedX = getTrueMouseX(); _mouseDragStartedX = getTrueMouseX();
_mouseDragStartedY = getTrueMouseY(); _mouseDragStartedY = getTrueMouseY();
_mousePressed = true; _mousePressed = true;
@ -1346,8 +1339,6 @@ void Application::mouseReleaseEvent(QMouseEvent* event, unsigned int deviceID) {
if (activeWindow() == _window) { if (activeWindow() == _window) {
if (event->button() == Qt::LeftButton) { if (event->button() == Qt::LeftButton) {
_mouseX = event->x();
_mouseY = event->y();
_mousePressed = false; _mousePressed = false;
if (Menu::getInstance()->isOptionChecked(MenuOption::Stats) && mouseOnScreen()) { if (Menu::getInstance()->isOptionChecked(MenuOption::Stats) && mouseOnScreen()) {
@ -1940,9 +1931,6 @@ void Application::init() {
_voxelShader.init(); _voxelShader.init();
_pointShader.init(); _pointShader.init();
_mouseX = _glWidget->width() / 2;
_mouseY = _glWidget->height() / 2;
// TODO: move _myAvatar out of Application. Move relevant code to MyAvataar or AvatarManager // TODO: move _myAvatar out of Application. Move relevant code to MyAvataar or AvatarManager
_avatarManager.init(); _avatarManager.init();
_myCamera.setMode(CAMERA_MODE_FIRST_PERSON); _myCamera.setMode(CAMERA_MODE_FIRST_PERSON);
@ -3557,9 +3545,6 @@ void Application::deleteVoxelAt(const VoxelDetail& voxel) {
} }
void Application::resetSensors() { void Application::resetSensors() {
_mouseX = _glWidget->width() / 2;
_mouseY = _glWidget->height() / 2;
_faceshift.reset(); _faceshift.reset();
_visage.reset(); _visage.reset();
_dde.reset(); _dde.reset();
@ -3572,7 +3557,7 @@ void Application::resetSensors() {
QScreen* currentScreen = _window->windowHandle()->screen(); QScreen* currentScreen = _window->windowHandle()->screen();
QWindow* mainWindow = _window->windowHandle(); QWindow* mainWindow = _window->windowHandle();
QPoint windowCenter = mainWindow->geometry().center(); QPoint windowCenter = mainWindow->geometry().center();
QCursor::setPos(currentScreen, windowCenter); _glWidget->cursor().setPos(currentScreen, windowCenter);
_myAvatar->reset(); _myAvatar->reset();

6
interface/src/Application.h
View file

@ -217,8 +217,8 @@ public:
bool mouseOnScreen() const; bool mouseOnScreen() const;
int getMouseX() const; int getMouseX() const;
int getMouseY() const; int getMouseY() const;
int getTrueMouseX() const { return _mouseX; } int getTrueMouseX() const { return _glWidget->mapFromGlobal(QCursor::pos()).x(); }
int getTrueMouseY() const { return _mouseY; } int getTrueMouseY() const { return _glWidget->mapFromGlobal(QCursor::pos()).y(); }
int getMouseDragStartedX() const; int getMouseDragStartedX() const;
int getMouseDragStartedY() const; int getMouseDragStartedY() const;
int getTrueMouseDragStartedX() const { return _mouseDragStartedX; } int getTrueMouseDragStartedX() const { return _mouseDragStartedX; }
@ -563,8 +563,6 @@ private:
Environment _environment; Environment _environment;
int _mouseX;
int _mouseY;
int _mouseDragStartedX; int _mouseDragStartedX;
int _mouseDragStartedY; int _mouseDragStartedY;
quint64 _lastMouseMove; quint64 _lastMouseMove;