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

Do not zoom camera when changing view

Browse Source 
When changing the view by clicking the axis helper, maintain the
current view camera zoom

Task-number: QDS-1274
Change-Id: Icb502bd70da1e6348be90a52885366393ea072c6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Mahmoud Badri
2019-11-27 15:48:51 +02:00
parent 811db1129c
commit de141661df
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qml/qmlpuppet/mockfiles/AxisHelper.qml
View File

@@ -120,8 +120,8 @@ View3D {
onPressed: { onPressed: {
pick(mouse); pick(mouse);
if (pickObj) { if (pickObj) {
axisHelperView.editCameraCtrl.fitObject(axisHelperView.selectedNode, axisHelperView.editCameraCtrl.focusObject(axisHelperView.selectedNode,
pickObj.cameraRotation); pickObj.cameraRotation, false);
} else { } else {
mouse.accepted = false; mouse.accepted = false;
} }

6
share/qtcreator/qml/qmlpuppet/mockfiles/EditCameraController.qml
View File

@@ -45,11 +45,11 @@ Item {
property real _defaultCameraLookAtDistance: 0 property real _defaultCameraLookAtDistance: 0
property Camera _prevCamera: null property Camera _prevCamera: null
function fitObject(targetObject, rotation) function focusObject(targetObject, rotation, updateZoom)
{ {
camera.rotation = rotation; camera.rotation = rotation;
var newLookAtAndZoom = _generalHelper.fitObjectToCamera( var newLookAtAndZoom = _generalHelper.focusObjectToCamera(
camera, _defaultCameraLookAtDistance, targetObject, view3d); camera, _defaultCameraLookAtDistance, targetObject, view3d, _zoomFactor, updateZoom);
_lookAtPoint = newLookAtAndZoom.toVector3d(); _lookAtPoint = newLookAtAndZoom.toVector3d();
_zoomFactor = newLookAtAndZoom.w; _zoomFactor = newLookAtAndZoom.w;
} }

2
share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml
View File

@@ -443,7 +443,7 @@ Window {
if (selected) { if (selected) {
var targetNode = viewWindow.selectedNodes.length > 0 var targetNode = viewWindow.selectedNodes.length > 0
? selectionBoxes[0].model : null; ? selectionBoxes[0].model : null;
cameraControl.fitObject(targetNode, editView.camera.rotation); cameraControl.focusObject(targetNode, editView.camera.rotation, true);
} }
} }
} }

12
share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp
View File

@@ -139,8 +139,9 @@ float GeneralHelper::zoomCamera(QQuick3DCamera *camera, float distance, float de
} }
// Return value contains new lookAt point (xyz) and zoom factor (w) // Return value contains new lookAt point (xyz) and zoom factor (w)
QVector4D GeneralHelper::fitObjectToCamera(QQuick3DCamera *camera, float defaultLookAtDistance, QVector4D GeneralHelper::focusObjectToCamera(QQuick3DCamera *camera, float defaultLookAtDistance,
QQuick3DNode *targetObject, QQuick3DViewport *viewPort) QQuick3DNode *targetObject, QQuick3DViewport *viewPort,
float oldZoom, bool updateZoom)
{ {
if (!camera) if (!camera)
return QVector4D(0.f, 0.f, 0.f, 1.f); return QVector4D(0.f, 0.f, 0.f, 1.f);
@@ -189,11 +190,10 @@ QVector4D GeneralHelper::fitObjectToCamera(QQuick3DCamera *camera, float default
camera->setPosition(lookAt + newLookVector); camera->setPosition(lookAt + newLookVector);
// Emprically determined algorithm for nice zoom float newZoomFactor = updateZoom ? qBound(.0001f, float(maxExtent / 700.), 10000.f) : oldZoom;
float newZoomFactor = qBound(.0001f, float(maxExtent / 700.), 10000.f); float cameraZoomFactor = zoomCamera(camera, 0, defaultLookAtDistance, lookAt, newZoomFactor, false);
return QVector4D(lookAt, return QVector4D(lookAt, cameraZoomFactor);
zoomCamera(camera, 0, defaultLookAtDistance, lookAt, newZoomFactor, false));
} }
void GeneralHelper::delayedPropertySet(QObject *obj, int delay, const QString &property, void GeneralHelper::delayedPropertySet(QObject *obj, int delay, const QString &property,

5
share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h
View File

@@ -62,8 +62,9 @@ public:
Q_INVOKABLE float zoomCamera(QQuick3DCamera *camera, float distance, Q_INVOKABLE float zoomCamera(QQuick3DCamera *camera, float distance,
float defaultLookAtDistance, const QVector3D &lookAt, float defaultLookAtDistance, const QVector3D &lookAt,
float zoomFactor, bool relative); float zoomFactor, bool relative);
Q_INVOKABLE QVector4D fitObjectToCamera(QQuick3DCamera *camera, float defaultLookAtDistance, Q_INVOKABLE QVector4D focusObjectToCamera(QQuick3DCamera *camera, float defaultLookAtDistance,
QQuick3DNode *targetObject, QQuick3DViewport *viewPort); QQuick3DNode *targetObject, QQuick3DViewport *viewPort,
float oldZoom, bool updateZoom = true);
Q_INVOKABLE void delayedPropertySet(QObject *obj, int delay, const QString &property, Q_INVOKABLE void delayedPropertySet(QObject *obj, int delay, const QString &property,
const QVariant& value); const QVariant& value);