diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2020-02-25 14:37:45 +0200 |
|---|---|---|
| committer | Norihito Tohge <norihito.tohge@qt.io> | 2020-03-04 06:27:45 +0000 |
| commit | a77ef4ca7f53e35980d3b2237140d6d8a0571343 (patch) | |
| tree | 0f8a4f18a83608bf9db0928af2fb876e5b0956b5 /share/qtcreator/qml/qmlpuppet/mockfiles/MoveGizmo.qml | |
| parent | 59560fb81771b9075bcaa9068f99b5ff4ee85b44 (diff) | |
QmlDesigner: Port Edit 3D View to 5.15
Qt 5.15.0 is now the minimum version to enable Edit 3D view.
Change-Id: I15cee59e6a7665477825caa0ae412fc6ac7b570a
Fixes: QDS-1694
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/mockfiles/MoveGizmo.qml')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/mockfiles/MoveGizmo.qml | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/MoveGizmo.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/MoveGizmo.qml index a6e32441df..adb6f23a48 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/MoveGizmo.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/MoveGizmo.qml @@ -24,7 +24,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick3D 1.0 +import QtQuick3D 1.15 import MouseArea3D 1.0 Node { @@ -40,13 +40,13 @@ Node { property MouseArea3D dragHelper: null position: dragHelper.pivotScenePosition(targetNode) - orientation: targetNode ? targetNode.orientation : Node.LeftHanded onTargetNodeChanged: position = dragHelper.pivotScenePosition(targetNode) Connections { target: moveGizmo.targetNode - onSceneTransformChanged: { + function onSceneTransformChanged() + { moveGizmo.position = moveGizmo.dragHelper.pivotScenePosition(moveGizmo.targetNode); } } @@ -55,14 +55,11 @@ Node { signal positionMove() Node { - rotation: globalOrientation || !moveGizmo.targetNode ? Qt.vector3d(0, 0, 0) + rotation: globalOrientation || !moveGizmo.targetNode ? Qt.quaternion(1, 0, 0, 0) : moveGizmo.targetNode.sceneRotation - rotationOrder: moveGizmo.targetNode ? moveGizmo.targetNode.rotationOrder : Node.YXZ - orientation: moveGizmo.orientation - Arrow { id: arrowX - rotation: Qt.vector3d(0, 0, -90) + eulerRotation: Qt.vector3d(0, 0, -90) targetNode: moveGizmo.targetNode color: highlightOnHover && (hovering || dragging) ? Qt.lighter(Qt.rgba(1, 0, 0, 1)) : Qt.rgba(1, 0, 0, 1) @@ -76,7 +73,7 @@ Node { Arrow { id: arrowY - rotation: Qt.vector3d(0, 0, 0) + eulerRotation: Qt.vector3d(0, 0, 0) targetNode: moveGizmo.targetNode color: highlightOnHover && (hovering || dragging) ? Qt.lighter(Qt.rgba(0, 0.6, 0, 1)) : Qt.rgba(0, 0.6, 0, 1) @@ -90,7 +87,7 @@ Node { Arrow { id: arrowZ - rotation: Qt.vector3d(90, 0, 0) + eulerRotation: Qt.vector3d(90, 0, 0) targetNode: moveGizmo.targetNode color: highlightOnHover && (hovering || dragging) ? Qt.lighter(Qt.rgba(0, 0, 1, 1)) : Qt.rgba(0, 0, 1, 1) @@ -108,7 +105,7 @@ Node { y: 10 z: 10 - rotation: Qt.vector3d(0, 90, 0) + eulerRotation: Qt.vector3d(0, 90, 0) targetNode: moveGizmo.targetNode color: highlightOnHover && (hovering || dragging) ? Qt.lighter(Qt.rgba(1, 0, 0, 1)) : Qt.rgba(1, 0, 0, 1) @@ -126,7 +123,7 @@ Node { x: 10 z: 10 - rotation: Qt.vector3d(90, 0, 0) + eulerRotation: Qt.vector3d(90, 0, 0) targetNode: moveGizmo.targetNode color: highlightOnHover && (hovering || dragging) ? Qt.lighter(Qt.rgba(0, 0.6, 0, 1)) : Qt.rgba(0, 0.6, 0, 1) @@ -144,7 +141,7 @@ Node { x: 10 y: 10 - rotation: Qt.vector3d(0, 0, 0) + eulerRotation: Qt.vector3d(0, 0, 0) targetNode: moveGizmo.targetNode color: highlightOnHover && (hovering || dragging) ? Qt.lighter(Qt.rgba(0, 0, 1, 1)) : Qt.rgba(0, 0, 1, 1) |