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

Refactor CollisionPickResult::toVariantMap

Browse source
This commit is contained in:
sabrina-shanman 2018-08-09 17:11:32 -07:00
parent ad36e23c34
commit 26ae688d59
1 changed files with 22 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,36 +23,8 @@ QVariantMap CollisionPickResult::toVariantMap() const {
std::unordered_map<QUuid, QVariantMap> intersections; std::unordered_map<QUuid, QVariantMap> intersections;
std::unordered_map<QUuid, QVariantList> collisionPointPairs; std::unordered_map<QUuid, QVariantList> collisionPointPairs;
IntersectionType intersectionTypesToCheck[] = { ENTITY, AVATAR }; buildObjectIntersectionsMap(ENTITY, entityIntersections, intersections, collisionPointPairs);
for (int i = 0; i < 2; i++) { buildObjectIntersectionsMap(AVATAR, avatarIntersections, intersections, collisionPointPairs);
IntersectionType intersectionType = intersectionTypesToCheck[i];
const std::vector<ContactTestResult>* objectIntersections;
if (intersectionType == ENTITY) {
objectIntersections = &entityIntersections;
}
else {
objectIntersections = &avatarIntersections;
}
for (auto& objectIntersection : *objectIntersections) {
auto at = intersections.find(objectIntersection.foundID);
if (at == intersections.end()) {
QVariantMap intersectingObject;
intersectingObject["id"] = objectIntersection.foundID;
intersectingObject["type"] = intersectionType;
intersections[objectIntersection.foundID] = intersectingObject;
collisionPointPairs[objectIntersection.foundID] = QVariantList();
}
QVariantMap collisionPointPair;
collisionPointPair["pointOnPick"] = vec3toVariant(objectIntersection.testCollisionPoint);
collisionPointPair["pointOnObject"] = vec3toVariant(objectIntersection.foundCollisionPoint);
collisionPointPairs[objectIntersection.foundID].append(collisionPointPair);
}
}
QVariantList qIntersectingObjects; QVariantList qIntersectingObjects;
for (auto& intersectionKeyVal : intersections) { for (auto& intersectionKeyVal : intersections) {
@ -70,6 +42,26 @@ QVariantMap CollisionPickResult::toVariantMap() const {
return variantMap; return variantMap;
} }
void buildObjectIntersectionsMap(IntersectionType intersectionType, const std::vector<ContactTestResult>& objectIntersections, std::unordered_map<QUuid, QVariantMap>& intersections, std::unordered_map<QUuid, QVariantList>& collisionPointPairs) {
for (auto& objectIntersection : objectIntersections) {
auto at = intersections.find(objectIntersection.foundID);
if (at == intersections.end()) {
QVariantMap intersectingObject;
intersectingObject["id"] = objectIntersection.foundID;
intersectingObject["type"] = intersectionType;
intersections[objectIntersection.foundID] = intersectingObject;
collisionPointPairs[objectIntersection.foundID] = QVariantList();
}
QVariantMap collisionPointPair;
collisionPointPair["pointOnPick"] = vec3toVariant(objectIntersection.testCollisionPoint);
collisionPointPair["pointOnObject"] = vec3toVariant(objectIntersection.foundCollisionPoint);
collisionPointPairs[objectIntersection.foundID].append(collisionPointPair);
}
}
bool CollisionPick::isShapeInfoReady() { bool CollisionPick::isShapeInfoReady() {
if (_mathPick.shouldComputeShapeInfo()) { if (_mathPick.shouldComputeShapeInfo()) {
if (_cachedResource && _cachedResource->isLoaded()) { if (_cachedResource && _cachedResource->isLoaded()) {