Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 02:48:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Consolidate intersection information in CollisionPickResult to one list, and move variant conversion code to source file

Browse source
This commit is contained in:
sabrina-shanman 2018-07-31 09:25:51 -07:00
parent de7d974336
commit a06f85faa8
2 changed files with 56 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,6 +14,61 @@
#include "ScriptEngineLogging.h" #include "ScriptEngineLogging.h"
#include "model-networking/ModelCache.h" #include "model-networking/ModelCache.h"
#include "UUIDHasher.h"
QVariantMap CollisionPickResult::toVariantMap() const {
QVariantMap variantMap;
variantMap["intersects"] = intersects;
std::unordered_map<QUuid, QVariantMap> intersections;
std::unordered_map<QUuid, QVariantList> collisionPointPairs;
IntersectionType intersectionTypesToCheck[] = { ENTITY, AVATAR };
for (int i = 0; i < 2; i++) {
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["pick"] = vec3toVariant(objectIntersection.testCollisionPoint);
collisionPointPair["object"] = vec3toVariant(objectIntersection.foundCollisionPoint);
collisionPointPairs[objectIntersection.foundID].append(collisionPointPair);
}
}
QVariantList qIntersectingObjects;
for (auto& intersectionKeyVal : intersections) {
const QUuid& id = intersectionKeyVal.first;
QVariantMap& intersection = intersectionKeyVal.second;
intersection["collisionPointPairs"] = collisionPointPairs[id];
qIntersectingObjects.append(intersection);
}
variantMap["intersectingObjects"] = qIntersectingObjects;
variantMap["collisionRegion"] = pickVariant;
return variantMap;
}
bool CollisionPick::isShapeInfoReady(CollisionRegion& pick) { bool CollisionPick::isShapeInfoReady(CollisionRegion& pick) {
if (pick.shouldComputeShapeInfo()) { if (pick.shouldComputeShapeInfo()) {

30
interface/src/raypick/CollisionPick.h
View file

@ -35,35 +35,7 @@ public:
std::vector<ContactTestResult> entityIntersections; std::vector<ContactTestResult> entityIntersections;
std::vector<ContactTestResult> avatarIntersections; std::vector<ContactTestResult> avatarIntersections;
virtual QVariantMap toVariantMap() const override { QVariantMap CollisionPickResult::toVariantMap() const override;
QVariantMap variantMap;
variantMap["intersects"] = intersects;
QVariantList qEntityIntersections;
for (auto entityIntersection : entityIntersections) {
QVariantMap qEntityIntersection;
qEntityIntersection["objectID"] = entityIntersection.foundID;
qEntityIntersection["pickCollisionPoint"] = vec3toVariant(entityIntersection.testCollisionPoint);
qEntityIntersection["entityCollisionPoint"] = vec3toVariant(entityIntersection.foundCollisionPoint);
qEntityIntersections.append(qEntityIntersection);
}
variantMap["entityIntersections"] = qEntityIntersections;
QVariantList qAvatarIntersections;
for (auto avatarIntersection : avatarIntersections) {
QVariantMap qAvatarIntersection;
qAvatarIntersection["objectID"] = avatarIntersection.foundID;
qAvatarIntersection["pickCollisionPoint"] = vec3toVariant(avatarIntersection.testCollisionPoint);
qAvatarIntersection["entityCollisionPoint"] = vec3toVariant(avatarIntersection.foundCollisionPoint);
qAvatarIntersections.append(qAvatarIntersection);
}
variantMap["avatarIntersections"] = qAvatarIntersections;
variantMap["collisionRegion"] = pickVariant;
return variantMap;
}
bool doesIntersect() const override { return intersects; } bool doesIntersect() const override { return intersects; }
bool checkOrFilterAgainstMaxDistance(float maxDistance) override { return true; } bool checkOrFilterAgainstMaxDistance(float maxDistance) override { return true; }