From 4cea17da05a811215fd23dba8e11adcd00016a8f Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Wed, 25 Jan 2017 15:05:19 +0100 Subject: Add missing properties to QSkyboxEntity Also adjust the signal name for baseName, looked like a missed API change. Change-Id: Ifc6074bfec79ec147bd3549f458f806865d93494 Reviewed-by: Sean Harmer --- src/extras/defaults/qskyboxentity.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/extras/defaults/qskyboxentity.h') diff --git a/src/extras/defaults/qskyboxentity.h b/src/extras/defaults/qskyboxentity.h index a11d2f0a0..ca5cab6f2 100644 --- a/src/extras/defaults/qskyboxentity.h +++ b/src/extras/defaults/qskyboxentity.h @@ -52,6 +52,8 @@ class QSkyboxEntityPrivate; class QT3DEXTRASSHARED_EXPORT QSkyboxEntity : public Qt3DCore::QEntity { Q_OBJECT + Q_PROPERTY(QString baseName READ baseName WRITE setBaseName NOTIFY baseNameChanged) + Q_PROPERTY(QString extension READ extension WRITE setExtension NOTIFY extensionChanged) public: explicit QSkyboxEntity(Qt3DCore::QNode *parent = nullptr); ~QSkyboxEntity(); @@ -63,7 +65,7 @@ public: QString extension() const; Q_SIGNALS: - void sourceDirectoryChanged(const QString &path); + void baseNameChanged(const QString &path); void extensionChanged(const QString &extension); private: -- cgit v1.2.3 From 861e4d71e34c73e3bd5f550b02448df6fa6279ec Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Tue, 31 Jan 2017 18:13:32 +0100 Subject: SkyboxEntity can gamma correct the fragments This is an opt-in feature, required because dds file tend to need gamma correction while png probably not. Change-Id: I9f32d8f23110fb2fd6b11f33a20018907355e986 Reviewed-by: Sean Harmer --- src/extras/defaults/qskyboxentity.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/extras/defaults/qskyboxentity.h') diff --git a/src/extras/defaults/qskyboxentity.h b/src/extras/defaults/qskyboxentity.h index ca5cab6f2..cc01ff7bb 100644 --- a/src/extras/defaults/qskyboxentity.h +++ b/src/extras/defaults/qskyboxentity.h @@ -54,6 +54,7 @@ class QT3DEXTRASSHARED_EXPORT QSkyboxEntity : public Qt3DCore::QEntity Q_OBJECT Q_PROPERTY(QString baseName READ baseName WRITE setBaseName NOTIFY baseNameChanged) Q_PROPERTY(QString extension READ extension WRITE setExtension NOTIFY extensionChanged) + Q_PROPERTY(bool gammaCorrect READ isGammaCorrectEnabled WRITE setGammaCorrectEnabled NOTIFY gammaCorrectEnabledChanged) public: explicit QSkyboxEntity(Qt3DCore::QNode *parent = nullptr); ~QSkyboxEntity(); @@ -64,9 +65,13 @@ public: void setExtension(const QString &extension); QString extension() const; + void setGammaCorrectEnabled(bool enabled); + bool isGammaCorrectEnabled() const; + Q_SIGNALS: void baseNameChanged(const QString &path); void extensionChanged(const QString &extension); + void gammaCorrectEnabledChanged(bool enabled); private: Q_DECLARE_PRIVATE(QSkyboxEntity) -- cgit v1.2.3 From cd4aac77040dd5500fd8b9d80f700eb0234390f6 Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Thu, 16 Feb 2017 19:58:13 +0100 Subject: Start using REVISION on our properties Adding REVISION 9 on all the new properties from this release. Also registering the extra revisions on the QML side. Change-Id: Ic7eda36bee8ca19508cd73b61cea534f956c6997 Task-Id: QTBUG-58895 Reviewed-by: Sean Harmer --- src/extras/defaults/qskyboxentity.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/extras/defaults/qskyboxentity.h') diff --git a/src/extras/defaults/qskyboxentity.h b/src/extras/defaults/qskyboxentity.h index cc01ff7bb..2cf6bfa60 100644 --- a/src/extras/defaults/qskyboxentity.h +++ b/src/extras/defaults/qskyboxentity.h @@ -54,7 +54,7 @@ class QT3DEXTRASSHARED_EXPORT QSkyboxEntity : public Qt3DCore::QEntity Q_OBJECT Q_PROPERTY(QString baseName READ baseName WRITE setBaseName NOTIFY baseNameChanged) Q_PROPERTY(QString extension READ extension WRITE setExtension NOTIFY extensionChanged) - Q_PROPERTY(bool gammaCorrect READ isGammaCorrectEnabled WRITE setGammaCorrectEnabled NOTIFY gammaCorrectEnabledChanged) + Q_PROPERTY(bool gammaCorrect READ isGammaCorrectEnabled WRITE setGammaCorrectEnabled NOTIFY gammaCorrectEnabledChanged REVISION 9) public: explicit QSkyboxEntity(Qt3DCore::QNode *parent = nullptr); ~QSkyboxEntity(); -- cgit v1.2.3 From 3be805ea4777d79d0589230ccef5dbce487b280c Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Mon, 27 Mar 2017 12:34:43 +0100 Subject: Mark property setters in QSkyboxEntity as slots Change-Id: Ica28b76c9d1846ca2e605c0aa9a20d18a3d7ad1e Reviewed-by: Marc Mutz --- src/extras/defaults/qskyboxentity.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/extras/defaults/qskyboxentity.h') diff --git a/src/extras/defaults/qskyboxentity.h b/src/extras/defaults/qskyboxentity.h index 2cf6bfa60..e49782dc2 100644 --- a/src/extras/defaults/qskyboxentity.h +++ b/src/extras/defaults/qskyboxentity.h @@ -59,14 +59,14 @@ public: explicit QSkyboxEntity(Qt3DCore::QNode *parent = nullptr); ~QSkyboxEntity(); - void setBaseName(const QString &path); QString baseName() const; - - void setExtension(const QString &extension); QString extension() const; + bool isGammaCorrectEnabled() const; +public Q_SLOTS: + void setBaseName(const QString &path); + void setExtension(const QString &extension); void setGammaCorrectEnabled(bool enabled); - bool isGammaCorrectEnabled() const; Q_SIGNALS: void baseNameChanged(const QString &path); -- cgit v1.2.3