Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-18 04:44:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR feedback

Browse source
This commit is contained in:
Brad Hefta-Gaub 2015-12-15 15:40:50 -08:00
parent 6420a43858
commit aa53900fa3
2 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
interface/src/Application.cpp
View file

@ -664,7 +664,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
auto userInputMapper = DependencyManager::get<UserInputMapper>();
connect(userInputMapper.data(), &UserInputMapper::actionEvent, [this](int action, float state) {
if (action == controller::toInt(controller::Action::RETICLE_CLICK)) {
auto globalPos = getReticlePosition();
auto globalPos = QCursor::pos();
auto localPos = _glWidget->mapFromGlobal(globalPos);
if (state) {
QMouseEvent mousePress(QEvent::MouseButtonPress, localPos, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
@ -686,13 +686,13 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
} else if (action == controller::toInt(controller::Action::CONTEXT_MENU)) {
VrMenu::toggle(); // show context menu even on non-stereo displays
} else if (action == controller::toInt(controller::Action::RETICLE_X)) {
auto reticlePos = getReticlePosition();
reticlePos.setX(reticlePos.x() + state);
setReticlePosition(reticlePos);
auto globalPos = QCursor::pos();
globalPos.setX(globalPos.x() + state);
QCursor::setPos(globalPos);
} else if (action == controller::toInt(controller::Action::RETICLE_Y)) {
auto reticlePos = getReticlePosition();
reticlePos.setY(reticlePos.y() + state);
setReticlePosition(reticlePos);
auto globalPos = QCursor::pos();
globalPos.setY(globalPos.y() + state);
QCursor::setPos(globalPos);
}
}
});
@ -4753,14 +4753,6 @@ bool Application::isThrottleRendering() const {
return getActiveDisplayPlugin()->isThrottled();
}
QPoint Application::getReticlePosition() const {
return QCursor::pos();
}
void Application::setReticlePosition(QPoint position) {
QCursor::setPos(position);
}
ivec2 Application::getTrueMouse() const {
return toGlm(_glWidget->mapFromGlobal(QCursor::pos()));
}

3
interface/src/Application.h
View file

@ -143,9 +143,6 @@ public:
EntityTreeRenderer* getEntityClipboardRenderer() { return &_entityClipboardRenderer; }
EntityEditPacketSender* getEntityEditPacketSender() { return &_entityEditSender; }
QPoint getReticlePosition() const;
void setReticlePosition(QPoint position);
ivec2 getMouse() const;
ivec2 getTrueMouse() const;