diff --git a/src/core/mouse_controller.cpp b/src/core/mouse_controller.cpp index 9a47b08..27daf52 100644 --- a/src/core/mouse_controller.cpp +++ b/src/core/mouse_controller.cpp @@ -93,8 +93,8 @@ void MouseController::mouseReleaseEvent(QMouseEvent * e) { void MouseController::mousePressEvent(QMouseEvent * e) { - QPoint cpos = e->pos() * view->devicePixelRatio(); - downPos = cpos; + QPoint cpos = e->pos() * view->devicePixelRatio(); + downPos = cpos; if (cur_action != RendererService::haNoAction && e->buttons() == Qt::LeftButton) { return; } @@ -103,15 +103,15 @@ void MouseController::mousePressEvent(QMouseEvent * e) { view->renderer_.mouse_rect = QRect(); return; } - if (!QRect(QPoint(), view->size()).contains(cpos)) return; - lastPos = cpos; - downPos = cpos; + if (!QRect(QPoint(), view->size() * view->devicePixelRatio()).contains(cpos)) return; + lastPos = cpos; + downPos = cpos; emit view->glMousePressEvent(e); } void MouseController::mouseMoveEvent(QMouseEvent * e) { - QPoint cpos = e->pos() * view->devicePixelRatio(); + QPoint cpos = e->pos() * view->devicePixelRatio(); if (cur_action != RendererService::haNoAction && (e->buttons() == Qt::LeftButton)) { RendererService & rs(view->renderer_.rend_service); ObjectBaseList objects = view->scene()->selectedObjects(true); @@ -145,7 +145,7 @@ void MouseController::mouseMoveEvent(QMouseEvent * e) { mouse_vector[1] *= -1.; if (cur_action == RendererService::haMove) { double len_scl = 1. / QVector3D(axe_screen.x(), axe_screen.y(), 1.E-6).length(); - mouse_vector /= QVector3D(view->pixelWidth(), view->pixelHeight(), 1); + mouse_vector /= QVector3D(view->pixelWidth(), view->pixelHeight(), 1); mouse_vector *= -center_screen.z() * len_scl; axe_vector *= QVector3D::dotProduct(axe_screen, mouse_vector); QMatrix4x4 pmat; @@ -188,9 +188,10 @@ void MouseController::mouseMoveEvent(QMouseEvent * e) { axe_vector[a] = 1.; foreach(ObjectBase * o, objects) o->scale(QVector3D(1, 1, 1) + (axe_vector * sc)); - QCursor::setPos(view->mapToGlobal(downPos)); - } else - lastPos = cpos; + QCursor::setPos(view->mapToGlobal(downPos / view->devicePixelRatio())); + } else { + lastPos = cpos; + } emit view->objectsPositionChanged(); return; } @@ -205,16 +206,16 @@ void MouseController::mouseMoveEvent(QMouseEvent * e) { } return; } - QRect g_rect(QPoint(), view->size()); + QRect g_rect(QPoint(), view->size() * view->devicePixelRatio()); if (mouseRotate_) { - float dx = cpos.x() - lastPos.x(); - float dy = cpos.y() - lastPos.y(); + float dx = cpos.x() - lastPos.x(); + float dy = cpos.y() - lastPos.y(); if (e->buttons().testFlag(QT_MID_BUTTON)) { if (cameraOrbit_) { view->camera()->orbitZ(dx / 4.f); view->camera()->orbitXY(dy / 4.f); } else { - view->camera()->rotateZ(-dx / 4.f); + view->camera()->rotateZ(-dx / 4.f); view->camera()->rotateX(-dy / 4.f); } emit view->cameraPosChanged(view->camera()->pos()); @@ -225,8 +226,8 @@ void MouseController::mouseMoveEvent(QMouseEvent * e) { emit view->cameraPosChanged(view->camera()->pos()); } } - if (customMouseMove_) emit view->customMouseMoveEvent(cpos, lastPos, e->buttons()); - lastPos = cpos; + if (customMouseMove_) emit view->customMouseMoveEvent(cpos, lastPos, e->buttons()); + lastPos = cpos; if (e->buttons() == 0) { cur_handle = QFlags(); cur_action = RendererService::haNoAction; @@ -263,8 +264,8 @@ void MouseController::mouseMoveEvent(QMouseEvent * e) { return; } lastPos = g_rect.center(); - int dx = cpos.x() - lastPos.x(); - int dy = cpos.y() - lastPos.y(); + int dx = cpos.x() - lastPos.x(); + int dy = cpos.y() - lastPos.y(); emit view->glMouseMoveEvent(new QMouseEvent(QEvent::MouseMove, QPoint(dx, dy), e->button(), e->buttons(), e->modifiers())); return; } diff --git a/src/core/qglview.cpp b/src/core/qglview.cpp index 7e4b639..b129c98 100644 --- a/src/core/qglview.cpp +++ b/src/core/qglview.cpp @@ -150,7 +150,7 @@ void QGLView::timerEvent(QTimerEvent *) { void QGLView::render() { resizeGL(pixelWidth(), pixelHeight()); emit glBeginPaint(); - renderer_.mouse_pos = mapFromGlobal(QCursor::pos()); + renderer_.mouse_pos = mapFromGlobal(QCursor::pos()) * devicePixelRatio(); renderer_.renderScene(); emit glEndPaint(); fps_tm = time.elapsed(); diff --git a/src/core/render/renderer.cpp b/src/core/render/renderer.cpp index 47642fc..b7683f2 100644 --- a/src/core/render/renderer.cpp +++ b/src/core/render/renderer.cpp @@ -461,7 +461,7 @@ void Renderer::renderScene() { rend_selection.drawSelection(fbo_out, cur_write_plane); rend_service.renderService(); } else { - fbo_out.blit(cur_write_plane, 0, 0, fbo_out.rect(), QRect(QPoint(), view->size())); + fbo_out.blit(cur_write_plane, 0, 0, fbo_out.rect(), QRect(QPoint(), view->size() * view->devicePixelRatio())); } phase.end();