diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2015-12-03 14:49:40 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-12-10 17:44:50 +0000 |
| commit | 5bab5d2f9023ecda899a2eb5b074e1e91cfb8045 (patch) | |
| tree | e08d81fe1ef3a58c16714e3fd3f7be1a9c7230fc /src/render/geometry | |
| parent | 04da7188665ce6f9550807e5cd9c52e3fa717745 (diff) | |
Move all raycasting code as private in Qt3DRender
Change-Id: I871cbc57166493f30ea307305d8664e2f8a8873f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/geometry')
| -rw-r--r-- | src/render/geometry/geometryrenderer.cpp | 2 | ||||
| -rw-r--r-- | src/render/geometry/geometryrenderer_p.h | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp index 9a9cab227..bbe30e5fe 100644 --- a/src/render/geometry/geometryrenderer.cpp +++ b/src/render/geometry/geometryrenderer.cpp @@ -39,7 +39,7 @@ #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DRender/private/geometryrenderermanager_p.h> #include <Qt3DCore/qbackendscenepropertychange.h> -#include <Qt3DCore/qboundingvolume.h> +#include <Qt3DRender/private/qboundingvolume_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/geometryrenderer_p.h b/src/render/geometry/geometryrenderer_p.h index bbcd3397b..8e68ab1f8 100644 --- a/src/render/geometry/geometryrenderer_p.h +++ b/src/render/geometry/geometryrenderer_p.h @@ -54,12 +54,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3DCore { -class QBoundingVolume; -} - namespace Qt3DRender { +class QBoundingVolume; + namespace Render { class GeometryRendererManager; @@ -90,9 +88,9 @@ public: void unsetDirty(); // Build triangle data Job thread - void setTriangleVolumes(const QVector<Qt3DCore::QBoundingVolume *> &volumes); + void setTriangleVolumes(const QVector<QBoundingVolume *> &volumes); // Pick volumes job - QVector<Qt3DCore::QBoundingVolume *> triangleData() const; + QVector<QBoundingVolume *> triangleData() const; private: Qt3DCore::QNodeId m_geometryId; @@ -107,7 +105,7 @@ private: bool m_enabled; QGeometryFunctorPtr m_functor; GeometryRendererManager *m_manager; - QVector<Qt3DCore::QBoundingVolume *> m_triangleVolumes; + QVector<QBoundingVolume *> m_triangleVolumes; }; class GeometryRendererFunctor : public Qt3DCore::QBackendNodeFunctor |