diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2014-08-18 12:20:56 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-08-18 14:25:01 +0200 |
| commit | 3f9961b6c9fddf1fcf17c83d7fb77f52af5c8fd7 (patch) | |
| tree | 417d43bca6360255d7a4cd8b980a4fadc8290129 /src/render/frontend/qcuboidmesh.cpp | |
| parent | 7ae3f3b737fa893da5d12d8ec5aff09e82f6dfb6 (diff) | |
Rename MeshData -> QMeshData
Change-Id: I23a466ebd29666bed1c56f29c6f049544a4eca23
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/frontend/qcuboidmesh.cpp')
| -rw-r--r-- | src/render/frontend/qcuboidmesh.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/render/frontend/qcuboidmesh.cpp b/src/render/frontend/qcuboidmesh.cpp index 400378487..c7d11c351 100644 --- a/src/render/frontend/qcuboidmesh.cpp +++ b/src/render/frontend/qcuboidmesh.cpp @@ -45,7 +45,7 @@ #include <Qt3DRenderer/renderlogging.h> #include <Qt3DRenderer/qattribute.h> #include <Qt3DRenderer/qbuffer.h> -#include <Qt3DRenderer/meshdata.h> +#include <Qt3DRenderer/qmeshdata.h> QT_BEGIN_NAMESPACE @@ -190,12 +190,12 @@ QSize QCuboidMesh::xyMeshResolution() const return d->m_xyFaceResolution; } -MeshDataPtr createCuboidMesh(float xExtent, - float yExtent, - float zExtent, - const QSize &yzResolution, - const QSize &xzResolution, - const QSize &xyResolution); +QMeshDataPtr createCuboidMesh(float xExtent, + float yExtent, + float zExtent, + const QSize &yzResolution, + const QSize &xzResolution, + const QSize &xyResolution); class CuboidMeshFunctor : public QAbstractMeshFunctor { @@ -413,12 +413,12 @@ void generatePlaneData(float w, float h, const QSize &resolution, baseVertex += resolution.width() * resolution.height(); } -MeshDataPtr createCuboidMesh(float xExtent, - float yExtent, - float zExtent, - const QSize &yzResolution, - const QSize &xzResolution, - const QSize &xyResolution) +QMeshDataPtr createCuboidMesh(float xExtent, + float yExtent, + float zExtent, + const QSize &yzResolution, + const QSize &xzResolution, + const QSize &xyResolution) { Q_ASSERT(xExtent > 0.0f && yExtent > 0.0f && zExtent > 0.0); Q_ASSERT(yzResolution.width() >= 2 && yzResolution.height() >=2); @@ -491,7 +491,7 @@ MeshDataPtr createCuboidMesh(float xExtent, indexBuffer->setUsage(QOpenGLBuffer::StaticDraw); indexBuffer->setData(indexBytes); - MeshDataPtr mesh(new MeshData(GL_TRIANGLES)); + QMeshDataPtr mesh(new QMeshData(GL_TRIANGLES)); quint32 offset = 0; mesh->addAttribute(QAbstractMeshData::defaultPositionAttributeName(), AttributePtr(new Attribute(vertexBuffer, GL_FLOAT_VEC3, nVerts, offset, stride))); |