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 | |
parent | 7ae3f3b737fa893da5d12d8ec5aff09e82f6dfb6 (diff) |
Rename MeshData -> QMeshData
Change-Id: I23a466ebd29666bed1c56f29c6f049544a4eca23
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render')
30 files changed, 119 insertions, 122 deletions
diff --git a/src/render/backend/jobs/loadmeshdatajob.cpp b/src/render/backend/jobs/loadmeshdatajob.cpp index 9ff2ac9ae..10cfce872 100644 --- a/src/render/backend/jobs/loadmeshdatajob.cpp +++ b/src/render/backend/jobs/loadmeshdatajob.cpp @@ -71,7 +71,7 @@ void LoadMeshDataJob::run() if (m_functor.isNull()) return ; // Load the mesh from disk (or wherever) - MeshDataPtr meshDataPtr = m_functor->operator ()().staticCast<MeshData>(); + QMeshDataPtr meshDataPtr = m_functor->operator ()().staticCast<QMeshData>(); if (meshDataPtr.isNull()) { qCDebug(Jobs) << Q_FUNC_INFO << "Mesh has no raw data"; return ; @@ -79,7 +79,7 @@ void LoadMeshDataJob::run() // TO DO try to use QAbstractMeshData if possible QMutexLocker lock(m_renderer->mutex()); - MeshData *meshData = m_renderer->meshDataManager()->getOrCreateResource(m_meshUuid); + QMeshData *meshData = m_renderer->meshDataManager()->getOrCreateResource(m_meshUuid); *meshData = *(meshDataPtr.data()); AttributePtr attr = meshData->attributeByName(QAbstractMeshData::defaultPositionAttributeName()).staticCast<Attribute>(); diff --git a/src/render/backend/jobs/loadmeshdatajob.h b/src/render/backend/jobs/loadmeshdatajob.h index bbd9a75e9..e4f871a10 100644 --- a/src/render/backend/jobs/loadmeshdatajob.h +++ b/src/render/backend/jobs/loadmeshdatajob.h @@ -45,7 +45,7 @@ #include <QUuid> #include <Qt3DCore/qjob.h> #include <Qt3DCore/qhandle.h> -#include <Qt3DRenderer/meshdata.h> +#include <Qt3DRenderer/qmeshdata.h> #include <Qt3DCore/qabstractmesh.h> #include <QSharedPointer> @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -typedef QHandle<MeshData, 16> HMeshData; +typedef QHandle<QMeshData, 16> HMeshData; namespace Render { diff --git a/src/render/backend/meshdatamanager.cpp b/src/render/backend/meshdatamanager.cpp index af53b47e1..d47fbe1a8 100644 --- a/src/render/backend/meshdatamanager.cpp +++ b/src/render/backend/meshdatamanager.cpp @@ -47,7 +47,7 @@ namespace Qt3D { namespace Render { MeshDataManager::MeshDataManager() - : QResourcesManager<MeshData, + : QResourcesManager<QMeshData, QUuid, 16, Qt3D::ListAllocatingPolicy, diff --git a/src/render/backend/meshdatamanager_p.h b/src/render/backend/meshdatamanager_p.h index b7e2bb21f..3ab1d9d13 100644 --- a/src/render/backend/meshdatamanager_p.h +++ b/src/render/backend/meshdatamanager_p.h @@ -44,7 +44,7 @@ #include <Qt3DCore/qabstractmesh.h> #include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/meshdata.h> +#include <Qt3DRenderer/qmeshdata.h> #include <Qt3DRenderer/private/rendermesh_p.h> #include <QHash> @@ -57,10 +57,10 @@ QT_BEGIN_NAMESPACE namespace Qt3D { namespace Render { -typedef QHandle<MeshData, 16> HMeshData; +typedef QHandle<QMeshData, 16> HMeshData; typedef QHandle<RenderMesh, 16> HMesh; -class MeshDataManager : public QResourcesManager<MeshData, +class MeshDataManager : public QResourcesManager<QMeshData, QUuid, 16, Qt3D::ListAllocatingPolicy, @@ -70,8 +70,8 @@ public: MeshDataManager(); inline bool hasMeshData(const QUuid &id) { return contains(id); } - inline MeshData* getOrCreateMeshData(const QUuid &id) { return getOrCreateResource(id); } - inline MeshData* meshData(const QUuid &id) { return lookupResource(id); } + inline QMeshData* getOrCreateMeshData(const QUuid &id) { return getOrCreateResource(id); } + inline QMeshData* meshData(const QUuid &id) { return lookupResource(id); } void addMeshData(QAbstractMeshFunctorPtr functor, const QUuid &meshUuid); QHash<QUuid, QAbstractMeshFunctorPtr> meshesPending(); diff --git a/src/render/backend/qgraphicscontext_p.h b/src/render/backend/qgraphicscontext_p.h index ccd01eaba..060b91324 100644 --- a/src/render/backend/qgraphicscontext_p.h +++ b/src/render/backend/qgraphicscontext_p.h @@ -51,7 +51,7 @@ #include <QMatrix4x4> #include <QBitArray> #include <Qt3DRenderer/private/quniformvalue_p.h> -#include <Qt3DRenderer/private/meshdata_p.h> +#include <Qt3DRenderer/private/qmeshdata_p.h> #include <Qt3DRenderer/qattribute.h> #include <Qt3DRenderer/qbuffer.h> diff --git a/src/render/backend/rendercommand_p.h b/src/render/backend/rendercommand_p.h index ac09312af..21d285f28 100644 --- a/src/render/backend/rendercommand_p.h +++ b/src/render/backend/rendercommand_p.h @@ -45,7 +45,7 @@ #include <qglobal.h> #include <Qt3DRenderer/private/quniformvalue_p.h> -#include <Qt3DRenderer/private/meshdata_p.h> +#include <Qt3DRenderer/private/qmeshdata_p.h> #include <Qt3DCore/qhandle.h> #include <QOpenGLShaderProgram> #include <QOpenGLTexture> @@ -70,7 +70,7 @@ typedef QHandle<QOpenGLVertexArrayObject*, 16> HVao; typedef QHandle<RenderMaterial, 16> HMaterial; typedef QHandle<RenderMesh, 16> HMesh; typedef QHandle<RenderShader, 16> HShader; -typedef QHandle<MeshData, 16> HMeshData; +typedef QHandle<QMeshData, 16> HMeshData; typedef QHandle<RenderTechnique, 16> HTechnique; class RenderCommand diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index c68955c9d..cf03b051a 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -477,7 +477,7 @@ void Renderer::executeCommands(const QVector<RenderCommand *> &commands) Q_FOREACH (RenderCommand *command, commands) { - MeshData *meshData = m_meshDataManager->data(command->m_meshData); + QMeshData *meshData = m_meshDataManager->data(command->m_meshData); if (meshData == Q_NULLPTR || meshData->attributeNames().empty()) { qCWarning(Rendering) << "RenderCommand should have a mesh"; continue ; @@ -491,7 +491,7 @@ void Renderer::executeCommands(const QVector<RenderCommand *> &commands) command->m_vao = m_vaoManager->lookupHandle(QPair<HMeshData, HShader>(command->m_meshData, command->m_shader)); if (command->m_vao.isNull()) { - // Either VAO has not been created for MeshData and RenderPass + // Either VAO has not been created for QMeshData and RenderPass // Or there is no RenderPass // Tries to use vao for Mesh source and Default Technique qCDebug(Backend) << Q_FUNC_INFO << "VAO Handle is null"; @@ -499,7 +499,7 @@ void Renderer::executeCommands(const QVector<RenderCommand *> &commands) // Check if HShader exists. If it doesn't that means there is no RenderPass // Otherwise use a default renderpass name command->m_vao = m_vaoManager->lookupHandle(QPair<HMeshData, HShader>(command->m_meshData, command->m_shader)); - // Check if VAO pointer for the MeshData / RenderShader exists + // Check if VAO pointer for the QMeshData / RenderShader exists if (command->m_vao.isNull()) { qCDebug(Rendering) << Q_FUNC_INFO << "Allocating new VAO"; command->m_vao = m_vaoManager->getOrAcquireHandle(QPair<HMeshData, HShader>(command->m_meshData, command->m_shader)); @@ -509,8 +509,8 @@ void Renderer::executeCommands(const QVector<RenderCommand *> &commands) QOpenGLVertexArrayObject *vao = *(m_vaoManager->data(command->m_vao)); Q_ASSERT(vao); - // The VAO should be created only once for a MeshData and a ShaderProgram - // Manager should have a VAO Manager that are indexed by MeshData and Shader + // The VAO should be created only once for a QMeshData and a ShaderProgram + // Manager should have a VAO Manager that are indexed by QMeshData and Shader // RenderCommand should have a handle to the corresponding VAO for the Mesh and Shader bool drawIndexed = !meshData->indexAttribute().isNull(); diff --git a/src/render/backend/rendermesh.cpp b/src/render/backend/rendermesh.cpp index d675bd2ae..9add4db18 100644 --- a/src/render/backend/rendermesh.cpp +++ b/src/render/backend/rendermesh.cpp @@ -49,7 +49,7 @@ #include <Qt3DRenderer/private/meshdatamanager_p.h> #include "qmesh.h" #include <Qt3DRenderer/private/qgraphicscontext_p.h> -#include <meshdata.h> +#include <Qt3DRenderer/qmeshdata.h> #include <Qt3DCore/qaspectmanager.h> #include <Qt3DCore/qscenepropertychange.h> @@ -69,11 +69,11 @@ namespace Render { * \class RenderMesh * * Monitor a frontend Mesh for source changes. If the source is changed, - * the MeshData returned is either a valid MeshData corresponding to the source - * or null if the new MeshData hasn't been loaded. If this is the case the meshDirty + * the QMeshData returned is either a valid QMeshData corresponding to the source + * or null if the new QMeshData hasn't been loaded. If this is the case the meshDirty * flag is set to true. * - * \sa MeshData + * \sa QMeshData */ RenderMesh::RenderMesh() : diff --git a/src/render/backend/rendermesh_p.h b/src/render/backend/rendermesh_p.h index 06c5699da..d3cbcc102 100644 --- a/src/render/backend/rendermesh_p.h +++ b/src/render/backend/rendermesh_p.h @@ -57,10 +57,10 @@ namespace Qt3D { class QAbstractMesh; class QAbstractMeshFunctor; class QRenderPass; -class MeshData; +class QMeshData; typedef QSharedPointer<QAbstractMeshFunctor> QAbstractMeshFunctorPtr; -typedef QHandle<MeshData, 16> HMeshData; +typedef QHandle<QMeshData, 16> HMeshData; namespace Render { diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp index 10cf409ee..b84104320 100644 --- a/src/render/backend/renderview.cpp +++ b/src/render/backend/renderview.cpp @@ -56,7 +56,7 @@ #include <Qt3DRenderer/private/layermanager_p.h> #include <Qt3DRenderer/private/lightmanager_p.h> #include <Qt3DRenderer/private/materialmanager_p.h> -#include <Qt3DRenderer/private/meshdata_p.h> +#include <Qt3DRenderer/private/qmeshdata_p.h> #include <Qt3DRenderer/private/meshdatamanager_p.h> #include <Qt3DRenderer/private/meshmanager_p.h> #include <Qt3DRenderer/private/qparameter_p.h> diff --git a/src/render/backend/vaomanager_p.h b/src/render/backend/vaomanager_p.h index 7bc356e25..686b68f00 100644 --- a/src/render/backend/vaomanager_p.h +++ b/src/render/backend/vaomanager_p.h @@ -51,14 +51,14 @@ class QOpenGLVertexArrayObject; namespace Qt3D { -class MeshData; +class QMeshData; namespace Render { class RenderShader; typedef QHandle<QOpenGLVertexArrayObject*, 16> HVao; -typedef QHandle<MeshData, 16> HMeshData; +typedef QHandle<QMeshData, 16> HMeshData; typedef QHandle<RenderShader, 16> HShader; class VAOManager : public QResourcesManager<QOpenGLVertexArrayObject*, QPair<HMeshData, HShader>, 16> diff --git a/src/render/frontend/qabstractshapemesh_p.h b/src/render/frontend/qabstractshapemesh_p.h index bf03c96a7..1df348670 100644 --- a/src/render/frontend/qabstractshapemesh_p.h +++ b/src/render/frontend/qabstractshapemesh_p.h @@ -45,7 +45,7 @@ #include <private/qcomponent_p.h> #include <private/qabstractmesh_p.h> #include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/meshdata.h> +#include <Qt3DRenderer/qmeshdata.h> QT_BEGIN_NAMESPACE 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))); diff --git a/src/render/frontend/qitemmodelbuffer.h b/src/render/frontend/qitemmodelbuffer.h index f1bd23940..e06ce6e2f 100644 --- a/src/render/frontend/qitemmodelbuffer.h +++ b/src/render/frontend/qitemmodelbuffer.h @@ -45,7 +45,7 @@ #include <QObject> #include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/meshdata.h> +#include <Qt3DRenderer/qmeshdata.h> #include <Qt3DRenderer/qbuffer.h> #include <Qt3DRenderer/qattribute.h> diff --git a/src/render/frontend/qmesh.cpp b/src/render/frontend/qmesh.cpp index 4dac20b15..ff3869dde 100644 --- a/src/render/frontend/qmesh.cpp +++ b/src/render/frontend/qmesh.cpp @@ -128,7 +128,7 @@ QAbstractMeshDataPtr MeshFunctor::operator()() { if (m_sourcePath.isEmpty()) { qCWarning(Render::Jobs) << Q_FUNC_INFO << "Mesh is empty, nothing to load"; - return MeshDataPtr(); + return QMeshDataPtr(); } // TO DO : Maybe use Assimp instead of ObjLoader to handle more sources @@ -137,10 +137,10 @@ QAbstractMeshDataPtr MeshFunctor::operator()() qCDebug(Render::Jobs) << Q_FUNC_INFO << "Loading mesh from" << m_sourcePath; if (loader.load(m_sourcePath)) - return MeshDataPtr(loader.mesh()); + return QMeshDataPtr(loader.mesh()); qCWarning(Render::Jobs) << Q_FUNC_INFO << "OBJ load failure for:" << m_sourcePath; - return MeshDataPtr(); + return QMeshDataPtr(); } } // namespace Qt3D diff --git a/src/render/frontend/qmesh.h b/src/render/frontend/qmesh.h index 6227cc0fc..f00b8b215 100644 --- a/src/render/frontend/qmesh.h +++ b/src/render/frontend/qmesh.h @@ -44,7 +44,7 @@ #include <Qt3DCore/qabstractmesh.h> #include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/meshdata.h> +#include <Qt3DRenderer/qmeshdata.h> QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qmesh_p.h b/src/render/frontend/qmesh_p.h index c6c6c1989..ee9a08177 100644 --- a/src/render/frontend/qmesh_p.h +++ b/src/render/frontend/qmesh_p.h @@ -44,7 +44,7 @@ #include <private/qabstractmesh_p.h> #include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/meshdata.h> +#include <Qt3DRenderer/qmeshdata.h> QT_BEGIN_NAMESPACE @@ -59,7 +59,7 @@ public: Q_DECLARE_PUBLIC(QMesh) - MeshDataPtr m_data; + QMeshDataPtr m_data; QString m_source; }; diff --git a/src/render/frontend/qplanemesh.cpp b/src/render/frontend/qplanemesh.cpp index e40bf3be1..c34d2710c 100644 --- a/src/render/frontend/qplanemesh.cpp +++ b/src/render/frontend/qplanemesh.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 @@ -137,7 +137,7 @@ QSize QPlaneMesh::meshResolution() const return d->m_meshResolution; } -MeshDataPtr createPlaneMesh(float w, float h, const QSize &resolution); +QMeshDataPtr createPlaneMesh(float w, float h, const QSize &resolution); class PlaneMeshFunctor : public QAbstractMeshFunctor { @@ -160,7 +160,7 @@ private: QSize m_meshResolution; }; -MeshDataPtr createPlaneMesh(float w, float h, const QSize &resolution) +QMeshDataPtr createPlaneMesh(float w, float h, const QSize &resolution) { Q_ASSERT(w > 0.0f); Q_ASSERT(h > 0.0f); @@ -222,7 +222,7 @@ MeshDataPtr createPlaneMesh(float w, float h, const QSize &resolution) buf->setData(bufferBytes); // Create the mesh data, specify the vertex format and data - MeshDataPtr mesh(new MeshData(GL_TRIANGLES)); + QMeshDataPtr mesh(new QMeshData(GL_TRIANGLES)); quint32 offset = 0; mesh->addAttribute(QAbstractMeshData::defaultPositionAttributeName(), AttributePtr(new Attribute(buf, GL_FLOAT_VEC3, nVerts, offset, stride))); diff --git a/src/render/frontend/qspheremesh.cpp b/src/render/frontend/qspheremesh.cpp index a2a64983a..0c74b5aef 100644 --- a/src/render/frontend/qspheremesh.cpp +++ b/src/render/frontend/qspheremesh.cpp @@ -181,9 +181,9 @@ float QSphereMesh::radius() const return d->m_radius; } -MeshDataPtr createSphereMesh(double radius, int rings, int slices, bool hasTangents) +QMeshDataPtr createSphereMesh(double radius, int rings, int slices, bool hasTangents) { - MeshDataPtr mesh(new MeshData(GL_TRIANGLES)); + QMeshDataPtr mesh(new QMeshData(GL_TRIANGLES)); int nVerts = ( slices + 1 ) * ( rings + 1 ); // One extra line of latitude QByteArray bufferBytes; diff --git a/src/render/frontend/qtorusmesh.cpp b/src/render/frontend/qtorusmesh.cpp index 805263080..60d63c189 100644 --- a/src/render/frontend/qtorusmesh.cpp +++ b/src/render/frontend/qtorusmesh.cpp @@ -171,7 +171,7 @@ float QTorusMesh::minorRadius() const QAbstractMeshDataPtr createTorusMesh(double radius, double minorRadius, int rings, int sides) { - QAbstractMeshDataPtr mesh(new MeshData(GL_TRIANGLES)); + QAbstractMeshDataPtr mesh(new QMeshData(GL_TRIANGLES)); int nVerts = sides * ( rings + 1 ); QByteArray bufferBytes; diff --git a/src/render/io/assimpparser.cpp b/src/render/io/assimpparser.cpp index dc1fba903..ec570d9c8 100644 --- a/src/render/io/assimpparser.cpp +++ b/src/render/io/assimpparser.cpp @@ -184,19 +184,19 @@ public : void copy(const QNode *ref) Q_DECL_OVERRIDE; QAbstractMeshFunctorPtr meshFunctor() const Q_DECL_OVERRIDE; - void setData(MeshDataPtr data); + void setData(QMeshDataPtr data); private: - MeshDataPtr m_meshData; + QMeshDataPtr m_meshData; AssimpMesh *doClone(QNode *clonedParent) const Q_DECL_OVERRIDE; class AssimpMeshFunctor : public QAbstractMeshFunctor { public: - explicit AssimpMeshFunctor(MeshDataPtr meshData); + explicit AssimpMeshFunctor(QMeshDataPtr meshData); QAbstractMeshDataPtr operator()() Q_DECL_OVERRIDE; private: - MeshDataPtr m_meshData; + QMeshDataPtr m_meshData; }; }; @@ -447,15 +447,15 @@ void AssimpParser::loadMaterial(uint materialIndex) } /*! - * Converts the Assimp aiMesh mesh identified by \a meshIndex to a MeshData - * \sa MeshData and adds it to a dictionary of meshes. + * Converts the Assimp aiMesh mesh identified by \a meshIndex to a QMeshData + * \sa QMeshData and adds it to a dictionary of meshes. */ void AssimpParser::loadMesh(uint meshIndex) { aiMesh *mesh = m_aiScene->mMeshes[meshIndex]; // Primitive are always triangles with the current Assimp's configuration - MeshDataPtr meshData(new MeshData(GL_TRIANGLES)); + QMeshDataPtr meshData(new QMeshData(GL_TRIANGLES)); // Mesh Name QString meshName = QString::fromUtf8(mesh->mName.data); @@ -826,7 +826,7 @@ void AssimpMesh::copy(const QNode *ref) } } -void AssimpMesh::setData(MeshDataPtr data) +void AssimpMesh::setData(QMeshDataPtr data) { m_meshData = data; QAbstractMesh::setDirty(this); @@ -842,7 +842,7 @@ QAbstractMeshFunctorPtr AssimpMesh::meshFunctor() const return QAbstractMeshFunctorPtr(new AssimpMeshFunctor(m_meshData)); } -AssimpMesh::AssimpMeshFunctor::AssimpMeshFunctor(MeshDataPtr meshData) +AssimpMesh::AssimpMeshFunctor::AssimpMeshFunctor(QMeshDataPtr meshData) : QAbstractMeshFunctor() , m_meshData(meshData) { diff --git a/src/render/io/assimpparser_p.h b/src/render/io/assimpparser_p.h index 80033df47..adae4709b 100644 --- a/src/render/io/assimpparser_p.h +++ b/src/render/io/assimpparser_p.h @@ -48,7 +48,7 @@ #include <assimp/postprocess.h> #include <assimp/DefaultLogger.hpp> #include <Qt3DCore/qabstractmesh.h> -#include <Qt3DRenderer/meshdata.h> +#include <Qt3DRenderer/qmeshdata.h> #include <Qt3DRenderer/private/assimphelpers_p.h> #include <Qt3DRenderer/private/abstractsceneparser_p.h> @@ -85,7 +85,7 @@ public: QEntity *node(QString id) Q_DECL_OVERRIDE; QEntity *defaultScene(); - MeshDataPtr mesh(QString id); + QMeshDataPtr mesh(QString id); QMaterial *material(QString id); QCamera *camera(QString id); diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp index b2beae588..eff6a90d7 100644 --- a/src/render/io/gltfparser.cpp +++ b/src/render/io/gltfparser.cpp @@ -210,22 +210,22 @@ private: class GLTFParserMeshFunctor : public QAbstractMeshFunctor { public: - explicit GLTFParserMeshFunctor(MeshDataPtr meshData); + explicit GLTFParserMeshFunctor(QMeshDataPtr meshData); QAbstractMeshDataPtr operator ()() Q_DECL_OVERRIDE; private: - MeshDataPtr m_meshData; + QMeshDataPtr m_meshData; }; public: explicit GLTFParserMesh(QNode *parent = 0); void copy(const QNode *ref) Q_DECL_OVERRIDE; - void setData(MeshDataPtr data); + void setData(QMeshDataPtr data); QAbstractMeshFunctorPtr meshFunctor() const Q_DECL_OVERRIDE; private: - MeshDataPtr m_meshData; + QMeshDataPtr m_meshData; GLTFParserMesh *doClone(QNode *clonedParent) const Q_DECL_OVERRIDE; }; @@ -297,14 +297,14 @@ bool GLTFParser::isPathExtensionSupported(const QString &path) return GLTFParser::isGLTFPath(path); } -MeshDataPtr GLTFParser::mesh(QString id) +QMeshDataPtr GLTFParser::mesh(QString id) { parse(); if (m_meshDict.contains(id)) return m_meshDict.value(id); qWarning() << "Unknown mesh" << id << "in GLTF file" << m_basePath; - return MeshDataPtr(); + return QMeshDataPtr(); } QEntity* GLTFParser::defaultScene() @@ -376,7 +376,7 @@ QEntity* GLTFParser::node(QString id) continue; } - foreach (MeshDataPtr md, m_meshDict.values(m.toString())) { + foreach (QMeshDataPtr md, m_meshDict.values(m.toString())) { QString matId = m_meshMaterialDict[md.data()]; GLTFParserMesh* meshComp = new GLTFParserMesh; meshComp->setData(md); @@ -681,7 +681,7 @@ void GLTFParser::processJSONMesh( QString id, QJsonObject jsonObj ) continue; } - MeshDataPtr md( new MeshData( type ) ); + QMeshDataPtr md( new QMeshData( type ) ); m_meshMaterialDict[md.data()] = material; QJsonObject attrs = primObj.value(KEY_ATTRIBUTES).toObject(); @@ -1002,7 +1002,7 @@ void GLTFParserMesh::copy(const QNode *ref) } } -void GLTFParserMesh::setData(MeshDataPtr data) +void GLTFParserMesh::setData(QMeshDataPtr data) { m_meshData = data; QAbstractMesh::setDirty(this); @@ -1018,7 +1018,7 @@ GLTFParserMesh *GLTFParserMesh::doClone(QNode *clonedParent) const return new GLTFParserMesh(clonedParent); } -GLTFParserMesh::GLTFParserMeshFunctor::GLTFParserMeshFunctor(MeshDataPtr meshData) +GLTFParserMesh::GLTFParserMeshFunctor::GLTFParserMeshFunctor(QMeshDataPtr meshData) : QAbstractMeshFunctor() , m_meshData(meshData) { diff --git a/src/render/io/gltfparser_p.h b/src/render/io/gltfparser_p.h index d0230d761..1e8edf73f 100644 --- a/src/render/io/gltfparser_p.h +++ b/src/render/io/gltfparser_p.h @@ -43,7 +43,7 @@ #ifndef GLTFPARSER_H #define GLTFPARSER_H -#include <Qt3DRenderer/meshdata.h> +#include <Qt3DRenderer/qmeshdata.h> #include <Qt3DRenderer/qattribute.h> #include <Qt3DCore/qentity.h> #include <Qt3DRenderer/qtechnique.h> @@ -92,7 +92,7 @@ public: QEntity *defaultScene(); - MeshDataPtr mesh(QString id); + QMeshDataPtr mesh(QString id); QMaterial *material(QString id); QCameraLens *camera(QString id); @@ -111,13 +111,13 @@ private: bool m_parseDone; QString m_defaultScene; - // multi-hash because our MeshData corresponds to a single primitive + // multi-hash because our QMeshData corresponds to a single primitive // in glTf. - QMultiHash<QString, MeshDataPtr> m_meshDict; + QMultiHash<QString, QMeshDataPtr> m_meshDict; // GLTF assigns materials at the mesh level, but we do them as siblings, // so record the association here for when we instantiate meshes - QMap<MeshData*, QString> m_meshMaterialDict; + QMap<QMeshData*, QString> m_meshMaterialDict; QMap<QString, AttributePtr> m_attributeDict; diff --git a/src/render/io/objloader.cpp b/src/render/io/objloader.cpp index fc81d19f5..7ad8bc18f 100644 --- a/src/render/io/objloader.cpp +++ b/src/render/io/objloader.cpp @@ -212,9 +212,9 @@ bool ObjLoader::load(::QIODevice *ioDev) return true; } -MeshData *ObjLoader::mesh() const +QMeshData *ObjLoader::mesh() const { - MeshData *mesh = new MeshData(GL_TRIANGLES); + QMeshData *mesh = new QMeshData(GL_TRIANGLES); QByteArray bufferBytes; const int count = m_points.size(); diff --git a/src/render/io/objloader.h b/src/render/io/objloader.h index c976ce276..38de5ebd6 100644 --- a/src/render/io/objloader.h +++ b/src/render/io/objloader.h @@ -42,7 +42,7 @@ #ifndef OBJLOADER_H #define OBJLOADER_H -#include <Qt3DRenderer/meshdata.h> +#include <Qt3DRenderer/qmeshdata.h> #include <QVector> #include <QVector2D> @@ -111,7 +111,7 @@ public: QVector<QVector4D> tangents() const { return m_tangents; } QVector<unsigned int> indices() const { return m_indices; } - MeshData *mesh() const; + QMeshData *mesh() const; private: void updateIndices(const QVector<QVector3D> &positions, diff --git a/src/render/io/meshdata.cpp b/src/render/io/qmeshdata.cpp index 5f75a1844..11f625770 100644 --- a/src/render/io/meshdata.cpp +++ b/src/render/io/qmeshdata.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "meshdata.h" -#include "meshdata_p.h" +#include "qmeshdata.h" +#include "qmeshdata_p.h" #include <QSet> #include "renderlogging.h" @@ -50,40 +50,40 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -MeshDataPrivate::MeshDataPrivate(MeshData *qq) +QMeshDataPrivate::QMeshDataPrivate(QMeshData *qq) : QAbstractMeshDataPrivate(qq) , m_primitiveType(0) { } -MeshData::MeshData() - : QAbstractMeshData(*new MeshDataPrivate(this)) +QMeshData::QMeshData() + : QAbstractMeshData(*new QMeshDataPrivate(this)) { } -MeshData::MeshData(MeshDataPrivate &dd) +QMeshData::QMeshData(QMeshDataPrivate &dd) : QAbstractMeshData(dd) { } -MeshData::MeshData(int primitiveType) - : QAbstractMeshData(*new MeshDataPrivate(this)) +QMeshData::QMeshData(int primitiveType) + : QAbstractMeshData(*new QMeshDataPrivate(this)) { setPrimitiveType(primitiveType); } -void MeshData::setPrimitiveType(int primitiveType) +void QMeshData::setPrimitiveType(int primitiveType) { - Q_D(MeshData); + Q_D(QMeshData); Q_ASSERT((d->m_primitiveType == GL_TRIANGLES) || (d->m_primitiveType == GL_LINES) || (d->m_primitiveType == GL_POINTS)); d->m_primitiveType = primitiveType; } -int MeshData::primitiveType() const +int QMeshData::primitiveType() const { - Q_D(const MeshData); + Q_D(const QMeshData); return d->m_primitiveType; } diff --git a/src/render/io/meshdata.h b/src/render/io/qmeshdata.h index ff9a06ba1..043ff7ba1 100644 --- a/src/render/io/meshdata.h +++ b/src/render/io/qmeshdata.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QT3D_MESHDATA_H -#define QT3D_MESHDATA_H +#ifndef QT3D_QMESHDATA_H +#define QT3D_QMESHDATA_H #include <QSharedPointer> #include <Qt3DCore/qabstractmeshdata.h> @@ -51,32 +51,31 @@ QT_BEGIN_NAMESPACE namespace Qt3D { /** - * @brief The MeshData class is shared by all instances of a RenderMesh, + * @brief The QMeshData class is shared by all instances of a RenderMesh, * and holds the actual client (CPU)-side buffers representing mesh attributes * and indices. */ -class MeshDataPrivate; +class QMeshDataPrivate; -class QT3DRENDERERSHARED_EXPORT MeshData : public QAbstractMeshData +class QT3DRENDERERSHARED_EXPORT QMeshData : public QAbstractMeshData { public: - MeshData(); - explicit MeshData(int primitiveType); + QMeshData(); + explicit QMeshData(int primitiveType); void setPrimitiveType(int primitiveType) Q_DECL_OVERRIDE; int primitiveType() const Q_DECL_OVERRIDE; protected: - Q_DECLARE_PRIVATE(MeshData) - MeshData(MeshDataPrivate &dd); - + Q_DECLARE_PRIVATE(QMeshData) + QMeshData(QMeshDataPrivate &dd); }; -typedef QSharedPointer<MeshData> MeshDataPtr; +typedef QSharedPointer<QMeshData> QMeshDataPtr; } QT_END_NAMESPACE -#endif // QT3D_MESHDATA_H +#endif // QT3D_QMESHDATA_H diff --git a/src/render/io/meshdata_p.h b/src/render/io/qmeshdata_p.h index 9904df829..9776e2719 100644 --- a/src/render/io/meshdata_p.h +++ b/src/render/io/qmeshdata_p.h @@ -39,25 +39,23 @@ ** ****************************************************************************/ -#ifndef QT3D_MESHDATA_P_H -#define QT3D_MESHDATA_P_H +#ifndef QT3D_QMESHDATA_P_H +#define QT3D_QMESHDATA_P_H #include <private/qabstractmeshdata_p.h> #include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/meshdata.h> +#include <Qt3DRenderer/qmeshdata.h> QT_BEGIN_NAMESPACE namespace Qt3D { -class MeshData; - -class QT3DRENDERERSHARED_EXPORT MeshDataPrivate : public QAbstractMeshDataPrivate +class QT3DRENDERERSHARED_EXPORT QMeshDataPrivate : public QAbstractMeshDataPrivate { public: - MeshDataPrivate(MeshData *qq); + QMeshDataPrivate(QMeshData *qq); - Q_DECLARE_PUBLIC(MeshData) + Q_DECLARE_PUBLIC(QMeshData) int m_primitiveType; }; @@ -65,4 +63,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_MESHDATA_P_H +#endif // QT3D_QMESHDATA_P_H diff --git a/src/render/io/render-io.pri b/src/render/io/render-io.pri index 63ac6470b..f48d83b74 100644 --- a/src/render/io/render-io.pri +++ b/src/render/io/render-io.pri @@ -1,7 +1,7 @@ INCLUDEPATH += $$PWD HEADERS += \ - $$PWD/meshdata.h \ + $$PWD/qmeshdata.h \ $$PWD/gltfparser_p.h \ $$PWD/objloader.h \ $$PWD/texturedata.h \ @@ -12,10 +12,10 @@ HEADERS += \ $$PWD/qattribute_p.h \ $$PWD/qbuffer.h \ $$PWD/qbuffer_p.h \ - $$PWD/meshdata_p.h + $$PWD/qmeshdata_p.h SOURCES += \ - $$PWD/meshdata.cpp \ + $$PWD/qmeshdata.cpp \ $$PWD/gltfparser.cpp \ $$PWD/objloader.cpp \ $$PWD/texturedata.cpp \ |