summaryrefslogtreecommitdiffstats
path: root/src/render/jobs/pickboundingvolumejob_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/render/jobs/pickboundingvolumejob_p.h')
-rw-r--r--src/render/jobs/pickboundingvolumejob_p.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/render/jobs/pickboundingvolumejob_p.h b/src/render/jobs/pickboundingvolumejob_p.h
index 6edfa23b4..aeb2f008e 100644
--- a/src/render/jobs/pickboundingvolumejob_p.h
+++ b/src/render/jobs/pickboundingvolumejob_p.h
@@ -70,13 +70,12 @@ class Entity;
class Renderer;
class NodeManagers;
-class Q_AUTOTEST_EXPORT PickBoundingVolumeJob : public Qt3DCore::QAspectJob, public Qt3DCore::QBoundingVolumeProvider
+class Q_AUTOTEST_EXPORT PickBoundingVolumeJob : public Qt3DCore::QAspectJob
{
public:
PickBoundingVolumeJob(Renderer *renderer);
void setRoot(Entity *root);
- QVector<Qt3DCore::QBoundingVolume *> boundingVolumes() const Q_DECL_FINAL;
static Qt3DCore::QRay3D intersectionRay(const QPoint &pos,
const QMatrix4x4 &viewMatrix,
@@ -91,7 +90,6 @@ private:
Entity *m_node;
QList<QMouseEvent> m_mouseEvents;
- QVector<Qt3DCore::QBoundingVolume *> gatherBoundingVolumes(Entity *entity) const;
void viewMatrixForCamera(const Qt3DCore::QNodeId &cameraId,
QMatrix4x4 &viewMatrix,
QMatrix4x4 &projectionMatrix) const;
@@ -99,7 +97,8 @@ private:
QVector<Qt3DCore::QNodeId> hitsForViewportAndCamera(const QPoint &pos,
const QRectF &relativeViewport,
const Qt3DCore::QNodeId &cameraId,
- Qt3DCore::QAbstractCollisionQueryService *rayCasting) const;
+ Qt3DCore::QAbstractCollisionQueryService *rayCasting,
+ Qt3DCore::QBoundingVolumeProvider *volumeProvider) const;
void clearPreviouslyHoveredPickers();
HObjectPicker m_currentPicker;
QVector<HObjectPicker> m_hoveredPickers;