diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/render/frontend/qcamera.h | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/render/frontend/qcamera.h')
-rw-r--r-- | src/render/frontend/qcamera.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/render/frontend/qcamera.h b/src/render/frontend/qcamera.h index f5bd49fa2..5c86ea122 100644 --- a/src/render/frontend/qcamera.h +++ b/src/render/frontend/qcamera.h @@ -72,6 +72,7 @@ class QT3DRENDERSHARED_EXPORT QCamera : public Qt3DCore::QEntity Q_PROPERTY(float bottom READ bottom WRITE setBottom NOTIFY bottomChanged) Q_PROPERTY(float top READ top WRITE setTop NOTIFY topChanged) Q_PROPERTY(QMatrix4x4 projectionMatrix READ projectionMatrix WRITE setProjectionMatrix NOTIFY projectionMatrixChanged) + Q_PROPERTY(float exposure READ exposure WRITE setExposure NOTIFY exposureChanged REVISION 9) // LookAt Q_PROPERTY(QVector3D position READ position WRITE setPosition NOTIFY positionChanged) Q_PROPERTY(QVector3D upVector READ upVector WRITE setUpVector NOTIFY upVectorChanged) @@ -126,6 +127,7 @@ public: float bottom() const; float top() const; QMatrix4x4 projectionMatrix() const; + float exposure() const; QVector3D position() const; QVector3D upVector() const; QVector3D viewCenter() const; @@ -143,10 +145,15 @@ public Q_SLOTS: void setBottom(float bottom); void setTop(float top); void setProjectionMatrix(const QMatrix4x4 &projectionMatrix); + void setExposure(float exposure); void setPosition(const QVector3D &position); void setUpVector(const QVector3D &upVector); void setViewCenter(const QVector3D &viewCenter); + void viewAll(); + void viewSphere(const QVector3D ¢er, float radius); + void viewEntity(Qt3DCore::QEntity *entity); + Q_SIGNALS: void projectionTypeChanged(QCameraLens::ProjectionType projectionType); void nearPlaneChanged(float nearPlane); @@ -158,6 +165,7 @@ Q_SIGNALS: void bottomChanged(float bottom); void topChanged(float top); void projectionMatrixChanged(const QMatrix4x4 &projectionMatrix); + void exposureChanged(float exposure); void positionChanged(const QVector3D &position); void upVectorChanged(const QVector3D &upVector); void viewCenterChanged(const QVector3D &viewCenter); |