diff options
Diffstat (limited to 'src/quick3d/quick3dscene2d/items/qscene2d.h')
-rw-r--r-- | src/quick3d/quick3dscene2d/items/qscene2d.h | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/src/quick3d/quick3dscene2d/items/qscene2d.h b/src/quick3d/quick3dscene2d/items/qscene2d.h index 2c982668a..73322a9e9 100644 --- a/src/quick3d/quick3dscene2d/items/qscene2d.h +++ b/src/quick3d/quick3dscene2d/items/qscene2d.h @@ -60,11 +60,9 @@ class QT3DQUICKSCENE2DSHARED_EXPORT QScene2D : public Qt3DCore::QNode Q_OBJECT Q_PROPERTY(Qt3DRender::QRenderTargetOutput *output READ output WRITE setOutput NOTIFY outputChanged) - Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) Q_PROPERTY(QScene2D::RenderPolicy renderPolicy READ renderPolicy WRITE setRenderPolicy NOTIFY renderPolicyChanged) - Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged) Q_PROPERTY(QQuickItem *item READ item WRITE setItem NOTIFY itemChanged) - Q_PROPERTY(bool grabMouse READ isGrabMouseEnabled WRITE setGrabMouseEnabled NOTIFY grabMouseChanged) + Q_PROPERTY(bool mouseEnabled READ isMouseEnabled WRITE setMouseEnabled NOTIFY mouseEnabledChanged) Q_CLASSINFO("DefaultProperty", "item") @@ -77,18 +75,11 @@ public: Q_ENUM(RenderPolicy) explicit QScene2D(Qt3DCore::QNode *parent = nullptr); - QScene2D(QQmlEngine *engine, Qt3DCore::QNode *parent = nullptr); - ~QScene2D(); Qt3DRender::QRenderTargetOutput *output() const; - QUrl source() const; - bool loaded() const; QScene2D::RenderPolicy renderPolicy() const; QQuickItem *item() const; - QQmlEngine *engine() const; - bool isGrabMouseEnabled() const; - - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool isMouseEnabled() const; QVector<Qt3DCore::QEntity *> entities(); void addEntity(Qt3DCore::QEntity *entity); @@ -96,26 +87,21 @@ public: public Q_SLOTS: void setOutput(Qt3DRender::QRenderTargetOutput *output); - void setSource(const QUrl &url); void setRenderPolicy(QScene2D::RenderPolicy policy); void setItem(QQuickItem *item); - void setGrabMouseEnabled(bool grab); + void setMouseEnabled(bool enabled); Q_SIGNALS: void outputChanged(Qt3DRender::QRenderTargetOutput *output); - void sourceChanged(const QUrl &url); - void loadedChanged(bool loaded); void renderPolicyChanged(QScene2D::RenderPolicy policy); void itemChanged(QQuickItem *item); - void grabMouseChanged(bool grab); + void mouseEnabledChanged(bool enabled); protected: Q_DECLARE_PRIVATE(QScene2D) private: Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE; - - void sourceLoaded(); }; } // namespace Quick |