summaryrefslogtreecommitdiffstats
path: root/src/render/jobs/pickboundingvolumeutils.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-09-08 12:18:26 +0200
committerSvenn-Arne Dragly <svenn-arne.dragly@qt.io>2017-12-13 18:53:05 +0000
commitc2e8b0dc4ddaaea9d20175cddea352e39f26896e (patch)
tree6642fe22d1151f7d1466e73f6a2c686c65dee700 /src/render/jobs/pickboundingvolumeutils.cpp
parent37d78994de56cd11a06ccd1a777cf0ac8ec8e801 (diff)
Get rid of the INDEXBITS template argument for QHandle
It's not required anymore, as the resource manager can grow as needed. Change-Id: If509de7f2ef90e1af9729d8fc60d7ecb08ede687 Reviewed-by: Svenn-Arne Dragly <svenn-arne.dragly@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/jobs/pickboundingvolumeutils.cpp')
-rw-r--r--src/render/jobs/pickboundingvolumeutils.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/jobs/pickboundingvolumeutils.cpp b/src/render/jobs/pickboundingvolumeutils.cpp
index 70f0b7f95..5c778bf29 100644
--- a/src/render/jobs/pickboundingvolumeutils.cpp
+++ b/src/render/jobs/pickboundingvolumeutils.cpp
@@ -194,7 +194,7 @@ AbstractCollisionGathererFunctor::~AbstractCollisionGathererFunctor()
AbstractCollisionGathererFunctor::result_type AbstractCollisionGathererFunctor::operator ()(const Entity *entity) const
{
- HObjectPicker objectPickerHandle = entity->componentHandle<ObjectPicker, 16>();
+ HObjectPicker objectPickerHandle = entity->componentHandle<ObjectPicker>();
// If the Entity which actually received the hit doesn't have
// an object picker component, we need to check the parent if it has one ...
@@ -202,7 +202,7 @@ AbstractCollisionGathererFunctor::result_type AbstractCollisionGathererFunctor::
while (objectPickerHandle.isNull() && parentEntity != nullptr) {
parentEntity = parentEntity->parent();
if (parentEntity != nullptr)
- objectPickerHandle = parentEntity->componentHandle<ObjectPicker, 16>();
+ objectPickerHandle = parentEntity->componentHandle<ObjectPicker>();
}
ObjectPicker *objectPicker = m_manager->objectPickerManager()->data(objectPickerHandle);
@@ -299,7 +299,7 @@ bool HierarchicalEntityPicker::collectHits(Entity *root)
QRayCastingService rayCasting;
std::vector<std::pair<Entity *, bool>> worklist;
- worklist.push_back({root, !root->componentHandle<ObjectPicker, 16>().isNull()});
+ worklist.push_back({root, !root->componentHandle<ObjectPicker>().isNull()});
while (!worklist.empty()) {
auto current = worklist.back();
@@ -320,7 +320,7 @@ bool HierarchicalEntityPicker::collectHits(Entity *root)
// and pick children
for (auto child: current.first->children())
- worklist.push_back({child, current.second || !child->componentHandle<ObjectPicker, 16>().isNull()});
+ worklist.push_back({child, current.second || !child->componentHandle<ObjectPicker>().isNull()});
}
return !m_hits.empty();