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

Merge pull request #4375 from ctrlaltdavid/20370

Browse source 
More parentheses to address Xcode compiler warnings
This commit is contained in:
Clément Brisset 2015-03-04 10:06:54 -08:00
commit da6db93508
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/render-utils/src/GeometryCache.cpp
View file

@ -63,8 +63,8 @@ void GeometryCache::renderSphere(float radius, int slices, int stacks, const glm
int vertices = slices * (stacks - 1) + 2; int vertices = slices * (stacks - 1) + 2;
int indices = slices * (stacks - 1) * NUM_VERTICES_PER_TRIANGULATED_QUAD; int indices = slices * (stacks - 1) * NUM_VERTICES_PER_TRIANGULATED_QUAD;
if (registered && (!_registeredSphereVertices.contains(id) || _lastRegisteredSphereVertices[id] != radiusKey) if ((registered && (!_registeredSphereVertices.contains(id) || _lastRegisteredSphereVertices[id] != radiusKey))
|| !registered && !_sphereVertices.contains(radiusKey)) { || (!registered && !_sphereVertices.contains(radiusKey))) {
if (registered && _registeredSphereVertices.contains(id)) { if (registered && _registeredSphereVertices.contains(id)) {
_registeredSphereVertices[id].clear(); _registeredSphereVertices[id].clear();
@ -127,8 +127,8 @@ void GeometryCache::renderSphere(float radius, int slices, int stacks, const glm
} }
#endif #endif
if (registered && (!_registeredSphereIndices.contains(id) || _lastRegisteredSphereIndices[id] != slicesStacksKey) if ((registered && (!_registeredSphereIndices.contains(id) || _lastRegisteredSphereIndices[id] != slicesStacksKey))
|| !registered && !_sphereIndices.contains(slicesStacksKey)) { || (!registered && !_sphereIndices.contains(slicesStacksKey))) {
if (registered && _registeredSphereIndices.contains(id)) { if (registered && _registeredSphereIndices.contains(id)) {
_registeredSphereIndices[id].clear(); _registeredSphereIndices[id].clear();
@ -213,8 +213,8 @@ void GeometryCache::renderSphere(float radius, int slices, int stacks, const glm
} }
#endif #endif
if (registered && (!_registeredSphereColors.contains(id) || _lastRegisteredSphereColors[id] != colorKey) if ((registered && (!_registeredSphereColors.contains(id) || _lastRegisteredSphereColors[id] != colorKey))
|| !registered && !_sphereColors.contains(colorKey)) { || (!registered && !_sphereColors.contains(colorKey))) {
if (registered && _registeredSphereColors.contains(id)) { if (registered && _registeredSphereColors.contains(id)) {
_registeredSphereColors[id].clear(); _registeredSphereColors[id].clear();