diff options
Diffstat (limited to 'src/core/geometry')
| -rw-r--r-- | src/core/geometry/geometry.pri | 26 | ||||
| -rw-r--r-- | src/core/geometry/qabstractfunctor.cpp | 2 | ||||
| -rw-r--r-- | src/core/geometry/qattribute.cpp | 22 | ||||
| -rw-r--r-- | src/core/geometry/qboundingvolume.cpp | 12 | ||||
| -rw-r--r-- | src/core/geometry/qbuffer.cpp | 8 | ||||
| -rw-r--r-- | src/core/geometry/qgeometry.cpp | 10 | ||||
| -rw-r--r-- | src/core/geometry/qgeometryview.cpp | 29 |
7 files changed, 42 insertions, 67 deletions
diff --git a/src/core/geometry/geometry.pri b/src/core/geometry/geometry.pri deleted file mode 100644 index 70bda07ed..000000000 --- a/src/core/geometry/geometry.pri +++ /dev/null @@ -1,26 +0,0 @@ -INCLUDEPATH += $$PWD - -HEADERS += \ - $$PWD/qabstractfunctor.h \ - $$PWD/qattribute.h \ - $$PWD/qattribute_p.h \ - $$PWD/qboundingvolume.h \ - $$PWD/qboundingvolume_p.h \ - $$PWD/qbuffer.h \ - $$PWD/qbuffer_p.h \ - $$PWD/qgeometry_p.h \ - $$PWD/qgeometry.h \ - $$PWD/qgeometryfactory_p.h \ - $$PWD/qgeometryview_p.h \ - $$PWD/qgeometryview.h \ - $$PWD/bufferutils_p.h \ - $$PWD/buffervisitor_p.h - -SOURCES += \ - $$PWD/qabstractfunctor.cpp \ - $$PWD/qattribute.cpp \ - $$PWD/qboundingvolume.cpp \ - $$PWD/qbuffer.cpp \ - $$PWD/qgeometry.cpp \ - $$PWD/qgeometryview.cpp - diff --git a/src/core/geometry/qabstractfunctor.cpp b/src/core/geometry/qabstractfunctor.cpp index ee9fea61b..4fe5dd5cd 100644 --- a/src/core/geometry/qabstractfunctor.cpp +++ b/src/core/geometry/qabstractfunctor.cpp @@ -26,7 +26,7 @@ namespace Qt3DCore { Returns a pointer to the id of the functor. */ /*! - \fn qintptr Qt3DCore::functorTypeId() + \fn template <class T> qintptr Qt3DCore::functorTypeId() Returns a pointer to the type id of the functor. */ diff --git a/src/core/geometry/qattribute.cpp b/src/core/geometry/qattribute.cpp index 301dba467..9d4662435 100644 --- a/src/core/geometry/qattribute.cpp +++ b/src/core/geometry/qattribute.cpp @@ -95,7 +95,7 @@ QAttributePrivate *QAttributePrivate::get(QAttribute *q) */ /*! - * \enum QAttribute::AttributeType + * \enum Qt3DCore::QAttribute::AttributeType * * The type of the attribute. * @@ -105,7 +105,7 @@ QAttributePrivate *QAttributePrivate::get(QAttribute *q) */ /*! - * \enum QAttribute::VertexBaseType + * \enum Qt3DCore::QAttribute::VertexBaseType * * The type of the data. * @@ -168,7 +168,7 @@ QAttribute::~QAttribute() } /*! - * \property QAttribute::buffer + * \property Qt3DCore::QAttribute::buffer * * Holds the buffer. */ @@ -179,7 +179,7 @@ QBuffer *QAttribute::buffer() const } /*! - * \property QAttribute::name + * \property Qt3DCore::QAttribute::name * * Holds the name. */ @@ -190,7 +190,7 @@ QString QAttribute::name() const } /*! - * \property QAttribute::vertexSize + * \property Qt3DCore::QAttribute::vertexSize * * Holds the data size, it can only be 1 to 4 units (scalars and vectors), * 9 units (3x3 matrices) or 16 units (4x4 matrices). @@ -202,7 +202,7 @@ uint QAttribute::vertexSize() const } /*! - * \property QAttribute::vertexBaseType + * \property Qt3DCore::QAttribute::vertexBaseType * * Holds the data type. */ @@ -213,7 +213,7 @@ QAttribute::VertexBaseType QAttribute::vertexBaseType() const } /*! - * \property QAttribute::count + * \property Qt3DCore::QAttribute::count * * Holds the count. */ @@ -224,7 +224,7 @@ uint QAttribute::count() const } /*! - * \property QAttribute::byteStride + * \property Qt3DCore::QAttribute::byteStride * * Holds the byte stride. */ @@ -235,7 +235,7 @@ uint QAttribute::byteStride() const } /*! - * \property QAttribute::byteOffset + * \property Qt3DCore::QAttribute::byteOffset * * Holds the byte offset. */ @@ -246,7 +246,7 @@ uint QAttribute::byteOffset() const } /*! - * \property QAttribute::divisor + * \property Qt3DCore::QAttribute::divisor * * Holds the divisor. */ @@ -257,7 +257,7 @@ uint QAttribute::divisor() const } /*! - * \property QAttribute::attributeType + * \property Qt3DCore::QAttribute::attributeType * * Holds the attribute type. */ diff --git a/src/core/geometry/qboundingvolume.cpp b/src/core/geometry/qboundingvolume.cpp index 645627f31..272e07e16 100644 --- a/src/core/geometry/qboundingvolume.cpp +++ b/src/core/geometry/qboundingvolume.cpp @@ -185,7 +185,7 @@ QBoundingVolume::~QBoundingVolume() * to compute the bounding volume. */ /*! -* \property QBoundingVolume::view +* \property Qt3DCore::QBoundingVolume::view * * Holds a pointer to the instance of QGeometryView which will be used, if set, * to compute the bounding volume. @@ -202,7 +202,7 @@ QGeometryView *QBoundingVolume::view() const * Holds minimum extent of the bounding volume computed from the specified view. */ /*! -* \property QBoundingVolume::implicitMinPoint +* \property Qt3DCore::QBoundingVolume::implicitMinPoint * * Holds minimum extent of the bounding volume computed from the specified view. */ @@ -218,7 +218,7 @@ QVector3D QBoundingVolume::implicitMinPoint() const * Holds maximum extent of the bounding volume computed from the specified view. */ /*! -* \property QBoundingVolume::implicitMaxPoint +* \property Qt3DCore::QBoundingVolume::implicitMaxPoint * * Holds maximum extent of the bounding volume computed from the specified view. */ @@ -236,7 +236,7 @@ QVector3D QBoundingVolume::implicitMaxPoint() const * \sa updateImplicitBounds */ /*! -* \property QBoundingVolume::implicitPointsValid +* \property Qt3DCore::QBoundingVolume::implicitPointsValid * * True if a view has been assigned and the implicit extent properties are up to date. * @@ -256,7 +256,7 @@ bool QBoundingVolume::areImplicitPointsValid() const * geometry. */ /*! -* \property QBoundingVolume::minPoint +* \property Qt3DCore::QBoundingVolume::minPoint * * User specified minimum extent of the bounding volume. When set (along with maximum * extent), this will be used internally to avoid computing the volume from the @@ -276,7 +276,7 @@ QVector3D QBoundingVolume::minPoint() const * geometry. */ /*! -* \property QBoundingVolume::maxPoint +* \property Qt3DCore::QBoundingVolume::maxPoint * * User specified maximum extent of the bounding volume. When set (along with minimum * extent), this will be used internally to avoid computing the volume from the diff --git a/src/core/geometry/qbuffer.cpp b/src/core/geometry/qbuffer.cpp index 1d6bec562..7f2917b32 100644 --- a/src/core/geometry/qbuffer.cpp +++ b/src/core/geometry/qbuffer.cpp @@ -7,8 +7,6 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DCore { const char *QBufferPrivate::UpdateDataPropertyName = "QT3D_updateData"; @@ -86,7 +84,7 @@ void QBufferPrivate::setData(const QByteArray &data) */ /*! - * \enum QBuffer::UsageType + * \enum Qt3DCore::QBuffer::UsageType * * The type of the usage. * @@ -111,7 +109,7 @@ void QBufferPrivate::setData(const QByteArray &data) */ /*! - * \enum QBuffer::AccessType + * \enum Qt3DCore::QBuffer::AccessType * * \value Write * Write access @@ -186,7 +184,7 @@ QByteArray QBuffer::data() const } /*! - * \property QBuffer::usage + * \property Qt3DCore::QBuffer::usage * * Holds the buffer usage. */ diff --git a/src/core/geometry/qgeometry.cpp b/src/core/geometry/qgeometry.cpp index 05d791d7d..b70881daf 100644 --- a/src/core/geometry/qgeometry.cpp +++ b/src/core/geometry/qgeometry.cpp @@ -9,7 +9,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; +namespace Qt3DCore { QGeometryFactory::~QGeometryFactory() { @@ -107,7 +107,7 @@ void QGeometryPrivate::setExtent(const QVector3D &minExtent, const QVector3D &ma */ /*! - \property QGeometry::boundingVolumePositionAttribute + \property Qt3DCore::QGeometry::boundingVolumePositionAttribute Holds the attribute used to compute the bounding volume. The bounding volume is used internally for picking and view frustum culling. @@ -202,7 +202,7 @@ QAttribute *QGeometry::boundingVolumePositionAttribute() const */ /*! - \property QGeometry::minExtent + \property Qt3DCore::QGeometry::minExtent Holds the vertex with the lowest x, y, z position values. */ @@ -219,7 +219,7 @@ QVector3D QGeometry::minExtent() const */ /*! - \property QGeometry::maxExtent + \property Qt3DCore::QGeometry::maxExtent Holds the vertex with the highest x, y, z position values. */ @@ -238,6 +238,8 @@ QList<QAttribute *> QGeometry::attributes() const return d->m_attributes; } +} // namespace Qt3DCore + QT_END_NAMESPACE #include "moc_qgeometry.cpp" diff --git a/src/core/geometry/qgeometryview.cpp b/src/core/geometry/qgeometryview.cpp index e0e9dd75d..228594a6b 100644 --- a/src/core/geometry/qgeometryview.cpp +++ b/src/core/geometry/qgeometryview.cpp @@ -12,7 +12,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; +namespace Qt3DCore { namespace { @@ -96,7 +96,6 @@ public: } - bool BoundingVolumeCalculator::apply(QAttribute *positionAttribute, QAttribute *indexAttribute, int drawVertexCount, @@ -213,7 +212,7 @@ void QGeometryViewPrivate::update() /*! - \enum QGeometryView::PrimitiveType + \enum Qt3DCore::QGeometryView::PrimitiveType The type of the primitive. @@ -338,7 +337,7 @@ QGeometryView::QGeometryView(QGeometryViewPrivate &dd, QNode *parent) } /*! - \property QGeometryView::instanceCount + \property Qt3DCore::QGeometryView::instanceCount Holds the instance count. */ @@ -349,7 +348,7 @@ int QGeometryView::instanceCount() const } /*! - \property QGeometryView::vertexCount + \property Qt3DCore::QGeometryView::vertexCount Holds the primitive count. */ @@ -360,7 +359,7 @@ int QGeometryView::vertexCount() const } /*! - \property QGeometryView::indexOffset + \property Qt3DCore::QGeometryView::indexOffset Holds the base vertex. */ @@ -371,7 +370,7 @@ int QGeometryView::indexOffset() const } /*! - \property QGeometryView::firstInstance + \property Qt3DCore::QGeometryView::firstInstance Holds the base instance. */ @@ -382,7 +381,7 @@ int QGeometryView::firstInstance() const } /*! - \property QGeometryView::firstVertex + \property Qt3DCore::QGeometryView::firstVertex Holds the base vertex. */ @@ -393,7 +392,7 @@ int QGeometryView::firstVertex() const } /*! - \property QGeometryView::indexBufferByteOffset + \property Qt3DCore::QGeometryView::indexBufferByteOffset Holds the byte offset into the index buffer. */ @@ -404,7 +403,7 @@ int QGeometryView::indexBufferByteOffset() const } /*! - \property QGeometryView::restartIndexValue + \property Qt3DCore::QGeometryView::restartIndexValue Holds the restart index. */ @@ -415,7 +414,7 @@ int QGeometryView::restartIndexValue() const } /*! - \property QGeometryView::verticesPerPatch + \property Qt3DCore::QGeometryView::verticesPerPatch Holds vertices per patch. */ @@ -426,7 +425,7 @@ int QGeometryView::verticesPerPatch() const } /*! - \property QGeometryView::primitiveRestartEnabled + \property Qt3DCore::QGeometryView::primitiveRestartEnabled Holds the primitive restart flag. */ @@ -437,7 +436,7 @@ bool QGeometryView::primitiveRestartEnabled() const } /*! - \property QGeometryView::geometry + \property Qt3DCore::QGeometryView::geometry Holds the geometry. */ @@ -448,7 +447,7 @@ QGeometry *QGeometryView::geometry() const } /*! - \property QGeometryView::primitiveType + \property Qt3DCore::QGeometryView::primitiveType Holds the primitive type. */ @@ -578,6 +577,8 @@ void QGeometryView::setPrimitiveType(QGeometryView::PrimitiveType primitiveType) emit primitiveTypeChanged(primitiveType); } +} // namespace Qt3DCore + QT_END_NAMESPACE #include "moc_qgeometryview.cpp" |