Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 05:48:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

clean up debug logs

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-02-18 12:01:03 -08:00
parent 0467930c57
commit 935af6d2cc
2 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/src/Application.cpp
View file

@ -812,11 +812,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
auto reticlePosition = _compositor.getReticlePosition();
offscreenUi->toggleMenu(_glWidget->mapFromGlobal(QPoint(reticlePosition.x, reticlePosition.y)));
} else if (action == controller::toInt(controller::Action::RETICLE_X)) {
qDebug() << "Action::RETICLE_X...";
auto oldPos = _compositor.getReticlePosition();
_compositor.setReticlePosition({ oldPos.x + state, oldPos.y });
} else if (action == controller::toInt(controller::Action::RETICLE_Y)) {
qDebug() << "Action::RETICLE_Y...";
auto oldPos = _compositor.getReticlePosition();
_compositor.setReticlePosition({ oldPos.x, oldPos.y + state });
}
@ -1743,7 +1741,6 @@ bool Application::event(QEvent* event) {
switch (event->type()) {
case QEvent::MouseMove:
//qDebug() << __FUNCTION__ << "(QEvent::MouseMove)... line:" << __LINE__;
mouseMoveEvent((QMouseEvent*)event);
return true;
case QEvent::MouseButtonPress:
@ -1780,9 +1777,6 @@ bool Application::event(QEvent* event) {
case QEvent::Drop:
dropEvent(static_cast<QDropEvent*>(event));
return true;
case QEvent::Leave:
//qDebug() << __FUNCTION__ << "().... QEvent::Leave";
break; // fall through
default:
break;
}
@ -1813,7 +1807,6 @@ bool Application::event(QEvent* event) {
bool Application::eventFilter(QObject* object, QEvent* event) {
if (event->type() == QEvent::Leave) {
//qDebug() << __FUNCTION__ << "().... QEvent::Leave";
_compositor.handleLeaveEvent();
}
@ -2204,7 +2197,6 @@ void Application::mouseMoveEvent(QMouseEvent* event) {
if (_aboutToQuit) {
return;
}
//qDebug() << __FUNCTION__ << "line:" << __LINE__ << "event:" << event << "_fakedMouseEvent:" << _fakedMouseEvent;
maybeToggleMenuVisible(event);
@ -2261,14 +2253,9 @@ void Application::mousePressEvent(QMouseEvent* event) {
// keyboard shortcuts not to be swallowed by them. In particular, WebEngineViews
// will consume all keyboard events.
offscreenUi->unfocusWindows();
//qDebug() << __FUNCTION__ << "event:" << event;
auto eventPosition = _compositor.getMouseEventPosition(event);
QPointF transformedPos = offscreenUi->mapToVirtualScreen(eventPosition, _glWidget);
//qDebug() << __FUNCTION__ << " eventPosition:" << eventPosition;
//qDebug() << __FUNCTION__ << "transformedPos:" << transformedPos;
QMouseEvent mappedEvent(event->type(),
transformedPos,
event->screenPos(), event->button(),

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

@ -290,7 +290,6 @@ void ApplicationCompositor::displayOverlayTextureHmd(RenderArgs* renderArgs, int
_modelTransform.getMatrix(overlayXfm);
auto reticlePosition = getReticlePosition();
//qDebug() << "reticlePosition:" << reticlePosition; // FIXME - remove this debugging
glm::vec2 projection = screenToSpherical(reticlePosition);
float cursorDepth = getReticleDepth();
mat4 pointerXfm = glm::scale(mat4(), vec3(cursorDepth)) * glm::mat4_cast(quat(vec3(-projection.y, projection.x, 0.0f))) * glm::translate(mat4(), vec3(0, 0, -1));
@ -354,8 +353,6 @@ void ApplicationCompositor::setReticlePosition(glm::vec2 position, bool sendFake
auto buttons = QApplication::mouseButtons();
auto modifiers = QApplication::keyboardModifiers();
QMouseEvent event(QEvent::MouseMove, globalPos, button, buttons, modifiers);
//qDebug() << "about to call .... qApp->fakeMouseEvent(&event);";
qApp->fakeMouseEvent(&event);
}
} else {