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

remove getTrueMouse()

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-02-19 14:17:28 -08:00
parent d9aa5d8857
commit 7219a925d2
2 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
interface/src/Application.cpp
View file

@ -2064,9 +2064,10 @@ void Application::keyPressEvent(QKeyEvent* event) {
break;
case Qt::Key_Space: {
if (!event->isAutoRepeat()) {
// FIXME -- I don't think we've tested the HFActionEvent in a while... this looks possibly dubious
// this starts an HFActionEvent
HFActionEvent startActionEvent(HFActionEvent::startType(),
computePickRay(getTrueMouse().x, getTrueMouse().y));
computePickRay(getMouse().x, getMouse().y));
sendEvent(this, &startActionEvent);
}
@ -2115,9 +2116,10 @@ void Application::keyReleaseEvent(QKeyEvent* event) {
switch (event->key()) {
case Qt::Key_Space: {
if (!event->isAutoRepeat()) {
// FIXME -- I don't think we've tested the HFActionEvent in a while... this looks possibly dubious
// this ends the HFActionEvent
HFActionEvent endActionEvent(HFActionEvent::endType(),
computePickRay(getTrueMouse().x, getTrueMouse().y));
computePickRay(getMouse().x, getMouse().y));
sendEvent(this, &endActionEvent);
}
break;
@ -2577,10 +2579,15 @@ void Application::setLowVelocityFilter(bool lowVelocityFilter) {
}
ivec2 Application::getMouse() {
auto reticlePosition = _compositor.getReticlePosition();
// in the HMD, the reticlePosition is the mouse position
if (isHMDMode()) {
return getTrueMouse(); // FIXME
return reticlePosition;
}
return getTrueMouse();
// in desktop mode, we need to map from global to widget space
return toGlm(_glWidget->mapFromGlobal(QPoint(reticlePosition.x, reticlePosition.y)));
}
FaceTracker* Application::getActiveFaceTracker() {
@ -4738,20 +4745,10 @@ QSize Application::getDeviceSize() const {
return fromGlm(getActiveDisplayPlugin()->getRecommendedRenderSize());
}
PickRay Application::computePickRay() {
return computePickRay(getTrueMouse().x, getTrueMouse().y);
}
bool Application::isThrottleRendering() const {
return getActiveDisplayPlugin()->isThrottled();
}
// FIXME -- consolidate users of getTrueMouse() _compositor.getReticlePosition()
ivec2 Application::getTrueMouse() {
auto reticlePosition = _compositor.getReticlePosition();
return toGlm(_glWidget->mapFromGlobal(QPoint(reticlePosition.x, reticlePosition.y)));
}
bool Application::hasFocus() const {
return getActiveDisplayPlugin()->hasFocus();
}

2
interface/src/Application.h
View file

@ -119,7 +119,6 @@ public:
glm::uvec2 getUiSize() const;
QSize getDeviceSize() const;
bool hasFocus() const;
PickRay computePickRay();
bool isThrottleRendering() const;
@ -142,7 +141,6 @@ public:
EntityEditPacketSender* getEntityEditPacketSender() { return &_entityEditSender; }
ivec2 getMouse();
ivec2 getTrueMouse();
FaceTracker* getActiveFaceTracker();
FaceTracker* getSelectedFaceTracker();