summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Määttä <antti.maatta@qt.io>2016-09-01 12:48:22 +0300
committerAntti Määttä <antti.maatta@qt.io>2016-09-05 08:50:09 +0000
commit6eecb253c0a9a5d0c1eaaa031e38d24e3bb5f447 (patch)
tree5b52b0d7aa9f3452e657725f67acf8fd60e79d6a
parent0febc2e9be299475e72c4cd348e830cb267ece95 (diff)
Update QViewport docs
Change-Id: I9a81ddc741af8fb0f1126b431763ccf7a1f07e3a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r--src/render/framegraph/qviewport.cpp54
1 files changed, 32 insertions, 22 deletions
diff --git a/src/render/framegraph/qviewport.cpp b/src/render/framegraph/qviewport.cpp
index c68ff141f..cf7667289 100644
--- a/src/render/framegraph/qviewport.cpp
+++ b/src/render/framegraph/qviewport.cpp
@@ -53,27 +53,39 @@ QViewportPrivate::QViewportPrivate()
}
/*!
- * \class Qt3DRender::QViewport
- * \inmodule Qt3DRender
- * \brief A viewport on the Qt3D Scene
- * \since 5.7
- *
- * \inherits Qt3DRender::QFrameGraphNode
- *
+ \class Qt3DRender::QViewport
+ \inmodule Qt3DRender
+ \brief A viewport on the Qt3D Scene
+ \since 5.7
+
+ \inherits Qt3DRender::QFrameGraphNode
+
+ Qt3DRender::QViewport of the scene specifies at which portion of the render surface Qt3D
+ is rendering to. Area outside the viewport is left untouched.
*/
/*!
- * \qmltype Viewport
- * \inqmlmodule Qt3D.Render
- * \since 5.7
- * \ingroup
- * \instantiates Qt3DRender::QViewport
- * \brief A viewport on the Qt3D Scene
- *
+ \qmltype Viewport
+ \inqmlmodule Qt3D.Render
+ \since 5.7
+ \ingroup
+ \instantiates Qt3DRender::QViewport
+ \brief A viewport on the Qt3D Scene
+
+ Viewport of the scene specifies at which portion of the render surface Qt3D is
+ rendering to. Area outside the viewport is left untouched.
*/
/*!
- * Constructs QViewport with given \a parent.
+ \qmlproperty rect Viewport::normalizedRect
+
+ Specifies the normalised rectangle for the viewport, i.e. the viewport rectangle
+ is specified relative to the render surface size. Whole surface sized viewport
+ is specified as [0.0, 0.0, 1.0, 1.0], which is the default.
+ */
+
+/*!
+ Constructs QViewport with given \a parent.
*/
QViewport::QViewport(QNode *parent)
: QFrameGraphNode(*new QViewportPrivate, parent)
@@ -99,14 +111,12 @@ QRectF QViewport::normalizedRect() const
}
/*!
- \property Qt3DRender::QViewport::normalizedRect
- Specifies the normalise rect for the viewport
-*/
-
-/*!
- \qmlproperty QRectF Qt3D.Render::QViewport::normalizedRect
+ \property QViewport::normalizedRect
-*/
+ Specifies the normalised rectangle for the viewport, i.e. the viewport rectangle
+ is specified relative to the render surface size. Whole surface sized viewport
+ is specified as [0.0, 0.0, 1.0, 1.0], which is the default.
+ */
void QViewport::setNormalizedRect(const QRectF &normalizedRect)
{
Q_D(QViewport);