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

whitespace fixes

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-02-21 11:40:15 -08:00
parent 68771c92f7
commit ba36eed9eb
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/ui/ApplicationCompositor.cpp
View file

@ -300,7 +300,7 @@ void ApplicationCompositor::displayOverlayTextureHmd(RenderArgs* renderArgs, int
QPointF ApplicationCompositor::getMouseEventPosition(QMouseEvent* event) { QPointF ApplicationCompositor::getMouseEventPosition(QMouseEvent* event) {
if (qApp->isHMDMode()) { if (qApp->isHMDMode()) {
QMutexLocker locker(&_reticlePositionInHMDLock); QMutexLocker locker(&_reticlePositionInHMDLock);
return QPointF(_reticlePositionInHMD.x, _reticlePositionInHMD.y); return QPointF(_reticlePositionInHMD.x, _reticlePositionInHMD.y);
} }
return event->localPos(); return event->localPos();
@ -355,7 +355,6 @@ bool ApplicationCompositor::handleRealMouseMoveEvent(bool sendFakeEvent) {
// If we're in HMD mode // If we're in HMD mode
if (shouldCaptureMouse()) { if (shouldCaptureMouse()) {
QMutexLocker locker(&_reticlePositionInHMDLock); QMutexLocker locker(&_reticlePositionInHMDLock);
auto newPosition = QCursor::pos(); auto newPosition = QCursor::pos();
auto changeInRealMouse = newPosition - _lastKnownRealMouse; auto changeInRealMouse = newPosition - _lastKnownRealMouse;
auto newReticlePosition = _reticlePositionInHMD + toGlm(changeInRealMouse); auto newReticlePosition = _reticlePositionInHMD + toGlm(changeInRealMouse);
@ -380,7 +379,6 @@ glm::vec2 ApplicationCompositor::getReticlePosition() {
void ApplicationCompositor::setReticlePosition(glm::vec2 position, bool sendFakeEvent) { void ApplicationCompositor::setReticlePosition(glm::vec2 position, bool sendFakeEvent) {
if (qApp->isHMDMode()) { if (qApp->isHMDMode()) {
QMutexLocker locker(&_reticlePositionInHMDLock); QMutexLocker locker(&_reticlePositionInHMDLock);
const float MOUSE_EXTENTS_VERT_ANGULAR_SIZE = 170.0f; // 5deg from poles const float MOUSE_EXTENTS_VERT_ANGULAR_SIZE = 170.0f; // 5deg from poles
const float MOUSE_EXTENTS_VERT_PIXELS = VIRTUAL_SCREEN_SIZE_Y * (MOUSE_EXTENTS_VERT_ANGULAR_SIZE / DEFAULT_HMD_UI_VERT_ANGULAR_SIZE); const float MOUSE_EXTENTS_VERT_PIXELS = VIRTUAL_SCREEN_SIZE_Y * (MOUSE_EXTENTS_VERT_ANGULAR_SIZE / DEFAULT_HMD_UI_VERT_ANGULAR_SIZE);
const float MOUSE_EXTENTS_HORZ_ANGULAR_SIZE = 360.0f; // full sphere const float MOUSE_EXTENTS_HORZ_ANGULAR_SIZE = 360.0f; // full sphere