diff options
Diffstat (limited to 'src/render/backend/jobs/framepreparationjob.cpp')
| -rw-r--r-- | src/render/backend/jobs/framepreparationjob.cpp | 24 |
1 files changed, 12 insertions, 12 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 |