diff options
author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-05-27 16:21:28 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-05-27 16:21:28 +0200 |
commit | c4b5dbe1e015889b72defca4418717c5854a7acc (patch) | |
tree | 7ec2092c9b972e1c3b67fe2d647b173834b7cfaa /src/quick3d/quick3d/qt3dquickvaluetypes_p.h | |
parent | b30ce9020637ee970876c1c109a1c730694f3ce7 (diff) | |
parent | 08b40b9be75242505a773dc5b2a96a5ef481d6e6 (diff) |
Merge 5.12 into 5.12.4
Change-Id: I43d66c3533ee546f40c1a1373717721b48fcd23b
Diffstat (limited to 'src/quick3d/quick3d/qt3dquickvaluetypes_p.h')
-rw-r--r-- | src/quick3d/quick3d/qt3dquickvaluetypes_p.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/quick3d/quick3d/qt3dquickvaluetypes_p.h b/src/quick3d/quick3d/qt3dquickvaluetypes_p.h index 46500b935..d1b4a4d5d 100644 --- a/src/quick3d/quick3d/qt3dquickvaluetypes_p.h +++ b/src/quick3d/quick3d/qt3dquickvaluetypes_p.h @@ -79,6 +79,12 @@ class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DColorValueType Q_PROPERTY(qreal g READ g WRITE setG FINAL) Q_PROPERTY(qreal b READ b WRITE setB FINAL) Q_PROPERTY(qreal a READ a WRITE setA FINAL) + Q_PROPERTY(qreal hsvHue READ hsvHue WRITE setHsvHue FINAL) + Q_PROPERTY(qreal hsvSaturation READ hsvSaturation WRITE setHsvSaturation FINAL) + Q_PROPERTY(qreal hsvValue READ hsvValue WRITE setHsvValue FINAL) + Q_PROPERTY(qreal hslHue READ hslHue WRITE setHslHue FINAL) + Q_PROPERTY(qreal hslSaturation READ hslSaturation WRITE setHslSaturation FINAL) + Q_PROPERTY(qreal hslLightness READ hslLightness WRITE setHslLightness FINAL) Q_GADGET public: Q_INVOKABLE QString toString() const; @@ -87,10 +93,22 @@ public: qreal g() const; qreal b() const; qreal a() const; + qreal hsvHue() const; + qreal hsvSaturation() const; + qreal hsvValue() const; + qreal hslHue() const; + qreal hslSaturation() const; + qreal hslLightness() const; void setR(qreal); void setG(qreal); void setB(qreal); void setA(qreal); + void setHsvHue(qreal); + void setHsvSaturation(qreal); + void setHsvValue(qreal); + void setHslHue(qreal); + void setHslSaturation(qreal); + void setHslLightness(qreal); }; class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DVector2DValueType |