Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 03:40:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use std::vector::insert for merging CollisionPickResults

Browse source
This commit is contained in:
sabrina-shanman 2018-08-17 13:17:35 -07:00
parent e3c39020dc
commit 6081d63f53
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/raypick/CollisionPick.cpp
View file

@ -20,17 +20,13 @@ PickResultPointer CollisionPickResult::compareAndProcessNewResult(const PickResu
const std::shared_ptr<CollisionPickResult> newCollisionResult = std::static_pointer_cast<CollisionPickResult>(newRes); const std::shared_ptr<CollisionPickResult> newCollisionResult = std::static_pointer_cast<CollisionPickResult>(newRes);
if (entityIntersections->size()) { if (entityIntersections->size()) {
for (ContactTestResult& entityIntersection : *(newCollisionResult->entityIntersections)) { entityIntersections->insert(entityIntersections->cend(), newCollisionResult->entityIntersections->begin(), newCollisionResult->entityIntersections->end());
entityIntersections->push_back(entityIntersection);
}
} else { } else {
entityIntersections = newCollisionResult->entityIntersections; entityIntersections = newCollisionResult->entityIntersections;
} }
if (avatarIntersections->size()) { if (avatarIntersections->size()) {
for (ContactTestResult& avatarIntersection : *(newCollisionResult->avatarIntersections)) { avatarIntersections->insert(avatarIntersections->cend(), newCollisionResult->avatarIntersections->begin(), newCollisionResult->avatarIntersections->end());
avatarIntersections->push_back(avatarIntersection);
}
} else { } else {
avatarIntersections = newCollisionResult->avatarIntersections; avatarIntersections = newCollisionResult->avatarIntersections;
} }