diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-10-15 15:24:50 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-15 14:34:07 +0000 |
| commit | 9a84236fcdd19fad682126904d5305717b407d73 (patch) | |
| tree | 968fe60d2db7f4317943117cc226bfeea098823e /src/render/geometry | |
| parent | 379316e6aa919c0fdda6b0fbaa5b6baf4c81fdca (diff) | |
Use floats for plane geometry size
Task-number: QTBUG-48790
Change-Id: I2fdbf96b3667e3d3a78a57cddf14a06e5ff7cac3
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/geometry')
| -rw-r--r-- | src/render/geometry/qplanegeometry.cpp | 4 | ||||
| -rw-r--r-- | src/render/geometry/qplanegeometry.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/render/geometry/qplanegeometry.cpp b/src/render/geometry/qplanegeometry.cpp index 58b87797b..952e28f5b 100644 --- a/src/render/geometry/qplanegeometry.cpp +++ b/src/render/geometry/qplanegeometry.cpp @@ -279,13 +279,13 @@ QSize QPlaneGeometry::resolution() const return d->m_meshResolution; } -int QPlaneGeometry::width() const +float QPlaneGeometry::width() const { Q_D(const QPlaneGeometry); return d->m_width; } -int QPlaneGeometry::height() const +float QPlaneGeometry::height() const { Q_D(const QPlaneGeometry); return d->m_height; diff --git a/src/render/geometry/qplanegeometry.h b/src/render/geometry/qplanegeometry.h index 17f963a9a..7012fbfb1 100644 --- a/src/render/geometry/qplanegeometry.h +++ b/src/render/geometry/qplanegeometry.h @@ -49,8 +49,8 @@ class QPlaneGeometryPrivate; class QT3DRENDERERSHARED_EXPORT QPlaneGeometry : public QGeometry { Q_OBJECT - Q_PROPERTY(int width READ width WRITE setWidth NOTIFY widthChanged) - Q_PROPERTY(int height READ height WRITE setHeight NOTIFY heightChanged) + Q_PROPERTY(float width READ width WRITE setWidth NOTIFY widthChanged) + Q_PROPERTY(float height READ height WRITE setHeight NOTIFY heightChanged) Q_PROPERTY(QSize resolution READ resolution WRITE setResolution NOTIFY resolutionChanged) public: explicit QPlaneGeometry(QNode *parent = Q_NULLPTR); @@ -64,8 +64,8 @@ public: void setHeight(float height); QSize resolution() const; - int width() const; - int height() const; + float width() const; + float height() const; Q_SIGNALS: void resolutionChanged(); |