feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
ab5fdd94f334a2517510c6b51e89dbac49d561d4
qt-creator/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/ScaleGizmo.qml

243 lines
8.8 KiB
QML
Raw Normal View History

QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
QmlPuppet: Add separate set of qml files for Qt6 for 3D editor Import QtQuick3D 1.15 no longer works in Qt 6.2, so provide a separate set of qml files for each major Qt version. Fixes: QDS-4642 Change-Id: I3e17fb248f71f87fb9a40dcad3c03e037cafb0f4 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-28 14:04:43 +03:00
import QtQuick 6.0
import QtQuick3D 6.0
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
import MouseArea3D 1.0
Node {
id: scaleGizmo
property View3D view3D
property bool highlightOnHover: false
property Node targetNode: null
readonly property bool dragging: scaleRodX.dragging || scaleRodY.dragging || scaleRodZ.dragging
QmlDesigner: Add planar move and scale handles to gizmos Change-Id: Icae60ec35fc84d731243a005e97b174fa9a94815 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-11-05 15:38:12 +02:00
|| planeX.dragging || planeY.dragging || planeZ.dragging
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
|| centerMouseArea.dragging
Use separate MouseArea3D to calculate drag vector Using the MouseArea3D linked to gizmo to manage the drag leads to slight unwanted drift on the drag plane, as it moves with the gizmo. Fixed by using a helper MouseArea3D to calculate drag vector. Helper area's transform is set at mouse press time and is not changed during the drag. Change-Id: I50d3f738277bd34005c977423d114abc8dbed520 Fixes: QDS-1312 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-10 13:14:30 +02:00
property MouseArea3D dragHelper: null
QmlDesigner: Allow starting free drag on initial selection press Changed object selection to be done on press instead of click, and the initial press now also starts free drag of the selected object after a short distance moved to prevent accidental drags. Change-Id: I61656661cd734d167ef9f8db42d986f0e97402a3 Fixes: QDS-2376 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-06-30 14:48:34 +03:00
property alias freeDraggerArea: centerMouseArea
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
QmlDesigner: Show 3D edit view gizmos at pivot point of node Change-Id: I6eb6b2674868d9251e568249cfabc105d0c715d7 Fixes: QDS-1354 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-01-09 13:31:42 +02:00
position: dragHelper.pivotScenePosition(targetNode)
QmlDesigner: Fix 3D edit gizmos orientation and rotation order When selected node has non-default rotation order or orientation, gizmos need to account for that. Change-Id: Ie3817fd057b43f708ac1feea3e98e1e44f56d66a Fixes: QDS-1290 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-03 14:16:42 +02:00
QmlDesigner: Show 3D edit view gizmos at pivot point of node Change-Id: I6eb6b2674868d9251e568249cfabc105d0c715d7 Fixes: QDS-1354 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-01-09 13:31:42 +02:00
onTargetNodeChanged: position = dragHelper.pivotScenePosition(targetNode)
Connections {
target: scaleGizmo.targetNode
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>
2020-02-25 14:37:45 +02:00
function onSceneTransformChanged()
{
QmlDesigner: Show 3D edit view gizmos at pivot point of node Change-Id: I6eb6b2674868d9251e568249cfabc105d0c715d7 Fixes: QDS-1354 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-01-09 13:31:42 +02:00
scaleGizmo.position = scaleGizmo.dragHelper.pivotScenePosition(scaleGizmo.targetNode);
}
}
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
signal scaleCommit()
signal scaleChange()
Node {
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>
2020-02-25 14:37:45 +02:00
rotation: !targetNode ? Qt.quaternion(1, 0, 0, 0) : targetNode.sceneRotation
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
ScaleRod {
id: scaleRodX
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>
2020-02-25 14:37:45 +02:00
eulerRotation: Qt.vector3d(0, 0, -90)
QmlDesigner: Fix scale gizmo for child objects As global space scaling is not supported, the scaling algorithm could be simplified a lot. Now scaling gizmos work off the relative distance along the scaling rod/plane instead of going through global space, removing the need for complicated and error prone transformations. Change-Id: Iaf0d5b2f31f10ae0b26b6a59b36e9ee4498838c9 Fixes: QDS-1269 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-01-14 14:33:58 +02:00
axis: Qt.vector3d(1, 0, 0)
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
targetNode: scaleGizmo.targetNode
color: highlightOnHover && (hovering || dragging) ? Qt.lighter(Qt.rgba(1, 0, 0, 1))
: Qt.rgba(1, 0, 0, 1)
view3D: scaleGizmo.view3D
active: scaleGizmo.visible
Use separate MouseArea3D to calculate drag vector Using the MouseArea3D linked to gizmo to manage the drag leads to slight unwanted drift on the drag plane, as it moves with the gizmo. Fixed by using a helper MouseArea3D to calculate drag vector. Helper area's transform is set at mouse press time and is not changed during the drag. Change-Id: I50d3f738277bd34005c977423d114abc8dbed520 Fixes: QDS-1312 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-10 13:14:30 +02:00
dragHelper: scaleGizmo.dragHelper
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
onScaleCommit: scaleGizmo.scaleCommit()
onScaleChange: scaleGizmo.scaleChange()
}
ScaleRod {
id: scaleRodY
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>
2020-02-25 14:37:45 +02:00
eulerRotation: Qt.vector3d(0, 0, 0)
QmlDesigner: Fix scale gizmo for child objects As global space scaling is not supported, the scaling algorithm could be simplified a lot. Now scaling gizmos work off the relative distance along the scaling rod/plane instead of going through global space, removing the need for complicated and error prone transformations. Change-Id: Iaf0d5b2f31f10ae0b26b6a59b36e9ee4498838c9 Fixes: QDS-1269 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-01-14 14:33:58 +02:00
axis: Qt.vector3d(0, 1, 0)
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
targetNode: scaleGizmo.targetNode
color: highlightOnHover && (hovering || dragging) ? Qt.lighter(Qt.rgba(0, 0.6, 0, 1))
: Qt.rgba(0, 0.6, 0, 1)
view3D: scaleGizmo.view3D
active: scaleGizmo.visible
Use separate MouseArea3D to calculate drag vector Using the MouseArea3D linked to gizmo to manage the drag leads to slight unwanted drift on the drag plane, as it moves with the gizmo. Fixed by using a helper MouseArea3D to calculate drag vector. Helper area's transform is set at mouse press time and is not changed during the drag. Change-Id: I50d3f738277bd34005c977423d114abc8dbed520 Fixes: QDS-1312 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-10 13:14:30 +02:00
dragHelper: scaleGizmo.dragHelper
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
onScaleCommit: scaleGizmo.scaleCommit()
onScaleChange: scaleGizmo.scaleChange()
}
ScaleRod {
id: scaleRodZ
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>
2020-02-25 14:37:45 +02:00
eulerRotation: Qt.vector3d(90, 0, 0)
QmlDesigner: Fix scale gizmo for child objects As global space scaling is not supported, the scaling algorithm could be simplified a lot. Now scaling gizmos work off the relative distance along the scaling rod/plane instead of going through global space, removing the need for complicated and error prone transformations. Change-Id: Iaf0d5b2f31f10ae0b26b6a59b36e9ee4498838c9 Fixes: QDS-1269 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-01-14 14:33:58 +02:00
axis: Qt.vector3d(0, 0, 1)
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
targetNode: scaleGizmo.targetNode
color: highlightOnHover && (hovering || dragging) ? Qt.lighter(Qt.rgba(0, 0, 1, 1))
: Qt.rgba(0, 0, 1, 1)
view3D: scaleGizmo.view3D
active: scaleGizmo.visible
Use separate MouseArea3D to calculate drag vector Using the MouseArea3D linked to gizmo to manage the drag leads to slight unwanted drift on the drag plane, as it moves with the gizmo. Fixed by using a helper MouseArea3D to calculate drag vector. Helper area's transform is set at mouse press time and is not changed during the drag. Change-Id: I50d3f738277bd34005c977423d114abc8dbed520 Fixes: QDS-1312 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-10 13:14:30 +02:00
dragHelper: scaleGizmo.dragHelper
QmlDesigner: Add planar move and scale handles to gizmos Change-Id: Icae60ec35fc84d731243a005e97b174fa9a94815 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-11-05 15:38:12 +02:00
onScaleCommit: scaleGizmo.scaleCommit()
onScaleChange: scaleGizmo.scaleChange()
}
PlanarScaleHandle {
id: planeX
y: 10
z: 10
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>
2020-02-25 14:37:45 +02:00
eulerRotation: Qt.vector3d(0, 90, 0)
QmlDesigner: Fix scale gizmo for child objects As global space scaling is not supported, the scaling algorithm could be simplified a lot. Now scaling gizmos work off the relative distance along the scaling rod/plane instead of going through global space, removing the need for complicated and error prone transformations. Change-Id: Iaf0d5b2f31f10ae0b26b6a59b36e9ee4498838c9 Fixes: QDS-1269 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-01-14 14:33:58 +02:00
axisX: Qt.vector3d(0, 0, -1)
axisY: Qt.vector3d(0, 1, 0)
QmlDesigner: Add planar move and scale handles to gizmos Change-Id: Icae60ec35fc84d731243a005e97b174fa9a94815 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-11-05 15:38:12 +02:00
targetNode: scaleGizmo.targetNode
color: highlightOnHover && (hovering || dragging) ? Qt.lighter(Qt.rgba(1, 0, 0, 1))
: Qt.rgba(1, 0, 0, 1)
view3D: scaleGizmo.view3D
active: scaleGizmo.visible
Use separate MouseArea3D to calculate drag vector Using the MouseArea3D linked to gizmo to manage the drag leads to slight unwanted drift on the drag plane, as it moves with the gizmo. Fixed by using a helper MouseArea3D to calculate drag vector. Helper area's transform is set at mouse press time and is not changed during the drag. Change-Id: I50d3f738277bd34005c977423d114abc8dbed520 Fixes: QDS-1312 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-10 13:14:30 +02:00
dragHelper: scaleGizmo.dragHelper
QmlDesigner: Add planar move and scale handles to gizmos Change-Id: Icae60ec35fc84d731243a005e97b174fa9a94815 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-11-05 15:38:12 +02:00
onScaleCommit: scaleGizmo.scaleCommit()
onScaleChange: scaleGizmo.scaleChange()
}
PlanarScaleHandle {
id: planeY
x: 10
z: 10
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>
2020-02-25 14:37:45 +02:00
eulerRotation: Qt.vector3d(90, 0, 0)
QmlDesigner: Fix scale gizmo for child objects As global space scaling is not supported, the scaling algorithm could be simplified a lot. Now scaling gizmos work off the relative distance along the scaling rod/plane instead of going through global space, removing the need for complicated and error prone transformations. Change-Id: Iaf0d5b2f31f10ae0b26b6a59b36e9ee4498838c9 Fixes: QDS-1269 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-01-14 14:33:58 +02:00
axisX: Qt.vector3d(1, 0, 0)
axisY: Qt.vector3d(0, 0, 1)
QmlDesigner: Add planar move and scale handles to gizmos Change-Id: Icae60ec35fc84d731243a005e97b174fa9a94815 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-11-05 15:38:12 +02:00
targetNode: scaleGizmo.targetNode
color: highlightOnHover && (hovering || dragging) ? Qt.lighter(Qt.rgba(0, 0.6, 0, 1))
: Qt.rgba(0, 0.6, 0, 1)
view3D: scaleGizmo.view3D
active: scaleGizmo.visible
Use separate MouseArea3D to calculate drag vector Using the MouseArea3D linked to gizmo to manage the drag leads to slight unwanted drift on the drag plane, as it moves with the gizmo. Fixed by using a helper MouseArea3D to calculate drag vector. Helper area's transform is set at mouse press time and is not changed during the drag. Change-Id: I50d3f738277bd34005c977423d114abc8dbed520 Fixes: QDS-1312 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-10 13:14:30 +02:00
dragHelper: scaleGizmo.dragHelper
QmlDesigner: Add planar move and scale handles to gizmos Change-Id: Icae60ec35fc84d731243a005e97b174fa9a94815 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-11-05 15:38:12 +02:00
onScaleCommit: scaleGizmo.scaleCommit()
onScaleChange: scaleGizmo.scaleChange()
}
PlanarScaleHandle {
id: planeZ
x: 10
y: 10
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>
2020-02-25 14:37:45 +02:00
eulerRotation: Qt.vector3d(0, 0, 0)
QmlDesigner: Fix scale gizmo for child objects As global space scaling is not supported, the scaling algorithm could be simplified a lot. Now scaling gizmos work off the relative distance along the scaling rod/plane instead of going through global space, removing the need for complicated and error prone transformations. Change-Id: Iaf0d5b2f31f10ae0b26b6a59b36e9ee4498838c9 Fixes: QDS-1269 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-01-14 14:33:58 +02:00
axisX: Qt.vector3d(1, 0, 0)
axisY: Qt.vector3d(0, 1, 0)
QmlDesigner: Add planar move and scale handles to gizmos Change-Id: Icae60ec35fc84d731243a005e97b174fa9a94815 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-11-05 15:38:12 +02:00
targetNode: scaleGizmo.targetNode
color: highlightOnHover && (hovering || dragging) ? Qt.lighter(Qt.rgba(0, 0, 1, 1))
: Qt.rgba(0, 0, 1, 1)
view3D: scaleGizmo.view3D
active: scaleGizmo.visible
Use separate MouseArea3D to calculate drag vector Using the MouseArea3D linked to gizmo to manage the drag leads to slight unwanted drift on the drag plane, as it moves with the gizmo. Fixed by using a helper MouseArea3D to calculate drag vector. Helper area's transform is set at mouse press time and is not changed during the drag. Change-Id: I50d3f738277bd34005c977423d114abc8dbed520 Fixes: QDS-1312 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-10 13:14:30 +02:00
dragHelper: scaleGizmo.dragHelper
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
onScaleCommit: scaleGizmo.scaleCommit()
onScaleChange: scaleGizmo.scaleChange()
}
}
Model {
id: centerCube
Use global picking API When gobal picking is available (Qt 6.2+), use that instead of toggling models pickable properties. Task-number: QDS-4978 Change-Id: Id2a501ae97955128874447fa8a3b8afab3d1f2c7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-09-06 14:24:23 +03:00
readonly property bool _edit3dLocked: true // Make this non-pickable
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
source: "#Cube"
scale: Qt.vector3d(0.024, 0.024, 0.024)
materials: DefaultMaterial {
id: material
QmlDesigner: Fix 3D overlay object colors Recent changes to Quick3D changed how NoLighting materials work. Emissive color no longer has effect in that case, so use diffuse color instead. Change-Id: Idde43f5bdf06a432a5dd06f9c52d6812fa790a73 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-08-04 10:19:24 +03:00
diffuseColor: highlightOnHover
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
&& (centerMouseArea.hovering || centerMouseArea.dragging)
? Qt.lighter(Qt.rgba(0.5, 0.5, 0.5, 1))
: Qt.rgba(0.5, 0.5, 0.5, 1)
lighting: DefaultMaterial.NoLighting
}
MouseArea3D {
id: centerMouseArea
view3D: scaleGizmo.view3D
x: -60
y: -60
width: 120
height: 120
rotation: view3D.camera.rotation
grabsMouse: scaleGizmo.targetNode
QmlDesigner: Fix draggable priorities in 3D edit gizmos Upped default priority of all directional draggables a bit to make them preferable to free rotation ball. Change-Id: If934cb723e8c1a8ca9a114d71b19cbfc196e2682 Fixes: QDS-2286 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-06-26 16:25:46 +03:00
priority: 10
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
active: scaleGizmo.visible
Use separate MouseArea3D to calculate drag vector Using the MouseArea3D linked to gizmo to manage the drag leads to slight unwanted drift on the drag plane, as it moves with the gizmo. Fixed by using a helper MouseArea3D to calculate drag vector. Helper area's transform is set at mouse press time and is not changed during the drag. Change-Id: I50d3f738277bd34005c977423d114abc8dbed520 Fixes: QDS-1312 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-10 13:14:30 +02:00
dragHelper: scaleGizmo.dragHelper
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
Use separate MouseArea3D to calculate drag vector Using the MouseArea3D linked to gizmo to manage the drag leads to slight unwanted drift on the drag plane, as it moves with the gizmo. Fixed by using a helper MouseArea3D to calculate drag vector. Helper area's transform is set at mouse press time and is not changed during the drag. Change-Id: I50d3f738277bd34005c977423d114abc8dbed520 Fixes: QDS-1312 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-10 13:14:30 +02:00
property vector3d _startScale
property point _startScreenPos
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
function localScale(screenPos)
{
var yDelta = screenPos.y - _startScreenPos.y;
if (yDelta === 0)
Use separate MouseArea3D to calculate drag vector Using the MouseArea3D linked to gizmo to manage the drag leads to slight unwanted drift on the drag plane, as it moves with the gizmo. Fixed by using a helper MouseArea3D to calculate drag vector. Helper area's transform is set at mouse press time and is not changed during the drag. Change-Id: I50d3f738277bd34005c977423d114abc8dbed520 Fixes: QDS-1312 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-10 13:14:30 +02:00
return _startScale;
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
var scaler = 1.0 + (yDelta * 0.025);
QmlDesigner: Add planar move and scale handles to gizmos Change-Id: Icae60ec35fc84d731243a005e97b174fa9a94815 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-11-05 15:38:12 +02:00
if (scaler === 0)
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
scaler = 0.0001;
return Qt.vector3d(scaler * _startScale.x,
scaler * _startScale.y,
scaler * _startScale.z);
}
QmlPuppet: Fix runtime warnings in 3D editor Fixes: QDS-4491 Change-Id: I462e165ef59111f70c928b7d652ade99c5b3c0d0 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-06-08 16:13:18 +03:00
onPressed: (planePos, screenPos)=> {
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
if (!scaleGizmo.targetNode)
return;
QmlPuppet: Support multiselection transformations in 3D edit view Add support for moving, rotating, and scaling a multiselection of 3D nodes in 3D edit view. Fixes: QDS-4313 Change-Id: Icf83911ac6f87fde1cb79d6f5059ae01ed434d7f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-07 15:41:58 +03:00
if (targetNode == multiSelectionNode)
_generalHelper.restartMultiSelection();
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
// Recreate vector so we don't follow the changes in targetNode.scale
_startScale = Qt.vector3d(scaleGizmo.targetNode.scale.x,
scaleGizmo.targetNode.scale.y,
scaleGizmo.targetNode.scale.z);
_startScreenPos = screenPos;
}
QmlPuppet: Fix runtime warnings in 3D editor Fixes: QDS-4491 Change-Id: I462e165ef59111f70c928b7d652ade99c5b3c0d0 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-06-08 16:13:18 +03:00
onDragged: (planePos, screenPos)=> {
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
if (!scaleGizmo.targetNode)
return;
scaleGizmo.targetNode.scale = localScale(screenPos);
QmlPuppet: Support multiselection transformations in 3D edit view Add support for moving, rotating, and scaling a multiselection of 3D nodes in 3D edit view. Fixes: QDS-4313 Change-Id: Icf83911ac6f87fde1cb79d6f5059ae01ed434d7f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-07 15:41:58 +03:00
if (targetNode == multiSelectionNode)
_generalHelper.scaleMultiSelection(false);
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
scaleGizmo.scaleChange();
}
QmlPuppet: Fix runtime warnings in 3D editor Fixes: QDS-4491 Change-Id: I462e165ef59111f70c928b7d652ade99c5b3c0d0 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-06-08 16:13:18 +03:00
onReleased: (planePos, screenPos)=> {
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
if (!scaleGizmo.targetNode)
return;
scaleGizmo.targetNode.scale = localScale(screenPos);
QmlPuppet: Support multiselection transformations in 3D edit view Add support for moving, rotating, and scaling a multiselection of 3D nodes in 3D edit view. Fixes: QDS-4313 Change-Id: Icf83911ac6f87fde1cb79d6f5059ae01ed434d7f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-07 15:41:58 +03:00
if (targetNode == multiSelectionNode)
_generalHelper.scaleMultiSelection(true);
QmlDesigner: Add ScaleGizmo to 3D edit view ScaleGizmo allows scaling in the direction of local or global axes, as well as uniform scaling. Any scale component cannot be made negative with ScaleGizmo. Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20 Fixes: QDS-1195 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-10-31 10:46:14 +02:00
scaleGizmo.scaleCommit();
}
}
}
}
Copy Permalink