diff options
author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2022-09-12 16:23:05 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2022-09-13 10:15:34 +0000 |
commit | e15d8346018f8f1643159e1d7bd2cc1ac675c985 (patch) | |
tree | f6baaabcff019c0b8027c7c33698bd819852ef5e /share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d | |
parent | fbb9dd1647c60409dca7f64760b8036f3f38909f (diff) |
QmlDesigner: Create 3D models at the point of context menu trigger
Fixes: QDS-7640
Change-Id: I2f178c2e2661dedc4efe23b675363283e3cd3bc3
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d')
-rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/mousearea3d.h | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/mousearea3d.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/mousearea3d.h index 1cb91cab33..8d911839ac 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/mousearea3d.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/mousearea3d.h @@ -81,22 +81,9 @@ public: QQuick3DNode *pickNode() const; MouseArea3D *dragHelper() const; - static qreal mouseDragMultiplier() { return .02; } - -public slots: - void setView3D(QQuick3DViewport *view3D); - void setGrabsMouse(bool grabsMouse); - void setActive(bool active); - void setCirclePickArea(const QPointF &pickArea); - void setMinAngle(qreal angle); - void setPickNode(QQuick3DNode *node); - void setDragHelper(MouseArea3D *dragHelper); + QVector3D getMousePosInPlane(const MouseArea3D *helper, const QPointF &mousePosInView) const; - void setX(qreal x); - void setY(qreal y); - void setWidth(qreal width); - void setHeight(qreal height); - void setPriority(int level); + static qreal mouseDragMultiplier() { return .02; } Q_INVOKABLE QVector3D rayIntersectsPlane(const QVector3D &rayPos0, const QVector3D &rayPos1, @@ -120,6 +107,21 @@ public slots: Q_INVOKABLE void forceMoveEvent(double x, double y); Q_INVOKABLE void forceReleaseEvent(double x, double y); +public slots: + void setView3D(QQuick3DViewport *view3D); + void setGrabsMouse(bool grabsMouse); + void setActive(bool active); + void setCirclePickArea(const QPointF &pickArea); + void setMinAngle(qreal angle); + void setPickNode(QQuick3DNode *node); + void setDragHelper(MouseArea3D *dragHelper); + + void setX(qreal x); + void setY(qreal y); + void setWidth(qreal width); + void setHeight(qreal height); + void setPriority(int level); + signals: void view3DChanged(); @@ -153,7 +155,6 @@ private: void setHovering(bool enable); QVector3D getNormal() const; QVector3D getCameraToNodeDir(QQuick3DNode *node) const; - QVector3D getMousePosInPlane(const MouseArea3D *helper, const QPointF &mousePosInView) const; Q_DISABLE_COPY(MouseArea3D) QQuick3DViewport *m_view3D = nullptr; |