griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: use braces in headers

Browse Source
This commit is contained in:
Campbell Barton
2023-09-24 14:52:38 +10:00
parent d1d570d318
commit 2721b937fb
63 changed files with 605 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
intern/mikktspace/mikk_atomic_hash_set.hh
View File

@@ -106,8 +106,9 @@ class AtomicHashSet {
/* Get next power of two. Could be done more effiently with builtin_clz, but this is not
* performance-critical. */
kAnchorMask_ = 1;
while (kAnchorMask_ < capacity_)
while (kAnchorMask_ < capacity_) {
kAnchorMask_ *= 2;
}
/* Get mask for lower bits. */
kAnchorMask_ -= 1;

42
intern/mikktspace/mikktspace.hh
View File

@@ -274,8 +274,9 @@ template<typename Mesh> class Mikktspace {
nrTSpaces = 0;
for (uint f = 0; f < nrFaces; f++) {
const uint verts = mesh.GetNumVerticesOfFace(f);
if (verts != 3 && verts != 4)
if (verts != 3 && verts != 4) {
continue;
}
uint tA = uint(triangles.size());
triangles.emplace_back(f, nrTSpaces);
@@ -295,8 +296,9 @@ template<typename Mesh> class Mikktspace {
float distSQ_02 = (mesh.GetTexCoord(f, 2) - mesh.GetTexCoord(f, 0)).length_squared();
float distSQ_13 = (mesh.GetTexCoord(f, 3) - mesh.GetTexCoord(f, 1)).length_squared();
bool quadDiagIs_02;
if (distSQ_02 != distSQ_13)
if (distSQ_02 != distSQ_13) {
quadDiagIs_02 = (distSQ_02 < distSQ_13);
}
else {
distSQ_02 = (mesh.GetPosition(f, 2) - mesh.GetPosition(f, 0)).length_squared();
distSQ_13 = (mesh.GetPosition(f, 3) - mesh.GetPosition(f, 1)).length_squared();
@@ -456,12 +458,15 @@ template<typename Mesh> class Mikktspace {
uint vertFlag = (1u << triangles[t].faceVertex[0]) | (1u << triangles[t].faceVertex[1]) |
(1u << triangles[t].faceVertex[2]);
uint missingFaceVertex = 0;
if ((vertFlag & 2) == 0)
if ((vertFlag & 2) == 0) {
missingFaceVertex = 1;
else if ((vertFlag & 4) == 0)
}
else if ((vertFlag & 4) == 0) {
missingFaceVertex = 2;
else if ((vertFlag & 8) == 0)
}
else if ((vertFlag & 8) == 0) {
missingFaceVertex = 3;
}
uint faceIdx = triangles[t].faceIdx;
float3 dstP = mesh.GetPosition(faceIdx, missingFaceVertex);
@@ -533,12 +538,14 @@ template<typename Mesh> class Mikktspace {
const float lenOs2 = vOs.length_squared();
const float lenOt2 = vOt.length_squared();
const float fS = triangle.orientPreserving ? 1.0f : (-1.0f);
if (not_zero(lenOs2))
if (not_zero(lenOs2)) {
triangle.tangent = vOs * (fS / sqrtf(lenOs2));
}
// if this is a good triangle
if (not_zero(lenOs2) && not_zero(lenOt2))
if (not_zero(lenOs2) && not_zero(lenOt2)) {
triangle.groupWithAny = false;
}
}
});
@@ -556,10 +563,12 @@ template<typename Mesh> class Mikktspace {
// if this happens the quad has extremely bad mapping!!
if (triangleA.orientPreserving != triangleB.orientPreserving) {
bool chooseOrientFirstTri = false;
if (triangleB.groupWithAny)
if (triangleB.groupWithAny) {
chooseOrientFirstTri = true;
else if (calcTexArea(t) >= calcTexArea(t + 1))
}
else if (calcTexArea(t) >= calcTexArea(t + 1)) {
chooseOrientFirstTri = true;
}
// force match
const uint t0 = chooseOrientFirstTri ? t : (t + 1);
@@ -681,17 +690,21 @@ template<typename Mesh> class Mikktspace {
// track down vertex
const uint vertRep = group.vertexRepresentative;
uint i = 3;
if (triangle.vertices[0] == vertRep)
if (triangle.vertices[0] == vertRep) {
i = 0;
else if (triangle.vertices[1] == vertRep)
}
else if (triangle.vertices[1] == vertRep) {
i = 1;
else if (triangle.vertices[2] == vertRep)
}
else if (triangle.vertices[2] == vertRep) {
i = 2;
}
assert(i < 3);
// early out
if (triangle.group[i] != UNSET_ENTRY)
if (triangle.group[i] != UNSET_ENTRY) {
return;
}
if (triangle.groupWithAny) {
// first to group with a group-with-anything triangle
@@ -704,8 +717,9 @@ template<typename Mesh> class Mikktspace {
}
}
if (triangle.orientPreserving != group.orientPreserving)
if (triangle.orientPreserving != group.orientPreserving) {
return;
}
triangle.group[i] = groupId;