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

Account for collisionGroup in CollisionRegion implementation

Browse source
This commit is contained in:
sabrina-shanman 2018-09-10 15:14:48 -07:00
parent 9a86b7451b
commit 3b7dac9058
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/shared/src/RegisteredMetaTypes.h
View file

@ -349,12 +349,14 @@ public:
return !std::isnan(threshold) && return !std::isnan(threshold) &&
!(glm::any(glm::isnan(transform.getTranslation())) || !(glm::any(glm::isnan(transform.getTranslation())) ||
glm::any(glm::isnan(transform.getRotation())) || glm::any(glm::isnan(transform.getRotation())) ||
shapeInfo->getType() == SHAPE_TYPE_NONE); shapeInfo->getType() == SHAPE_TYPE_NONE ||
collisionGroup == 0);
} }
bool operator==(const CollisionRegion& other) const { bool operator==(const CollisionRegion& other) const {
return loaded == other.loaded && return loaded == other.loaded &&
threshold == other.threshold && threshold == other.threshold &&
collisionGroup == other.collisionGroup &&
glm::all(glm::equal(transform.getTranslation(), other.transform.getTranslation())) && glm::all(glm::equal(transform.getTranslation(), other.transform.getTranslation())) &&
glm::all(glm::equal(transform.getRotation(), other.transform.getRotation())) && glm::all(glm::equal(transform.getRotation(), other.transform.getRotation())) &&
glm::all(glm::equal(transform.getScale(), other.transform.getScale())) && glm::all(glm::equal(transform.getScale(), other.transform.getScale())) &&
@ -370,6 +372,10 @@ public:
return false; return false;
} }
if (collisionGroup == 0) {
return false;
}
return !shapeInfo->getPointCollection().size(); return !shapeInfo->getPointCollection().size();
} }