Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-14 06:46:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code style fixes

Browse source
This commit is contained in:
sabrina-shanman 2018-08-29 15:00:01 -07:00
parent 78a438d89a
commit 2d73b7845e
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -94,8 +94,7 @@ bool CollisionPick::getShapeInfoReady() {
}
return false;
}
else {
} else {
computeShapeInfoDimensionsOnly(_mathPick, *_mathPick.shapeInfo, _cachedResource);
return true;
}

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

@ -25,11 +25,7 @@ public:
CollisionPickResult() {}
CollisionPickResult(const QVariantMap& pickVariant) : PickResult(pickVariant) {}
CollisionPickResult(const CollisionRegion& searchRegion,
LoadState loadState,
const std::vector<ContactTestResult>& entityIntersections,
const std::vector<ContactTestResult>& avatarIntersections
) :
CollisionPickResult(const CollisionRegion& searchRegion, LoadState loadState, const std::vector<ContactTestResult>& entityIntersections, const std::vector<ContactTestResult>& avatarIntersections) :
PickResult(searchRegion.toVariantMap()),
loadState(loadState),
intersects(entityIntersections.size() || avatarIntersections.size()),