diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-08-06 14:36:42 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-08-07 19:42:30 +0000 |
| commit | ac359858c6dc71cd1f09fb4fb6ff11c945190cb5 (patch) | |
| tree | ec3cb7144b4289ec3601d208c8c4e06e96b39cda /src/render/backend/jobs | |
| parent | ff868c5430891d166dc2098641f9d1e48246fced (diff) | |
RenderMesh removed, replaced by RenderGeometryRenderer
Change-Id: If049768730a0f3aad3ea2b4f5cda2808f4035726
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/backend/jobs')
| -rw-r--r-- | src/render/backend/jobs/framepreparationjob.cpp | 24 | ||||
| -rw-r--r-- | src/render/backend/jobs/loadmeshdatajob.cpp | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/render/backend/jobs/framepreparationjob.cpp b/src/render/backend/jobs/framepreparationjob.cpp index 3a77ec67f..5c817f068 100644 --- a/src/render/backend/jobs/framepreparationjob.cpp +++ b/src/render/backend/jobs/framepreparationjob.cpp @@ -37,7 +37,6 @@ #include "framepreparationjob_p.h" #include <Qt3DRenderer/private/renderer_p.h> #include <Qt3DRenderer/private/renderentity_p.h> -#include <Qt3DRenderer/private/rendermesh_p.h> #include <Qt3DRenderer/private/rendershaderdata_p.h> #include <Qt3DRenderer/qmeshdata.h> #include <Qt3DRenderer/sphere.h> @@ -67,18 +66,19 @@ void FramePreparationJob::run() void FramePreparationJob::parseNodeTree(RenderEntity *node) { // Initialize worldBoundingVolume if Mesh associated - Qt3D::Render::RenderMesh *mesh = Q_NULLPTR; + Qt3D::Render::RenderGeometryRenderer *mesh = Q_NULLPTR; if ((node->localBoundingVolume()->isNull()) - && (mesh = node->renderComponent<RenderMesh>()) != Q_NULLPTR) { - if (!mesh->meshDataHandle().isNull()) { - Qt3D::QMeshData *meshData = mesh->meshData(); - if (meshData != Q_NULLPTR) { - const QAxisAlignedBoundingBox box = meshData->boundingBox(); - node->localBoundingVolume()->setCenter(box.center()); - const QVector3D &radii = box.radii(); - node->localBoundingVolume()->setRadius(qMax(radii.x(), qMax(radii.y(), radii.z()))); - } - } + && (mesh = node->renderComponent<RenderGeometryRenderer>()) != Q_NULLPTR) { + // if (!mesh->meshDataHandle().isNull()) { + // Qt3D::QMeshData *meshData = mesh->meshData(); + // if (meshData != Q_NULLPTR) { + // const QAxisAlignedBoundingBox box = meshData->boundingBox(); + // node->localBoundingVolume()->setCenter(box.center()); + // const QVector3D &radii = box.radii(); + // node->localBoundingVolume()->setRadius(qMax(radii.x(), qMax(radii.y(), radii.z()))); + // } + // } + // TO DO: Make that work with the GeometryRenderer } // Update transform properties in RenderShaderData diff --git a/src/render/backend/jobs/loadmeshdatajob.cpp b/src/render/backend/jobs/loadmeshdatajob.cpp index 5bc54ee48..93c3aea7d 100644 --- a/src/render/backend/jobs/loadmeshdatajob.cpp +++ b/src/render/backend/jobs/loadmeshdatajob.cpp @@ -87,7 +87,7 @@ void LoadMeshDataJob::run() qCWarning(Jobs) << Q_FUNC_INFO << "unknown attribute: position"; } lock.relock(); - m_renderer->meshManager()->lookupResource(m_meshUuid)->setMeshData(meshDataHandle); +// m_renderer->meshManager()->lookupResource(m_meshUuid)->setMeshData(meshDataHandle); } } // namespace Render |