summaryrefslogtreecommitdiffstats
path: root/src/runtime/q3dsuippresentation_p.h
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2018-09-07 13:26:44 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2018-09-12 13:24:36 +0000
commitfe1c72687bc52072b3f1695859bcebce2392fdb6 (patch)
treefd8ef7898605d9724a5bd49aaba3a9c7ed2e0b31 /src/runtime/q3dsuippresentation_p.h
parentf9fe63833282f1fd08d5d76232862b15dc1a1b39 (diff)
Add fovhorizontal property to cameras
This is a boolean property. If it is true, the fov value will be interpreted as horizontal angle. Since there were change to MetaData.xml, it was was updated to match editor version. Task-number: QT3DS-708 Change-Id: I68ac43c497a344a1f7bfcf25505f0dc4eb4cd6b5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/runtime/q3dsuippresentation_p.h')
-rw-r--r--src/runtime/q3dsuippresentation_p.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/runtime/q3dsuippresentation_p.h b/src/runtime/q3dsuippresentation_p.h
index 9bc6b7c..68e6a04 100644
--- a/src/runtime/q3dsuippresentation_p.h
+++ b/src/runtime/q3dsuippresentation_p.h
@@ -1237,6 +1237,7 @@ class Q3DSV_PRIVATE_EXPORT Q3DSCameraNode : public Q3DSNode
Q3DS_OBJECT
Q_PROPERTY(bool orthographic READ orthographic WRITE setOrthographic)
Q_PROPERTY(float fov READ fov WRITE setFov)
+ Q_PROPERTY(bool fovhorizontal READ fovHorizontal WRITE setFovHorizontal)
Q_PROPERTY(float clipnear READ clipNear WRITE setClipNear)
Q_PROPERTY(float clipfar READ clipFar WRITE setClipFar)
Q_PROPERTY(ScaleMode scalemode READ scaleMode WRITE setScaleMode)
@@ -1271,6 +1272,7 @@ public:
// Properties
bool orthographic() const { return m_orthographic; }
float fov() const { return m_fov; }
+ bool fovHorizontal() const { return m_fovHorizontal; }
float clipNear() const { return m_clipNear; }
float clipFar() const { return m_clipFar; }
ScaleMode scaleMode() const { return m_scaleMode; }
@@ -1278,17 +1280,21 @@ public:
Q3DSPropertyChange setOrthographic(bool v);
Q3DSPropertyChange setFov(float v);
+ Q3DSPropertyChange setFovHorizontal(bool v);
Q3DSPropertyChange setClipNear(float v);
Q3DSPropertyChange setClipFar(float v);
Q3DSPropertyChange setScaleMode(ScaleMode v);
Q3DSPropertyChange setScaleAnchor(ScaleAnchor v);
+ float verticalFov(float aspectRatio) const;
+
private:
Q_DISABLE_COPY(Q3DSCameraNode)
template<typename V> void setProps(const V &attrs, PropSetFlags flags);
bool m_orthographic = false;
float m_fov = 60;
+ bool m_fovHorizontal = false;
float m_clipNear = 10;
float m_clipFar = 5000;
ScaleMode m_scaleMode = Fit;