diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 21:48:14 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 21:50:16 +0100 |
commit | a359bd756a98a0462bbd039d9b76981d73dc11f7 (patch) | |
tree | 4917b25a005e75344a8f9ba60713ef5b4baa3533 /examples/qt3d/wireframe/doc/src/wireframe.qdoc | |
parent | 3d30f6151c0c2884b1f15280301e552b5f67949c (diff) | |
parent | 5a68874f7a2f18070890bec7c3259af94abe320b (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/doc/src/qt3dcollision-module.qdoc
src/render/frontend/qcamera.cpp
src/render/frontend/qcameralens.cpp
Change-Id: I8a0ae250a6b8e065a1ef3c817968ebb7ef23b20d
Diffstat (limited to 'examples/qt3d/wireframe/doc/src/wireframe.qdoc')
-rw-r--r-- | examples/qt3d/wireframe/doc/src/wireframe.qdoc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/examples/qt3d/wireframe/doc/src/wireframe.qdoc b/examples/qt3d/wireframe/doc/src/wireframe.qdoc index 0d5b5a0c7..318f3f165 100644 --- a/examples/qt3d/wireframe/doc/src/wireframe.qdoc +++ b/examples/qt3d/wireframe/doc/src/wireframe.qdoc @@ -30,12 +30,12 @@ \title Qt 3D: Wireframe QML Example \ingroup qt3d-examples-qml - \brief A Qt3D QML application that implements a single-pass wireframe + \brief A Qt 3D QML application that implements a single-pass wireframe rendering method. \image qt3d-wireframe-rendering.png - \e {Qt3D Wireframe Rendering} illustrates how to draw a single entity + \e {Qt 3D Wireframe Rendering} illustrates how to draw a single entity (a trefoil knot) using a custom set of shaders to implement a single-pass wireframe rendering method. @@ -81,7 +81,6 @@ named uniform variables: \skipto Transform - \printuntil phiRotation \printuntil } \section1 Loading Dynamic Per-Vertex Data @@ -93,7 +92,7 @@ \printuntil } - In addition to the \l Mesh element, Qt3D also enables dynamic generation of + In addition to the \l Mesh element, Qt 3D also enables dynamic generation of per-vertex attribute data through C++ hooks that are called by the task-based engine. @@ -123,8 +122,8 @@ need for animations: \quotefromfile wireframe/main.qml - \skipto import Qt3D - \printuntil QtQuick + \skipto import QtQuick + \printuntil Render 2.0 We use an \l Entity type as the root type simply to act as a parent for its children. In this sense, the \l Entity type is much like the \l Item @@ -137,7 +136,7 @@ \printuntil ] - The \l BasicCamera type is a trivial wrapper around the built-in \l Camera + The BasicCamera type is a trivial wrapper around the built-in \l Camera type that represents a virtual camera. It has properties for such things as the near and far planes, field of view, aspect ratio, projection type, position, and orientation: @@ -155,7 +154,7 @@ \section1 Mapping Materials - Qt3D has a robust and very flexible \l {Qt3D Overview#Materials}{material + Qt 3D has a robust and very flexible \l {Qt 3D Overview#Materials}{material system} that allows multiple levels of customization. We use the WireframeMaterial custom type to wrap the \l Material type: @@ -166,7 +165,7 @@ \skipto TrefoilKnot \printuntil } - The Qt3D engine in conjunction with the renderer aspect now has enough + The Qt 3D engine in conjunction with the renderer aspect now has enough information to finally render our mesh using the material we specified. \section1 Using Animation Elements |