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

Fixed JS picking in oculus

Browse source
This commit is contained in:
Atlante45 2014-12-04 18:53:30 -08:00
parent 84da070901
commit 9f444581e9
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -1288,7 +1288,6 @@ void Application::mouseMoveEvent(QMouseEvent* event, unsigned int deviceID) {
}
void Application::mousePressEvent(QMouseEvent* event, unsigned int deviceID) {
if (!_aboutToQuit) {
_entities.mousePressEvent(event, deviceID);
}

9
interface/src/ui/overlays/Overlays.cpp
View file

@ -11,6 +11,7 @@
#include <limits>
#include <typeinfo>
#include <Application.h>
#include <devices/OculusManager.h>
#include <Menu.h>
#include <QScriptValueIterator>
@ -244,6 +245,11 @@ void Overlays::deleteOverlay(unsigned int id) {
}
unsigned int Overlays::getOverlayAtPoint(const glm::vec2& point) {
glm::vec2 pointCpy = point;
if (OculusManager::isConnected()) {
pointCpy = Application::getInstance()->getApplicationOverlay().screenToOverlay(point);
}
QReadLocker lock(&_lock);
QMapIterator<unsigned int, Overlay*> i(_overlays2D);
i.toBack();
@ -251,7 +257,8 @@ unsigned int Overlays::getOverlayAtPoint(const glm::vec2& point) {
i.previous();
unsigned int thisID = i.key();
Overlay2D* thisOverlay = static_cast<Overlay2D*>(i.value());
if (thisOverlay->getVisible() && thisOverlay->isLoaded() && thisOverlay->getBounds().contains(point.x, point.y, false)) {
if (thisOverlay->getVisible() && thisOverlay->isLoaded() &&
thisOverlay->getBounds().contains(pointCpy.x, pointCpy.y, false)) {
return thisID;
}
}