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

allow entity-server to patch up broken queryAACubes

Browse source
This commit is contained in:
Seth Alves 2016-03-11 13:20:52 -08:00
parent f611d8f747
commit 7a4dad8e51
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libraries/entities/src/EntityItem.cpp
View file

@ -1300,16 +1300,22 @@ AABox EntityItem::getAABox(bool& success) const {
}
AACube EntityItem::getQueryAACube(bool& success) const {
AACube result = SpatiallyNestable::getQueryAACube(success);
AACube queryAACube = SpatiallyNestable::getQueryAACube(success);
bool maxAACubeSuccess;
AACube maxAACube = getMaximumAACube(maxAACubeSuccess);
if (success) {
return result;
// allow server to patch up broken queryAACubes
if (maxAACubeSuccess && !queryAACube.contains(maxAACube)) {
getThisPointer()->setQueryAACube(maxAACube);
}
return _queryAACube;
}
// this is for when we've loaded an older json file that didn't have queryAACube properties.
result = getMaximumAACube(success);
if (success) {
getThisPointer()->setQueryAACube(result);
success = maxAACubeSuccess;
if (maxAACubeSuccess) {
getThisPointer()->setQueryAACube(maxAACube);
}
return result;
return _queryAACube;
}