diff options
Diffstat (limited to 'src/extras/geometries')
19 files changed, 148 insertions, 184 deletions
diff --git a/src/extras/geometries/geometries.pri b/src/extras/geometries/geometries.pri deleted file mode 100644 index 2e2efd24b..000000000 --- a/src/extras/geometries/geometries.pri +++ /dev/null @@ -1,47 +0,0 @@ -HEADERS += \ - $$PWD/qconegeometry.h \ - $$PWD/qconegeometry_p.h \ - $$PWD/qconegeometryview.h \ - $$PWD/qconemesh.h \ - $$PWD/qcuboidmesh.h \ - $$PWD/qcylindergeometry.h \ - $$PWD/qcylindergeometry_p.h \ - $$PWD/qcylindergeometryview.h \ - $$PWD/qcylindermesh.h \ - $$PWD/qplanemesh.h \ - $$PWD/qspheremesh.h \ - $$PWD/qtorusmesh.h \ - $$PWD/qtorusgeometry.h \ - $$PWD/qtorusgeometry_p.h \ - $$PWD/qtorusgeometryview.h \ - $$PWD/qspheregeometry.h \ - $$PWD/qspheregeometry_p.h \ - $$PWD/qspheregeometryview.h \ - $$PWD/qcuboidgeometry.h \ - $$PWD/qcuboidgeometry_p.h \ - $$PWD/qcuboidgeometryview.h \ - $$PWD/qplanegeometry.h \ - $$PWD/qplanegeometry_p.h \ - $$PWD/qplanegeometryview.h - -SOURCES += \ - $$PWD/qconegeometry.cpp \ - $$PWD/qconegeometryview.cpp \ - $$PWD/qconemesh.cpp \ - $$PWD/qcuboidmesh.cpp \ - $$PWD/qcylindergeometry.cpp \ - $$PWD/qcylindergeometryview.cpp \ - $$PWD/qcylindermesh.cpp \ - $$PWD/qplanemesh.cpp \ - $$PWD/qspheremesh.cpp \ - $$PWD/qtorusmesh.cpp \ - $$PWD/qtorusgeometry.cpp \ - $$PWD/qtorusgeometryview.cpp \ - $$PWD/qspheregeometry.cpp \ - $$PWD/qspheregeometryview.cpp \ - $$PWD/qcuboidgeometry.cpp \ - $$PWD/qcuboidgeometryview.cpp \ - $$PWD/qplanegeometry.cpp \ - $$PWD/qplanegeometryview.cpp - -INCLUDEPATH += $$PWD diff --git a/src/extras/geometries/qconegeometry.cpp b/src/extras/geometries/qconegeometry.cpp index 627be3338..5618b0029 100644 --- a/src/extras/geometries/qconegeometry.cpp +++ b/src/extras/geometries/qconegeometry.cpp @@ -3,7 +3,7 @@ /*! * \class Qt3DExtras::QConeGeometry - \ingroup qt3d-extras-geometries + * \ingroup qt3d-extras-geometries * \inheaderfile Qt3DExtras/QConeGeometry * \inmodule Qt3DExtras * \brief The QConeGeometry class allows creation of a cone in 3D space. @@ -31,10 +31,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DExtras { +using namespace Qt3DCore; + namespace { int faceCount(int slices, int rings, int capCount) @@ -431,66 +432,66 @@ void QConeGeometry::updateIndices() } /*! - * \property QConeGeometry::hasTopEndcap + * \property Qt3DExtras::QConeGeometry::hasTopEndcap * * Determines if the cone top is capped or open. */ /*! - * \property QConeGeometry::hasBottomEndcap + * \property Qt3DExtras::QConeGeometry::hasBottomEndcap * * Determines if the cone bottom is capped or open. */ /*! - * \property QConeGeometry::rings + * \property Qt3DExtras::QConeGeometry::rings * * Holds the number of rings in the geometry. */ /*! - * \property QConeGeometry::slices + * \property Qt3DExtras::QConeGeometry::slices * * Holds the number of slices in the geometry. */ /*! - * \property QConeGeometry::topRadius + * \property Qt3DExtras::QConeGeometry::topRadius * * Holds the top radius of the cone. */ /*! - * \property QConeGeometry::bottomRadius + * \property Qt3DExtras::QConeGeometry::bottomRadius * * Holds the bottom radius of the cone. */ /*! - * \property QConeGeometry::length + * \property Qt3DExtras::QConeGeometry::length * * Holds the length of the cone. */ /*! - * \property QConeGeometry::positionAttribute + * \property Qt3DExtras::QConeGeometry::positionAttribute * * Holds the geometry position attribute. */ /*! - * \property QConeGeometry::normalAttribute + * \property Qt3DExtras::QConeGeometry::normalAttribute * * Holds the geometry normal attribute. */ /*! - * \property QConeGeometry::texCoordAttribute + * \property Qt3DExtras::QConeGeometry::texCoordAttribute * * Holds the geometry texture coordinate attribute. */ /*! - * \property QConeGeometry::indexAttribute + * \property Qt3DExtras::QConeGeometry::indexAttribute * * Holds the geometry index attribute. */ diff --git a/src/extras/geometries/qconegeometryview.cpp b/src/extras/geometries/qconegeometryview.cpp index 284ee80c1..c094eb22a 100644 --- a/src/extras/geometries/qconegeometryview.cpp +++ b/src/extras/geometries/qconegeometryview.cpp @@ -130,7 +130,7 @@ void QConeGeometryView::setLength(float length) } /*! - * \property QConeGeometryView::hasTopEndcap + * \property Qt3DExtras::QConeGeometryView::hasTopEndcap * * Determines if the cone top is capped or open. */ @@ -140,7 +140,7 @@ bool QConeGeometryView::hasTopEndcap() const } /*! - * \property QConeGeometryView::hasBottomEndcap + * \property Qt3DExtras::QConeGeometryView::hasBottomEndcap * * Determines if the cone bottom is capped or open. */ @@ -150,7 +150,7 @@ bool QConeGeometryView::hasBottomEndcap() const } /*! - * \property QConeGeometryView::topRadius + * \property Qt3DExtras::QConeGeometryView::topRadius * * Holds the top radius of the cone. */ @@ -160,7 +160,7 @@ float QConeGeometryView::topRadius() const } /*! - * \property QConeGeometryView::bottomRadius + * \property Qt3DExtras::QConeGeometryView::bottomRadius * * Holds the bottom radius of the cone. */ @@ -170,7 +170,7 @@ float QConeGeometryView::bottomRadius() const } /*! - * \property QConeGeometryView::rings + * \property Qt3DExtras::QConeGeometryView::rings * * Holds the number of rings in the mesh. */ @@ -180,7 +180,7 @@ int QConeGeometryView::rings() const } /*! - * \property QConeGeometryView::slices + * \property Qt3DExtras::QConeGeometryView::slices * * Holds the number of slices in the mesh. */ @@ -190,7 +190,7 @@ int QConeGeometryView::slices() const } /*! - * \property QConeGeometryView::length + * \property Qt3DExtras::QConeGeometryView::length * * Holds the length of the cone. */ diff --git a/src/extras/geometries/qconemesh.cpp b/src/extras/geometries/qconemesh.cpp index 60bede77e..6dd2a8983 100644 --- a/src/extras/geometries/qconemesh.cpp +++ b/src/extras/geometries/qconemesh.cpp @@ -65,7 +65,7 @@ namespace Qt3DExtras { /*! * \class Qt3DExtras::QConeMesh - \ingroup qt3d-extras-geometries + * \ingroup qt3d-extras-geometries * \inheaderfile Qt3DExtras/QConeMesh * \inmodule Qt3DExtras * @@ -130,7 +130,7 @@ void QConeMesh::setLength(float length) } /*! - * \property QConeMesh::hasTopEndcap + * \property Qt3DExtras::QConeMesh::hasTopEndcap * * Determines if the cone top is capped or open. */ @@ -140,7 +140,7 @@ bool QConeMesh::hasTopEndcap() const } /*! - * \property QConeMesh::hasBottomEndcap + * \property Qt3DExtras::QConeMesh::hasBottomEndcap * * Determines if the cone bottom is capped or open. */ @@ -150,7 +150,7 @@ bool QConeMesh::hasBottomEndcap() const } /*! - * \property QConeMesh::topRadius + * \property Qt3DExtras::QConeMesh::topRadius * * Holds the top radius of the cone. */ @@ -160,7 +160,7 @@ float QConeMesh::topRadius() const } /*! - * \property QConeMesh::bottomRadius + * \property Qt3DExtras::QConeMesh::bottomRadius * * Holds the bottom radius of the cone. */ @@ -170,7 +170,7 @@ float QConeMesh::bottomRadius() const } /*! - * \property QConeMesh::rings + * \property Qt3DExtras::QConeMesh::rings * * Holds the number of rings in the mesh. */ @@ -180,7 +180,7 @@ int QConeMesh::rings() const } /*! - * \property QConeMesh::slices + * \property Qt3DExtras::QConeMesh::slices * * Holds the number of slices in the mesh. */ @@ -190,7 +190,7 @@ int QConeMesh::slices() const } /*! - * \property QConeMesh::length + * \property Qt3DExtras::QConeMesh::length * * Holds the length of the cone. */ diff --git a/src/extras/geometries/qcuboidgeometry.cpp b/src/extras/geometries/qcuboidgeometry.cpp index 195f8075b..4c4e006f7 100644 --- a/src/extras/geometries/qcuboidgeometry.cpp +++ b/src/extras/geometries/qcuboidgeometry.cpp @@ -8,15 +8,13 @@ #include <Qt3DCore/qbuffer.h> #include <Qt3DCore/private/corelogging_p.h> -#include <limits> - - QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DExtras { +using namespace Qt3DCore; + namespace { enum PlaneNormal { @@ -536,7 +534,7 @@ QByteArray QCuboidGeometryPrivate::generateIndexData() const /*! * \class Qt3DExtras::QCuboidGeometry - \ingroup qt3d-extras-geometries + * \ingroup qt3d-extras-geometries * \inheaderfile Qt3DExtras/QCuboidGeometry * \inmodule Qt3DExtras * \brief The QCuboidGeometry class allows creation of a cuboid in 3D space. @@ -673,7 +671,7 @@ void QCuboidGeometry::setXYMeshResolution(const QSize &resolution) } /*! - * \property QCuboidGeometry::xExtent + * \property Qt3DExtras::QCuboidGeometry::xExtent * * Holds the x extent of the geometry. */ @@ -684,7 +682,7 @@ float QCuboidGeometry::xExtent() const } /*! - * \property QCuboidGeometry::yExtent + * \property Qt3DExtras::QCuboidGeometry::yExtent * * Holds the y extent of the geometry. */ @@ -695,7 +693,7 @@ float QCuboidGeometry::yExtent() const } /*! - * \property QCuboidGeometry::zExtent + * \property Qt3DExtras::QCuboidGeometry::zExtent * * Holds the z extent of the geometry. */ @@ -706,7 +704,7 @@ float QCuboidGeometry::zExtent() const } /*! - * \property QCuboidGeometry::yzMeshResolution + * \property Qt3DExtras::QCuboidGeometry::yzMeshResolution * * Holds the y-z resolution. * The width and height values of this property specify the number of vertices generated for @@ -719,7 +717,7 @@ QSize QCuboidGeometry::yzMeshResolution() const } /*! - * \property QCuboidGeometry::xzMeshResolution + * \property Qt3DExtras::QCuboidGeometry::xzMeshResolution * * Holds the x-z resolution. * The width and height values of this property specify the number of vertices generated for @@ -732,7 +730,7 @@ QSize QCuboidGeometry::xyMeshResolution() const } /*! - * \property QCuboidGeometry::xyMeshResolution + * \property Qt3DExtras::QCuboidGeometry::xyMeshResolution * * Holds the x-y resolution. * The width and height values of this property specify the number of vertices generated for @@ -745,7 +743,7 @@ QSize QCuboidGeometry::xzMeshResolution() const } /*! - * \property QCuboidGeometry::positionAttribute + * \property Qt3DExtras::QCuboidGeometry::positionAttribute * * Holds the geometry position attribute. */ @@ -756,7 +754,7 @@ QAttribute *QCuboidGeometry::positionAttribute() const } /*! - * \property QCuboidGeometry::normalAttribute + * \property Qt3DExtras::QCuboidGeometry::normalAttribute * * Holds the geometry normal attribute. */ @@ -767,7 +765,7 @@ QAttribute *QCuboidGeometry::normalAttribute() const } /*! - * \property QCuboidGeometry::texCoordAttribute + * \property Qt3DExtras::QCuboidGeometry::texCoordAttribute * * Holds the geometry texture coordinate attribute. */ @@ -778,7 +776,7 @@ QAttribute *QCuboidGeometry::texCoordAttribute() const } /*! - * \property QCuboidGeometry::tangentAttribute + * \property Qt3DExtras::QCuboidGeometry::tangentAttribute * * Holds the geometry tangent attribute. */ @@ -789,7 +787,7 @@ QAttribute *QCuboidGeometry::tangentAttribute() const } /*! - * \property QCuboidGeometry::indexAttribute + * \property Qt3DExtras::QCuboidGeometry::indexAttribute * * Holds the geometry index attribute. */ diff --git a/src/extras/geometries/qcuboidgeometryview.cpp b/src/extras/geometries/qcuboidgeometryview.cpp index 8ef0a79fc..6d7a0e34a 100644 --- a/src/extras/geometries/qcuboidgeometryview.cpp +++ b/src/extras/geometries/qcuboidgeometryview.cpp @@ -96,7 +96,7 @@ void QCuboidGeometryView::setXExtent(float xExtent) } /*! - * \property QCuboidGeometryView::xExtent + * \property Qt3DExtras::QCuboidGeometryView::xExtent * * Holds the x extent of the mesh. */ @@ -111,7 +111,7 @@ void QCuboidGeometryView::setYExtent(float yExtent) } /*! - * \property QCuboidGeometryView::yExtent + * \property Qt3DExtras::QCuboidGeometryView::yExtent * * Holds the y extent of the mesh. */ @@ -126,7 +126,7 @@ void QCuboidGeometryView::setZExtent(float zExtent) } /*! - * \property QCuboidGeometryView::zExtent + * \property Qt3DExtras::QCuboidGeometryView::zExtent * * Holds the z extent of the mesh. */ @@ -141,7 +141,7 @@ void QCuboidGeometryView::setYZMeshResolution(const QSize &resolution) } /*! - * \property QCuboidGeometryView::yzMeshResolution + * \property Qt3DExtras::QCuboidGeometryView::yzMeshResolution * * Holds the y-z resolution of the mesh. * The width and height values of this property specify the number of vertices generated for @@ -158,7 +158,7 @@ void QCuboidGeometryView::setXZMeshResolution(const QSize &resolution) } /*! - * \property QCuboidGeometryView::xzMeshResolution + * \property Qt3DExtras::QCuboidGeometryView::xzMeshResolution * * Holds the x-z resolution of the mesh. * The width and height values of this property specify the number of vertices generated for @@ -175,7 +175,7 @@ void QCuboidGeometryView::setXYMeshResolution(const QSize &resolution) } /*! - * \property QCuboidGeometryView::xyMeshResolution + * \property Qt3DExtras::QCuboidGeometryView::xyMeshResolution * * Holds the x-y resolution of the mesh. * The width and height values of this property specify the number of vertices generated for diff --git a/src/extras/geometries/qcuboidmesh.cpp b/src/extras/geometries/qcuboidmesh.cpp index 509bfd4d6..18a4d1b69 100644 --- a/src/extras/geometries/qcuboidmesh.cpp +++ b/src/extras/geometries/qcuboidmesh.cpp @@ -60,7 +60,7 @@ namespace Qt3DExtras { /*! * \class Qt3DExtras::QCuboidMesh - \ingroup qt3d-extras-geometries + * \ingroup qt3d-extras-geometries * \inheaderfile Qt3DExtras/QCuboidMesh * \inmodule Qt3DExtras * @@ -96,7 +96,7 @@ void QCuboidMesh::setXExtent(float xExtent) } /*! - * \property QCuboidMesh::xExtent + * \property Qt3DExtras::QCuboidMesh::xExtent * * Holds the x extent of the mesh. */ @@ -111,7 +111,7 @@ void QCuboidMesh::setYExtent(float yExtent) } /*! - * \property QCuboidMesh::yExtent + * \property Qt3DExtras::QCuboidMesh::yExtent * * Holds the y extent of the mesh. */ @@ -126,7 +126,7 @@ void QCuboidMesh::setZExtent(float zExtent) } /*! - * \property QCuboidMesh::zExtent + * \property Qt3DExtras::QCuboidMesh::zExtent * * Holds the z extent of the mesh. */ @@ -141,7 +141,7 @@ void QCuboidMesh::setYZMeshResolution(const QSize &resolution) } /*! - * \property QCuboidMesh::yzMeshResolution + * \property Qt3DExtras::QCuboidMesh::yzMeshResolution * * Holds the y-z resolution of the mesh. * The width and height values of this property specify the number of vertices generated for @@ -158,7 +158,7 @@ void QCuboidMesh::setXZMeshResolution(const QSize &resolution) } /*! - * \property QCuboidMesh::xzMeshResolution + * \property Qt3DExtras::QCuboidMesh::xzMeshResolution * * Holds the x-z resolution of the mesh. * The width and height values of this property specify the number of vertices generated for @@ -175,7 +175,7 @@ void QCuboidMesh::setXYMeshResolution(const QSize &resolution) } /*! - * \property QCuboidMesh::xyMeshResolution + * \property Qt3DExtras::QCuboidMesh::xyMeshResolution * * Holds the x-y resolution of the mesh. * The width and height values of this property specify the number of vertices generated for diff --git a/src/extras/geometries/qcylindergeometry.cpp b/src/extras/geometries/qcylindergeometry.cpp index c06cb7faf..4aa162859 100644 --- a/src/extras/geometries/qcylindergeometry.cpp +++ b/src/extras/geometries/qcylindergeometry.cpp @@ -17,10 +17,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DExtras { +using namespace Qt3DCore; + namespace { int faceCount(int slices, int rings) @@ -312,7 +313,7 @@ QByteArray QCylinderGeometryPrivate::generateIndexData() const /*! * \class Qt3DExtras::QCylinderGeometry - \ingroup qt3d-extras-geometries + * \ingroup qt3d-extras-geometries * \inheaderfile Qt3DExtras/QCylinderGeometry * \inmodule Qt3DExtras * \brief The QCylinderGeometry class allows creation of a cylinder in 3D space. @@ -420,7 +421,7 @@ void QCylinderGeometry::setLength(float length) } /*! - * \property QCylinderGeometry::rings + * \property Qt3DExtras::QCylinderGeometry::rings * * Holds the number of rings in the cylinder. */ @@ -431,7 +432,7 @@ int QCylinderGeometry::rings() const } /*! - * \property QCylinderGeometry::slices + * \property Qt3DExtras::QCylinderGeometry::slices * * Holds the number of slices in the cylinder. */ @@ -442,7 +443,7 @@ int QCylinderGeometry::slices() const } /*! - * \property QCylinderGeometry::radius + * \property Qt3DExtras::QCylinderGeometry::radius * * Holds the radius of the cylinder. */ @@ -453,7 +454,7 @@ float QCylinderGeometry::radius() const } /*! - * \property QCylinderGeometry::length + * \property Qt3DExtras::QCylinderGeometry::length * * Holds the length of the cylinder. */ @@ -464,7 +465,7 @@ float QCylinderGeometry::length() const } /*! - * \property QCylinderGeometry::positionAttribute + * \property Qt3DExtras::QCylinderGeometry::positionAttribute * * Holds the geometry position attribute. */ @@ -475,7 +476,7 @@ QAttribute *QCylinderGeometry::positionAttribute() const } /*! - * \property QCylinderGeometry::normalAttribute + * \property Qt3DExtras::QCylinderGeometry::normalAttribute * * Holds the geometry normal attribute. */ @@ -486,7 +487,7 @@ QAttribute *QCylinderGeometry::normalAttribute() const } /*! - * \property QCylinderGeometry::texCoordAttribute + * \property Qt3DExtras::QCylinderGeometry::texCoordAttribute * * Holds the geometry texture coordinate attribute. */ @@ -497,7 +498,7 @@ QAttribute *QCylinderGeometry::texCoordAttribute() const } /*! - * \property QCylinderGeometry::indexAttribute + * \property Qt3DExtras::QCylinderGeometry::indexAttribute * * Holds the geometry index attribute. */ diff --git a/src/extras/geometries/qcylindergeometryview.cpp b/src/extras/geometries/qcylindergeometryview.cpp index 1c1d392ff..29fbb1a98 100644 --- a/src/extras/geometries/qcylindergeometryview.cpp +++ b/src/extras/geometries/qcylindergeometryview.cpp @@ -17,10 +17,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DExtras { +using namespace Qt3DCore; + /*! * \qmltype CylinderGeometryView * \instantiates Qt3DExtras::QCylinderGeometryView @@ -104,7 +105,7 @@ void QCylinderGeometryView::setLength(float length) } /*! - * \property QCylinderGeometryView::rings + * \property Qt3DExtras::QCylinderGeometryView::rings * * Holds the number of rings in the mesh. */ @@ -114,7 +115,7 @@ int QCylinderGeometryView::rings() const } /*! - * \property QCylinderGeometryView::slices + * \property Qt3DExtras::QCylinderGeometryView::slices * * Holds the number of slices in the mesh. */ @@ -124,7 +125,7 @@ int QCylinderGeometryView::slices() const } /*! - * \property QCylinderGeometryView::radius + * \property Qt3DExtras::QCylinderGeometryView::radius * * Holds the radius of the cylinder. */ @@ -134,7 +135,7 @@ float QCylinderGeometryView::radius() const } /*! - * \property QCylinderGeometryView::length + * \property Qt3DExtras::QCylinderGeometryView::length * * Holds the length of the cylinder. */ diff --git a/src/extras/geometries/qcylindermesh.cpp b/src/extras/geometries/qcylindermesh.cpp index f0098ef1e..5473e2beb 100644 --- a/src/extras/geometries/qcylindermesh.cpp +++ b/src/extras/geometries/qcylindermesh.cpp @@ -17,15 +17,19 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DExtras { +using namespace Qt3DCore; + /*! * \qmltype CylinderMesh * \instantiates Qt3DExtras::QCylinderMesh * \inqmlmodule Qt3D.Extras * \brief A cylindrical mesh. + * + * This component can be used to render a cylinder when combined with a + * material component. */ /*! @@ -54,13 +58,16 @@ namespace Qt3DExtras { /*! * \class Qt3DExtras::QCylinderMesh - \ingroup qt3d-extras-geometries + * \ingroup qt3d-extras-geometries * \inheaderfile Qt3DExtras/QCylinderMesh * \inmodule Qt3DExtras * * \inherits Qt3DRender::QGeometryRenderer * * \brief A cylindrical mesh. + * + * This component can be used to render a cylinder when combined with a + * material component. */ /*! @@ -104,7 +111,7 @@ void QCylinderMesh::setLength(float length) } /*! - * \property QCylinderMesh::rings + * \property Qt3DExtras::QCylinderMesh::rings * * Holds the number of rings in the mesh. */ @@ -114,7 +121,7 @@ int QCylinderMesh::rings() const } /*! - * \property QCylinderMesh::slices + * \property Qt3DExtras::QCylinderMesh::slices * * Holds the number of slices in the mesh. */ @@ -124,7 +131,7 @@ int QCylinderMesh::slices() const } /*! - * \property QCylinderMesh::radius + * \property Qt3DExtras::QCylinderMesh::radius * * Holds the radius of the cylinder. */ @@ -134,7 +141,7 @@ float QCylinderMesh::radius() const } /*! - * \property QCylinderMesh::length + * \property Qt3DExtras::QCylinderMesh::length * * Holds the length of the cylinder. */ diff --git a/src/extras/geometries/qplanegeometry.cpp b/src/extras/geometries/qplanegeometry.cpp index 21be44f56..85844867c 100644 --- a/src/extras/geometries/qplanegeometry.cpp +++ b/src/extras/geometries/qplanegeometry.cpp @@ -11,10 +11,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DExtras { +using namespace Qt3DCore; + namespace { QByteArray createPlaneVertexData(float w, float h, const QSize &resolution, bool mirrored) @@ -176,7 +177,7 @@ QByteArray createPlaneIndexData(const QSize &resolution) /*! * \class Qt3DExtras::QPlaneGeometry - \ingroup qt3d-extras-geometries + * \ingroup qt3d-extras-geometries * \inheaderfile Qt3DExtras/QPlaneGeometry * \inmodule Qt3DExtras * \brief The QPlaneGeometry class allows creation of a plane in 3D space. @@ -286,7 +287,7 @@ void QPlaneGeometry::setMirrored(bool mirrored) } /*! - * \property QPlaneGeometry::resolution + * \property Qt3DExtras::QPlaneGeometry::resolution * * Holds the plane resolution. */ @@ -297,7 +298,7 @@ QSize QPlaneGeometry::resolution() const } /*! - * \property QPlaneGeometry::width + * \property Qt3DExtras::QPlaneGeometry::width * * Holds the plane width. */ @@ -308,7 +309,7 @@ float QPlaneGeometry::width() const } /*! - * \property QPlaneGeometry::height + * \property Qt3DExtras::QPlaneGeometry::height * * Holds the plane height. */ @@ -319,7 +320,7 @@ float QPlaneGeometry::height() const } /*! - * \property QPlaneGeometry::mirrored + * \property Qt3DExtras::QPlaneGeometry::mirrored * \since 5.9 * * Controls if the UV coordinates of the plane should be flipped vertically. @@ -331,7 +332,7 @@ bool QPlaneGeometry::mirrored() const } /*! - * \property QPlaneGeometry::positionAttribute + * \property Qt3DExtras::QPlaneGeometry::positionAttribute * * Holds the geometry position attribute. */ @@ -342,7 +343,7 @@ QAttribute *QPlaneGeometry::positionAttribute() const } /*! - * \property QPlaneGeometry::normalAttribute + * \property Qt3DExtras::QPlaneGeometry::normalAttribute * * Holds the geometry normal attribute. */ @@ -353,7 +354,7 @@ QAttribute *QPlaneGeometry::normalAttribute() const } /*! - * \property QPlaneGeometry::texCoordAttribute + * \property Qt3DExtras::QPlaneGeometry::texCoordAttribute * * Holds the geometry texture coordinate attribute. */ @@ -364,7 +365,7 @@ QAttribute *QPlaneGeometry::texCoordAttribute() const } /*! - * \property QPlaneGeometry::tangentAttribute + * \property Qt3DExtras::QPlaneGeometry::tangentAttribute * * Holds the geometry tangent attribute. */ @@ -375,7 +376,7 @@ QAttribute *QPlaneGeometry::tangentAttribute() const } /*! - * \property QPlaneGeometry::indexAttribute + * \property Qt3DExtras::QPlaneGeometry::indexAttribute * * Holds the geometry index attribute. */ diff --git a/src/extras/geometries/qplanegeometryview.cpp b/src/extras/geometries/qplanegeometryview.cpp index 4dce8c32b..159de8797 100644 --- a/src/extras/geometries/qplanegeometryview.cpp +++ b/src/extras/geometries/qplanegeometryview.cpp @@ -78,7 +78,7 @@ void QPlaneGeometryView::setWidth(float width) } /*! - * \property QPlaneGeometryView::width + * \property Qt3DExtras::QPlaneGeometryView::width * * Holds the plane width. */ @@ -93,7 +93,7 @@ void QPlaneGeometryView::setHeight(float height) } /*! - * \property QPlaneGeometryView::height + * \property Qt3DExtras::QPlaneGeometryView::height * * Holds the plane height. */ @@ -108,7 +108,7 @@ void QPlaneGeometryView::setMeshResolution(const QSize &resolution) } /*! - * \property QPlaneGeometryView::meshResolution + * \property Qt3DExtras::QPlaneGeometryView::meshResolution * * Holds the plane resolution. * The width and height values of this property specify the number of vertices generated for @@ -125,7 +125,7 @@ void QPlaneGeometryView::setMirrored(bool mirrored) } /*! - * \property QPlaneGeometryView::mirrored + * \property Qt3DExtras::QPlaneGeometryView::mirrored * * Controls if the UV coordinates of the plane should be flipped vertically. */ diff --git a/src/extras/geometries/qplanemesh.cpp b/src/extras/geometries/qplanemesh.cpp index 2b02210dd..d14dd6097 100644 --- a/src/extras/geometries/qplanemesh.cpp +++ b/src/extras/geometries/qplanemesh.cpp @@ -45,7 +45,7 @@ namespace Qt3DExtras { /*! * \class Qt3DExtras::QPlaneMesh - \ingroup qt3d-extras-geometries + * \ingroup qt3d-extras-geometries * \inheaderfile Qt3DExtras/QPlaneMesh * \inmodule Qt3DExtras * @@ -79,7 +79,7 @@ void QPlaneMesh::setWidth(float width) } /*! - * \property QPlaneMesh::width + * \property Qt3DExtras::QPlaneMesh::width * * Holds the plane width. */ @@ -94,7 +94,7 @@ void QPlaneMesh::setHeight(float height) } /*! - * \property QPlaneMesh::height + * \property Qt3DExtras::QPlaneMesh::height * * Holds the plane height. */ @@ -109,7 +109,7 @@ void QPlaneMesh::setMeshResolution(const QSize &resolution) } /*! - * \property QPlaneMesh::meshResolution + * \property Qt3DExtras::QPlaneMesh::meshResolution * * Holds the plane resolution. * The width and height values of this property specify the number of vertices generated for @@ -126,7 +126,7 @@ void QPlaneMesh::setMirrored(bool mirrored) } /*! - * \property QPlaneMesh::mirrored + * \property Qt3DExtras::QPlaneMesh::mirrored * \since 5.9 * * Controls if the UV coordinates of the plane should be flipped vertically. diff --git a/src/extras/geometries/qspheregeometry.cpp b/src/extras/geometries/qspheregeometry.cpp index 9fd99ea11..1fff96ec2 100644 --- a/src/extras/geometries/qspheregeometry.cpp +++ b/src/extras/geometries/qspheregeometry.cpp @@ -16,10 +16,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DExtras { +using namespace Qt3DCore; + namespace { QByteArray createSphereMeshVertexData(float radius, int rings, int slices) @@ -292,7 +293,7 @@ QByteArray QSphereGeometryPrivate::generateIndexData() const /*! * \class Qt3DExtras::QSphereGeometry - \ingroup qt3d-extras-geometries + * \ingroup qt3d-extras-geometries * \inheaderfile Qt3DExtras/QSphereGeometry * \inmodule Qt3DExtras * \brief The QSphereGeometry class allows creation of a sphere in 3D space. @@ -402,7 +403,7 @@ void QSphereGeometry::setGenerateTangents(bool gen) } /*! - * \property QSphereGeometry::generateTangents + * \property Qt3DExtras::QSphereGeometry::generateTangents * * Holds the value of the automatic tangent vectors generation flag. * Tangent vectors are orthogonal to normal vectors. @@ -414,7 +415,7 @@ bool QSphereGeometry::generateTangents() const } /*! - * \property QSphereGeometry::rings + * \property Qt3DExtras::QSphereGeometry::rings * * Holds the number of rings in the sphere. */ @@ -425,7 +426,7 @@ int QSphereGeometry::rings() const } /*! - * \property QSphereGeometry::slices + * \property Qt3DExtras::QSphereGeometry::slices * * Holds the number of slices in the sphere. */ @@ -436,7 +437,7 @@ int QSphereGeometry::slices() const } /*! - * \property QSphereGeometry::radius + * \property Qt3DExtras::QSphereGeometry::radius * * Holds the radius of the sphere. */ @@ -447,7 +448,7 @@ float QSphereGeometry::radius() const } /*! - * \property QSphereGeometry::positionAttribute + * \property Qt3DExtras::QSphereGeometry::positionAttribute * * Holds the geometry position attribute. */ @@ -458,7 +459,7 @@ QAttribute *QSphereGeometry::positionAttribute() const } /*! - * \property QSphereGeometry::normalAttribute + * \property Qt3DExtras::QSphereGeometry::normalAttribute * * Holds the geometry normal attribute. */ @@ -469,7 +470,7 @@ QAttribute *QSphereGeometry::normalAttribute() const } /*! - * \property QSphereGeometry::texCoordAttribute + * \property Qt3DExtras::QSphereGeometry::texCoordAttribute * * Holds the geometry texture coordinate attribute. */ @@ -480,7 +481,7 @@ QAttribute *QSphereGeometry::texCoordAttribute() const } /*! - * \property QSphereGeometry::tangentAttribute + * \property Qt3DExtras::QSphereGeometry::tangentAttribute * * Holds the geometry tangent attribute. */ @@ -491,7 +492,7 @@ QAttribute *QSphereGeometry::tangentAttribute() const } /*! - * \property QSphereGeometry::indexAttribute + * \property Qt3DExtras::QSphereGeometry::indexAttribute * * Holds the geometry index attribute. */ diff --git a/src/extras/geometries/qspheregeometryview.cpp b/src/extras/geometries/qspheregeometryview.cpp index c4a99a108..02b1f71f6 100644 --- a/src/extras/geometries/qspheregeometryview.cpp +++ b/src/extras/geometries/qspheregeometryview.cpp @@ -93,7 +93,7 @@ void QSphereGeometryView::setGenerateTangents(bool gen) } /*! - * \property QSphereGeometryView::generateTangents + * \property Qt3DExtras::QSphereGeometryView::generateTangents * * Holds the value of the automatic tangent vectors generation flag. * Tangent vectors are orthogonal to normal vectors. @@ -104,7 +104,7 @@ bool QSphereGeometryView::generateTangents() const } /*! - * \property QSphereGeometryView::rings + * \property Qt3DExtras::QSphereGeometryView::rings * * Holds the number of rings in the mesh. */ @@ -114,7 +114,7 @@ int QSphereGeometryView::rings() const } /*! - * \property QSphereGeometryView::slices + * \property Qt3DExtras::QSphereGeometryView::slices * * Holds the number of slices in the mesh. */ @@ -124,7 +124,7 @@ int QSphereGeometryView::slices() const } /*! - * \property QSphereGeometryView::radius + * \property Qt3DExtras::QSphereGeometryView::radius * * Holds the radius of the sphere. */ diff --git a/src/extras/geometries/qspheremesh.cpp b/src/extras/geometries/qspheremesh.cpp index 92c382541..105102f62 100644 --- a/src/extras/geometries/qspheremesh.cpp +++ b/src/extras/geometries/qspheremesh.cpp @@ -44,7 +44,7 @@ namespace Qt3DExtras { /*! * \class Qt3DExtras::QSphereMesh - \ingroup qt3d-extras-geometries + * \ingroup qt3d-extras-geometries * \inheaderfile Qt3DExtras/QSphereMesh * \inmodule Qt3DExtras * @@ -93,7 +93,7 @@ void QSphereMesh::setGenerateTangents(bool gen) } /*! - * \property QSphereMesh::generateTangents + * \property Qt3DExtras::QSphereMesh::generateTangents * * Holds the value of the automatic tangent vectors generation flag. * Tangent vectors are orthogonal to normal vectors. @@ -104,7 +104,7 @@ bool QSphereMesh::generateTangents() const } /*! - * \property QSphereMesh::rings + * \property Qt3DExtras::QSphereMesh::rings * * Holds the number of rings in the mesh. */ @@ -114,7 +114,7 @@ int QSphereMesh::rings() const } /*! - * \property QSphereMesh::slices + * \property Qt3DExtras::QSphereMesh::slices * * Holds the number of slices in the mesh. */ @@ -124,7 +124,7 @@ int QSphereMesh::slices() const } /*! - * \property QSphereMesh::radius + * \property Qt3DExtras::QSphereMesh::radius * * Holds the radius of the sphere. */ diff --git a/src/extras/geometries/qtorusgeometry.cpp b/src/extras/geometries/qtorusgeometry.cpp index 07a15b742..30420969a 100644 --- a/src/extras/geometries/qtorusgeometry.cpp +++ b/src/extras/geometries/qtorusgeometry.cpp @@ -13,10 +13,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DExtras { +using namespace Qt3DCore; + namespace { int vertexCount(int requestedRings, int requestedSlices) @@ -269,7 +270,7 @@ QByteArray QTorusGeometryPrivate::generateIndexData() const /*! * \class Qt3DExtras::QTorusGeometry - \ingroup qt3d-extras-geometries + * \ingroup qt3d-extras-geometries * \inheaderfile Qt3DExtras/QTorusGeometry * \inmodule Qt3DExtras * \brief The QTorusGeometry class allows creation of a torus in 3D space. @@ -375,7 +376,7 @@ void QTorusGeometry::setMinorRadius(float minorRadius) } /*! - * \property QTorusGeometry::rings + * \property Qt3DExtras::QTorusGeometry::rings * * Holds the number of rings in the torus. */ @@ -386,7 +387,7 @@ int QTorusGeometry::rings() const } /*! - * \property QTorusGeometry::slices + * \property Qt3DExtras::QTorusGeometry::slices * * Holds the number of slices in the torus. */ @@ -397,7 +398,7 @@ int QTorusGeometry::slices() const } /*! - * \property QTorusGeometry::radius + * \property Qt3DExtras::QTorusGeometry::radius * * Holds the outer radius of the torus. */ @@ -408,7 +409,7 @@ float QTorusGeometry::radius() const } /*! - * \property QTorusGeometry::minorRadius + * \property Qt3DExtras::QTorusGeometry::minorRadius * * Holds the inner radius of the torus. */ @@ -419,7 +420,7 @@ float QTorusGeometry::minorRadius() const } /*! - * \property QTorusGeometry::positionAttribute + * \property Qt3DExtras::QTorusGeometry::positionAttribute * * Holds the geometry position attribute. */ @@ -430,7 +431,7 @@ QAttribute *QTorusGeometry::positionAttribute() const } /*! - * \property QTorusGeometry::normalAttribute + * \property Qt3DExtras::QTorusGeometry::normalAttribute * * Holds the geometry normal attribute. */ @@ -441,7 +442,7 @@ QAttribute *QTorusGeometry::normalAttribute() const } /*! - * \property QTorusGeometry::texCoordAttribute + * \property Qt3DExtras::QTorusGeometry::texCoordAttribute * * Holds the geometry texture coordinate attribute. */ @@ -452,7 +453,7 @@ QAttribute *QTorusGeometry::texCoordAttribute() const } /*! - * \property QTorusGeometry::indexAttribute + * \property Qt3DExtras::QTorusGeometry::indexAttribute * * Holds the geometry index attribute. */ diff --git a/src/extras/geometries/qtorusgeometryview.cpp b/src/extras/geometries/qtorusgeometryview.cpp index e8c61f2f3..e500858d2 100644 --- a/src/extras/geometries/qtorusgeometryview.cpp +++ b/src/extras/geometries/qtorusgeometryview.cpp @@ -97,7 +97,7 @@ void QTorusGeometryView::setMinorRadius(float minorRadius) } /*! - * \property QTorusGeometryView::rings + * \property Qt3DExtras::QTorusGeometryView::rings * * Holds the number of rings in the mesh. */ @@ -107,7 +107,7 @@ int QTorusGeometryView::rings() const } /*! - * \property QTorusGeometryView::slices + * \property Qt3DExtras::QTorusGeometryView::slices * * Holds the number of slices in the mesh. */ @@ -117,7 +117,7 @@ int QTorusGeometryView::slices() const } /*! - * \property QTorusGeometryView::radius + * \property Qt3DExtras::QTorusGeometryView::radius * * Holds the outer radius of the torus. */ @@ -127,7 +127,7 @@ float QTorusGeometryView::radius() const } /*! - * \property QTorusGeometryView::minorRadius + * \property Qt3DExtras::QTorusGeometryView::minorRadius * * Holds the inner radius of the torus. */ diff --git a/src/extras/geometries/qtorusmesh.cpp b/src/extras/geometries/qtorusmesh.cpp index fb4b4f49e..4bb0e1ae2 100644 --- a/src/extras/geometries/qtorusmesh.cpp +++ b/src/extras/geometries/qtorusmesh.cpp @@ -48,7 +48,7 @@ namespace Qt3DExtras { /*! * \class Qt3DExtras::QTorusMesh - \ingroup qt3d-extras-geometries + * \ingroup qt3d-extras-geometries * \inheaderfile Qt3DExtras/QTorusMesh * \inmodule Qt3DExtras * @@ -98,7 +98,7 @@ void QTorusMesh::setMinorRadius(float minorRadius) } /*! - * \property QTorusMesh::rings + * \property Qt3DExtras::QTorusMesh::rings * * Holds the number of rings in the mesh. */ @@ -108,7 +108,7 @@ int QTorusMesh::rings() const } /*! - * \property QTorusMesh::slices + * \property Qt3DExtras::QTorusMesh::slices * * Holds the number of slices in the mesh. */ @@ -118,7 +118,7 @@ int QTorusMesh::slices() const } /*! - * \property QTorusMesh::radius + * \property Qt3DExtras::QTorusMesh::radius * * Holds the outer radius of the torus. */ @@ -128,7 +128,7 @@ float QTorusMesh::radius() const } /*! - * \property QTorusMesh::minorRadius + * \property Qt3DExtras::QTorusMesh::minorRadius * * Holds the inner radius of the torus. */ |