summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <mbrasser@ford.com>2020-10-21 10:16:58 -0500
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-10-21 19:09:02 +0000
commit16a34ffb5598837d98d871717c81d07e8e9c6211 (patch)
treec2125ed6d51cfedb0a17ac84113bfb4ac2ea54ae
parent42abb0c194e87596b8fce70985244cc41c0b4b20 (diff)
Document the origin of extruded text
Many other mesh types use the center as the origin, so be explicit that extruded text is different. Change-Id: Iab443fab7a0e3a3f0a05dfcc7f17a837f69b2ae8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 41e457cbee41af546f964885e289dab8c9ac99de) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/extras/3dtext/qextrudedtextgeometry.cpp4
-rw-r--r--src/extras/3dtext/qextrudedtextmesh.cpp4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/extras/3dtext/qextrudedtextgeometry.cpp b/src/extras/3dtext/qextrudedtextgeometry.cpp
index fc12e9947..dd7f98269 100644
--- a/src/extras/3dtext/qextrudedtextgeometry.cpp
+++ b/src/extras/3dtext/qextrudedtextgeometry.cpp
@@ -211,6 +211,8 @@ void QExtrudedTextGeometryPrivate::init()
*
* The ExtrudedTextGeometry type is most commonly used internally by the
* ExtrudedTextMesh type but can also be used in custom GeometryRenderer types.
+ *
+ * The origin of the geometry is the rear left end of the text's baseline.
*/
/*!
@@ -261,6 +263,8 @@ void QExtrudedTextGeometryPrivate::init()
*
* The QExtrudedTextGeometry class is most commonly used internally by the QText3DMesh
* but can also be used in custom Qt3DRender::QGeometryRenderer subclasses.
+ *
+ * The origin of the geometry is the rear left end of the text's baseline.
*/
/*!
diff --git a/src/extras/3dtext/qextrudedtextmesh.cpp b/src/extras/3dtext/qextrudedtextmesh.cpp
index 0c3394dea..594d0e511 100644
--- a/src/extras/3dtext/qextrudedtextmesh.cpp
+++ b/src/extras/3dtext/qextrudedtextmesh.cpp
@@ -60,6 +60,8 @@ namespace Qt3DExtras {
* \instantiates Qt3DExtras::QExtrudedTextMesh
* \inqmlmodule Qt3D.Extras
* \brief A 3D extruded Text mesh.
+ *
+ * The origin of the mesh is the rear left end of the text's baseline.
*/
/*!
@@ -88,6 +90,8 @@ namespace Qt3DExtras {
* \inherits Qt3DRender::QGeometryRenderer
*
* \brief A 3D extruded Text mesh.
+ *
+ * The origin of the mesh is the rear left end of the text's baseline.
*/
/*!