diff options
| author | Paul Lemire <paul.lemire350@gmail.com> | 2015-08-10 15:26:28 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-08-11 17:29:25 +0000 |
| commit | 86efa9fe761915d738ba231a5d94c74af3660500 (patch) | |
| tree | 62176b3200e30bdf4f52ac2e1fd01277c80188ff /src/render/backend/qrenderaspect.cpp | |
| parent | dfe50678f651f4effd677e4fc9d7b518a5975329 (diff) | |
Cleanup: remove QAbstractMesh/QMeshData/MeshDataManager
Change-Id: I1f13cea4cf864dcf985d1f487e195509de9006e7
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/backend/qrenderaspect.cpp')
| -rw-r--r-- | src/render/backend/qrenderaspect.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/render/backend/qrenderaspect.cpp b/src/render/backend/qrenderaspect.cpp index 1bb9e1ffc..1c68454f5 100644 --- a/src/render/backend/qrenderaspect.cpp +++ b/src/render/backend/qrenderaspect.cpp @@ -37,7 +37,6 @@ #include "qrenderaspect.h" #include "qrenderaspect_p.h" -#include <Qt3DRenderer/private/meshdatamanager_p.h> #include <Qt3DRenderer/private/texturedatamanager_p.h> #include <Qt3DRenderer/private/renderer_p.h> #include <Qt3DRenderer/private/scenemanager_p.h> @@ -71,7 +70,6 @@ #include <Qt3DRenderer/private/cameraselectornode_p.h> #include <Qt3DRenderer/private/layerfilternode_p.h> -#include <Qt3DRenderer/private/meshdatamanager_p.h> #include <Qt3DRenderer/private/renderannotation_p.h> #include <Qt3DRenderer/private/renderentity_p.h> #include <Qt3DRenderer/private/renderer_p.h> @@ -89,7 +87,6 @@ #include <Qt3DRenderer/private/renderlogging_p.h> #include <Qt3DRenderer/private/rendernodefunctor_p.h> #include <Qt3DRenderer/private/framegraphnode_p.h> -#include <Qt3DRenderer/private/loadmeshdatajob_p.h> #include <Qt3DRenderer/private/loadtexturedatajob_p.h> #include <Qt3DRenderer/private/updateboundingvolumejob_p.h> #include <Qt3DRenderer/private/updateworldtransformjob_p.h> @@ -276,14 +273,6 @@ QVector<QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time) d->m_worldTransformJob.reset(new Render::UpdateWorldTransformJob(d->m_renderer->renderSceneRoot())); d->m_boundingVolumeJob.reset(new Render::UpdateBoundingVolumeJob(d->m_renderer->renderSceneRoot())); - const QHash<QNodeId, QAbstractMeshFunctorPtr> meshSources = d->m_renderer->meshDataManager()->meshesPending(); - Q_FOREACH (const QNodeId &meshId, meshSources.keys()) { - Render::LoadMeshDataJobPtr loadMeshJob(new Render::LoadMeshDataJob(meshSources[meshId], meshId)); - loadMeshJob->setRenderer(d->m_renderer); - jobs.append(loadMeshJob); - } - - const QVector<QNodeId> texturesPending = d->m_renderer->textureDataManager()->texturesPending(); Q_FOREACH (const QNodeId &textureId, texturesPending) { Render::LoadTextureDataJobPtr loadTextureJob(new Render::LoadTextureDataJob(textureId)); |