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

Pass pick variant map into unsuccessful/default collision results

Browse source
This commit is contained in:
sabrina-shanman 2018-08-03 14:08:47 -07:00
parent cf34a2cffd
commit e7766039b9
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -318,7 +318,7 @@ CollisionRegion CollisionPick::getMathematicalPick() const {
PickResultPointer CollisionPick::getEntityIntersection(const CollisionRegion& pick) { PickResultPointer CollisionPick::getEntityIntersection(const CollisionRegion& pick) {
if (!isShapeInfoReady()) { if (!isShapeInfoReady()) {
// Cannot compute result // Cannot compute result
return std::make_shared<CollisionPickResult>(); return std::make_shared<CollisionPickResult>(pick.toVariantMap());
} }
const auto& entityIntersections = _physicsEngine->getCollidingInRegion(MOTIONSTATE_TYPE_ENTITY, *pick.shapeInfo, pick.transform); const auto& entityIntersections = _physicsEngine->getCollidingInRegion(MOTIONSTATE_TYPE_ENTITY, *pick.shapeInfo, pick.transform);
@ -326,13 +326,13 @@ PickResultPointer CollisionPick::getEntityIntersection(const CollisionRegion& pi
} }
PickResultPointer CollisionPick::getOverlayIntersection(const CollisionRegion& pick) { PickResultPointer CollisionPick::getOverlayIntersection(const CollisionRegion& pick) {
return getDefaultResult(QVariantMap()); return getDefaultResult(pick.toVariantMap());
} }
PickResultPointer CollisionPick::getAvatarIntersection(const CollisionRegion& pick) { PickResultPointer CollisionPick::getAvatarIntersection(const CollisionRegion& pick) {
if (!isShapeInfoReady()) { if (!isShapeInfoReady()) {
// Cannot compute result // Cannot compute result
return std::make_shared<CollisionPickResult>(); return std::make_shared<CollisionPickResult>(pick.toVariantMap());
} }
const auto& avatarIntersections = _physicsEngine->getCollidingInRegion(MOTIONSTATE_TYPE_AVATAR, *pick.shapeInfo, pick.transform); const auto& avatarIntersections = _physicsEngine->getCollidingInRegion(MOTIONSTATE_TYPE_AVATAR, *pick.shapeInfo, pick.transform);
@ -340,5 +340,5 @@ PickResultPointer CollisionPick::getAvatarIntersection(const CollisionRegion& pi
} }
PickResultPointer CollisionPick::getHUDIntersection(const CollisionRegion& pick) { PickResultPointer CollisionPick::getHUDIntersection(const CollisionRegion& pick) {
return getDefaultResult(QVariantMap()); return getDefaultResult(pick.toVariantMap());
} }