feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Remove zoom level from affecting edit camera movement

Browse Source 
When moving the edit camera with keyboard, zoom level no longer is
used as multiplier for the movement.

Fixes: QDS-12274
Change-Id: I59c903b73fef095e619cccc36868605b47f9ec83
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Miikka Heikkinen
2024-04-15 12:33:51 +03:00
parent e5c50c6dea
commit 401bbae862
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/tools/qml2puppet/mockfiles/qt6/EditCameraController.qml
View File

@@ -158,8 +158,7 @@ Item {
function moveCamera(moveVec) function moveCamera(moveVec)
{ {
cameraCtrl._lookAtPoint = _generalHelper.moveCamera(camera, _lookAtPoint, _zoomFactor, cameraCtrl._lookAtPoint = _generalHelper.moveCamera(camera, _lookAtPoint, moveVec);
moveVec);
} }
function getMoveVectorForKey(key) { function getMoveVectorForKey(key) {

5
src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
View File

@@ -157,7 +157,7 @@ QVector3D GeneralHelper::panCamera(QQuick3DCamera *camera, const QMatrix4x4 star
// Moves camera in 3D space and returns new look-at point // Moves camera in 3D space and returns new look-at point
QVector3D GeneralHelper::moveCamera(QQuick3DCamera *camera, const QVector3D &startLookAt, QVector3D GeneralHelper::moveCamera(QQuick3DCamera *camera, const QVector3D &startLookAt,
float zoomFactor, const QVector3D &moveVector) const QVector3D &moveVector)
{ {
if (moveVector.length() < 0.001f) if (moveVector.length() < 0.001f)
@@ -171,7 +171,8 @@ QVector3D GeneralHelper::moveCamera(QQuick3DCamera *camera, const QVector3D &sta
const QVector3D xDelta = xAxis * moveVector.x(); const QVector3D xDelta = xAxis * moveVector.x();
const QVector3D yDelta = yAxis * moveVector.y(); const QVector3D yDelta = yAxis * moveVector.y();
const QVector3D zDelta = zAxis * moveVector.z(); const QVector3D zDelta = zAxis * moveVector.z();
const QVector3D delta = (yDelta - xDelta - zDelta) * zoomFactor; // Delta multiplier for nice default speed in default scene
const QVector3D delta = (yDelta - xDelta - zDelta) * .5f;
camera->setPosition(camera->position() + delta); camera->setPosition(camera->position() + delta);

2
src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.h
View File

@@ -55,7 +55,7 @@ public:
const QVector3D &pressPos, const QVector3D &currentPos, const QVector3D &pressPos, const QVector3D &currentPos,
float zoomFactor); float zoomFactor);
Q_INVOKABLE QVector3D moveCamera(QQuick3DCamera *camera,const QVector3D &startLookAt, Q_INVOKABLE QVector3D moveCamera(QQuick3DCamera *camera,const QVector3D &startLookAt,
float zoomFactor, const QVector3D &moveVector); const QVector3D &moveVector);
Q_INVOKABLE QVector3D rotateCamera(QQuick3DCamera *camera, const QPointF &angles, Q_INVOKABLE QVector3D rotateCamera(QQuick3DCamera *camera, const QPointF &angles,
const QVector3D &lookAtPoint); const QVector3D &lookAtPoint);