diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-25 12:19:18 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-25 14:22:32 +0200 |
commit | e029d0ea1d486dd3dbbfa4519a2125da202f22e4 (patch) | |
tree | fc9f87f637a9adcca5a555355d96717d43eddc77 /src/datavisualization/engine/q3dscene.h | |
parent | e7e01ec065d3874d28e9e28d213783c4275d8813 (diff) |
Change qreals to floats
+ Fix default axes to sensible
+ Fix some rounding errors in surface creation
Task-number: QTRD-2622
Change-Id: I44450efc1e77ac8d8dbefc75814345949b8fb1f1
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/engine/q3dscene.h')
-rw-r--r-- | src/datavisualization/engine/q3dscene.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/datavisualization/engine/q3dscene.h b/src/datavisualization/engine/q3dscene.h index 52de85bb..14854361 100644 --- a/src/datavisualization/engine/q3dscene.h +++ b/src/datavisualization/engine/q3dscene.h @@ -41,7 +41,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DScene : public QObject Q_PROPERTY(bool slicingActive READ isSlicingActive WRITE setSlicingActive NOTIFY slicingActiveChanged) Q_PROPERTY(Q3DCamera* activeCamera READ activeCamera WRITE setActiveCamera NOTIFY activeCameraChanged) Q_PROPERTY(Q3DLight* activeLight READ activeLight WRITE setActiveLight NOTIFY activeLightChanged) - Q_PROPERTY(qreal devicePixelRatio READ devicePixelRatio WRITE setDevicePixelRatio NOTIFY devicePixelRatioChanged) + Q_PROPERTY(float devicePixelRatio READ devicePixelRatio WRITE setDevicePixelRatio NOTIFY devicePixelRatioChanged) public: Q3DScene(QObject *parent = 0); @@ -75,12 +75,12 @@ public: Q3DLight *activeLight() const; void setActiveLight(Q3DLight *light); - qreal devicePixelRatio() const; - void setDevicePixelRatio(qreal pixelRatio); + float devicePixelRatio() const; + void setDevicePixelRatio(float pixelRatio); Q_INVOKABLE void setLightPositionRelativeToCamera(const QVector3D &relativePosition, - qreal fixedRotation = 0.0, - qreal distanceModifier = 0.0); + float fixedRotation = 0.0f, + float distanceModifier = 0.0f); private: void emitNeedRender(); @@ -92,7 +92,7 @@ signals: void slicingActiveChanged(bool isSlicingActive); void activeCameraChanged(const Q3DCamera *camera); void activeLightChanged(const Q3DLight *light); - void devicePixelRatioChanged(qreal pixelRatio); + void devicePixelRatioChanged(float pixelRatio); void needRender(); void selectionQueryPositionChanged(const QPoint position); |