Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 16:55:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11678 from AndrewMeadows/fix-broken-build

Browse source 
fix compile errors after merge
This commit is contained in:
Brad Hefta-Gaub 2017-10-25 12:39:34 -07:00 committed by GitHub
commit 0c9184566e
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/shared/src/ShapeInfo.cpp
View file

@ -67,7 +67,6 @@ void ShapeInfo::setParams(ShapeType type, const glm::vec3& halfExtents, QString
break;
case SHAPE_TYPE_BOX:
case SHAPE_TYPE_HULL:
case SHAPE_TYPE_SIMPLE_HULL:
break;
case SHAPE_TYPE_SPHERE: {
float radius = glm::length(halfExtents) / SQUARE_ROOT_OF_3;
@ -361,7 +360,7 @@ const DoubleHashKey& ShapeInfo::getHash() const {
numHulls = 1;
}
if (numHulls > 0) {
hash = DoubleHashKey::hashFunction(numHulls, primeIndex++);
uint32_t hash = DoubleHashKey::hashFunction(numHulls, primeIndex++);
_doubleHashKey.setHash(_doubleHashKey.getHash() ^ hash);
hash = DoubleHashKey::hashFunction2(numHulls);
_doubleHashKey.setHash2(_doubleHashKey.getHash2() ^ hash);