diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenkernel/intern/CCGSubSurf_inline.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/blenkernel/intern/CCGSubSurf_inline.h')
-rw-r--r-- | source/blender/blenkernel/intern/CCGSubSurf_inline.h | 261 |
1 files changed, 132 insertions, 129 deletions
diff --git a/source/blender/blenkernel/intern/CCGSubSurf_inline.h b/source/blender/blenkernel/intern/CCGSubSurf_inline.h index c62e4056b52..44e27cb89da 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_inline.h +++ b/source/blender/blenkernel/intern/CCGSubSurf_inline.h @@ -23,243 +23,246 @@ BLI_INLINE int ccg_gridsize(int level) { - BLI_assert(level > 0); - BLI_assert(level <= CCGSUBSURF_LEVEL_MAX + 1); - return (1 << (level - 1)) + 1; + BLI_assert(level > 0); + BLI_assert(level <= CCGSUBSURF_LEVEL_MAX + 1); + return (1 << (level - 1)) + 1; } BLI_INLINE int ccg_edgesize(int level) { - BLI_assert(level > 0); - BLI_assert(level <= CCGSUBSURF_LEVEL_MAX + 1); - return 1 + (1 << level); + BLI_assert(level > 0); + BLI_assert(level <= CCGSUBSURF_LEVEL_MAX + 1); + return 1 + (1 << level); } BLI_INLINE int ccg_spacing(int high_level, int low_level) { - BLI_assert(high_level > 0 && low_level > 0); - BLI_assert(high_level >= low_level); - BLI_assert((high_level - low_level) <= CCGSUBSURF_LEVEL_MAX); - return 1 << (high_level - low_level); + BLI_assert(high_level > 0 && low_level > 0); + BLI_assert(high_level >= low_level); + BLI_assert((high_level - low_level) <= CCGSUBSURF_LEVEL_MAX); + return 1 << (high_level - low_level); } BLI_INLINE int ccg_edgebase(int level) { - BLI_assert(level > 0); - BLI_assert(level <= CCGSUBSURF_LEVEL_MAX + 1); - return level + (1 << level) - 1; + BLI_assert(level > 0); + BLI_assert(level <= CCGSUBSURF_LEVEL_MAX + 1); + return level + (1 << level) - 1; } /* **** */ BLI_INLINE byte *VERT_getLevelData(CCGVert *v) { - return (byte *)(&(v)[1]); + return (byte *)(&(v)[1]); } BLI_INLINE byte *EDGE_getLevelData(CCGEdge *e) { - return (byte *)(&(e)[1]); + return (byte *)(&(e)[1]); } BLI_INLINE CCGVert **FACE_getVerts(CCGFace *f) { - return (CCGVert **)(&f[1]); + return (CCGVert **)(&f[1]); } BLI_INLINE CCGEdge **FACE_getEdges(CCGFace *f) { - return (CCGEdge **)(&(FACE_getVerts(f)[f->numVerts])); + return (CCGEdge **)(&(FACE_getVerts(f)[f->numVerts])); } BLI_INLINE byte *FACE_getCenterData(CCGFace *f) { - return (byte *)(&(FACE_getEdges(f)[(f)->numVerts])); + return (byte *)(&(FACE_getEdges(f)[(f)->numVerts])); } /* **** */ BLI_INLINE void *ccg_vert_getCo(CCGVert *v, int lvl, int dataSize) { - return &VERT_getLevelData(v)[lvl * dataSize]; + return &VERT_getLevelData(v)[lvl * dataSize]; } -BLI_INLINE float *ccg_vert_getNo(CCGVert *v, - int lvl, - int dataSize, - int normalDataOffset) +BLI_INLINE float *ccg_vert_getNo(CCGVert *v, int lvl, int dataSize, int normalDataOffset) { - return (float *) &VERT_getLevelData(v)[lvl * dataSize + normalDataOffset]; + return (float *)&VERT_getLevelData(v)[lvl * dataSize + normalDataOffset]; } BLI_INLINE void *ccg_edge_getCo(CCGEdge *e, int lvl, int x, int dataSize) { - int levelBase = ccg_edgebase(lvl); - return &EDGE_getLevelData(e)[dataSize * (levelBase + x)]; + int levelBase = ccg_edgebase(lvl); + return &EDGE_getLevelData(e)[dataSize * (levelBase + x)]; } -BLI_INLINE float *ccg_edge_getNo(CCGEdge *e, - int lvl, - int x, - int dataSize, - int normalDataOffset) +BLI_INLINE float *ccg_edge_getNo(CCGEdge *e, int lvl, int x, int dataSize, int normalDataOffset) { - int levelBase = ccg_edgebase(lvl); - return (float *) &EDGE_getLevelData(e)[dataSize * (levelBase + x) + normalDataOffset]; + int levelBase = ccg_edgebase(lvl); + return (float *)&EDGE_getLevelData(e)[dataSize * (levelBase + x) + normalDataOffset]; } BLI_INLINE void *ccg_face_getIECo(CCGFace *f, int lvl, int S, int x, int levels, int dataSize) { - int maxGridSize = ccg_gridsize(levels); - int spacing = ccg_spacing(levels, lvl); - byte *gridBase = FACE_getCenterData(f) + dataSize * (1 + S * (maxGridSize + maxGridSize * maxGridSize)); - return &gridBase[dataSize * x * spacing]; + int maxGridSize = ccg_gridsize(levels); + int spacing = ccg_spacing(levels, lvl); + byte *gridBase = FACE_getCenterData(f) + + dataSize * (1 + S * (maxGridSize + maxGridSize * maxGridSize)); + return &gridBase[dataSize * x * spacing]; } -BLI_INLINE void *ccg_face_getIENo(CCGFace *f, int lvl, int S, int x, int levels, int dataSize, int normalDataOffset) +BLI_INLINE void *ccg_face_getIENo( + CCGFace *f, int lvl, int S, int x, int levels, int dataSize, int normalDataOffset) { - int maxGridSize = ccg_gridsize(levels); - int spacing = ccg_spacing(levels, lvl); - byte *gridBase = FACE_getCenterData(f) + dataSize * (1 + S * (maxGridSize + maxGridSize * maxGridSize)); - return &gridBase[dataSize * x * spacing + normalDataOffset]; + int maxGridSize = ccg_gridsize(levels); + int spacing = ccg_spacing(levels, lvl); + byte *gridBase = FACE_getCenterData(f) + + dataSize * (1 + S * (maxGridSize + maxGridSize * maxGridSize)); + return &gridBase[dataSize * x * spacing + normalDataOffset]; } -BLI_INLINE void *ccg_face_getIFCo(CCGFace *f, int lvl, int S, int x, int y, int levels, int dataSize) +BLI_INLINE void *ccg_face_getIFCo( + CCGFace *f, int lvl, int S, int x, int y, int levels, int dataSize) { - int maxGridSize = ccg_gridsize(levels); - int spacing = ccg_spacing(levels, lvl); - byte *gridBase = FACE_getCenterData(f) + dataSize * (1 + S * (maxGridSize + maxGridSize * maxGridSize)); - return &gridBase[dataSize * (maxGridSize + (y * maxGridSize + x) * spacing)]; + int maxGridSize = ccg_gridsize(levels); + int spacing = ccg_spacing(levels, lvl); + byte *gridBase = FACE_getCenterData(f) + + dataSize * (1 + S * (maxGridSize + maxGridSize * maxGridSize)); + return &gridBase[dataSize * (maxGridSize + (y * maxGridSize + x) * spacing)]; } -BLI_INLINE float *ccg_face_getIFNo(CCGFace *f, int lvl, int S, int x, int y, int levels, int dataSize, int normalDataOffset) +BLI_INLINE float *ccg_face_getIFNo( + CCGFace *f, int lvl, int S, int x, int y, int levels, int dataSize, int normalDataOffset) { - int maxGridSize = ccg_gridsize(levels); - int spacing = ccg_spacing(levels, lvl); - byte *gridBase = FACE_getCenterData(f) + dataSize * (1 + S * (maxGridSize + maxGridSize * maxGridSize)); - return (float *) &gridBase[dataSize * (maxGridSize + (y * maxGridSize + x) * spacing) + normalDataOffset]; + int maxGridSize = ccg_gridsize(levels); + int spacing = ccg_spacing(levels, lvl); + byte *gridBase = FACE_getCenterData(f) + + dataSize * (1 + S * (maxGridSize + maxGridSize * maxGridSize)); + return (float *)&gridBase[dataSize * (maxGridSize + (y * maxGridSize + x) * spacing) + + normalDataOffset]; } - BLI_INLINE int ccg_face_getVertIndex(CCGFace *f, CCGVert *v) { - int i; - for (i = 0; i < f->numVerts; i++) - if (FACE_getVerts(f)[i] == v) - return i; - return -1; + int i; + for (i = 0; i < f->numVerts; i++) + if (FACE_getVerts(f)[i] == v) + return i; + return -1; } BLI_INLINE int ccg_face_getEdgeIndex(CCGFace *f, CCGEdge *e) { - int i; - for (i = 0; i < f->numVerts; i++) - if (FACE_getEdges(f)[i] == e) - return i; - return -1; + int i; + for (i = 0; i < f->numVerts; i++) + if (FACE_getEdges(f)[i] == e) + return i; + return -1; } -BLI_INLINE void *ccg_face_getIFCoEdge(CCGFace *f, CCGEdge *e, int f_ed_idx, int lvl, int eX, int eY, int levels, int dataSize) +BLI_INLINE void *ccg_face_getIFCoEdge( + CCGFace *f, CCGEdge *e, int f_ed_idx, int lvl, int eX, int eY, int levels, int dataSize) { - int maxGridSize = ccg_gridsize(levels); - int spacing = ccg_spacing(levels, lvl); - int x, y, cx, cy; - - BLI_assert(f_ed_idx == ccg_face_getEdgeIndex(f, e)); - - eX = eX * spacing; - eY = eY * spacing; - if (e->v0 != FACE_getVerts(f)[f_ed_idx]) { - eX = (maxGridSize * 2 - 1) - 1 - eX; - } - y = maxGridSize - 1 - eX; - x = maxGridSize - 1 - eY; - if (x < 0) { - f_ed_idx = (f_ed_idx + f->numVerts - 1) % f->numVerts; - cx = y; - cy = -x; - } - else if (y < 0) { - f_ed_idx = (f_ed_idx + 1) % f->numVerts; - cx = -y; - cy = x; - } - else { - cx = x; - cy = y; - } - return ccg_face_getIFCo(f, levels, f_ed_idx, cx, cy, levels, dataSize); + int maxGridSize = ccg_gridsize(levels); + int spacing = ccg_spacing(levels, lvl); + int x, y, cx, cy; + + BLI_assert(f_ed_idx == ccg_face_getEdgeIndex(f, e)); + + eX = eX * spacing; + eY = eY * spacing; + if (e->v0 != FACE_getVerts(f)[f_ed_idx]) { + eX = (maxGridSize * 2 - 1) - 1 - eX; + } + y = maxGridSize - 1 - eX; + x = maxGridSize - 1 - eY; + if (x < 0) { + f_ed_idx = (f_ed_idx + f->numVerts - 1) % f->numVerts; + cx = y; + cy = -x; + } + else if (y < 0) { + f_ed_idx = (f_ed_idx + 1) % f->numVerts; + cx = -y; + cy = x; + } + else { + cx = x; + cy = y; + } + return ccg_face_getIFCo(f, levels, f_ed_idx, cx, cy, levels, dataSize); } BLI_INLINE void Normalize(float no[3]) { - const float length = sqrtf(no[0] * no[0] + no[1] * no[1] + no[2] * no[2]); - - if (length > EPSILON) { - const float length_inv = 1.0f / length; - - no[0] *= length_inv; - no[1] *= length_inv; - no[2] *= length_inv; - } - else { - NormZero(no); - } + const float length = sqrtf(no[0] * no[0] + no[1] * no[1] + no[2] * no[2]); + + if (length > EPSILON) { + const float length_inv = 1.0f / length; + + no[0] *= length_inv; + no[1] *= length_inv; + no[2] *= length_inv; + } + else { + NormZero(no); + } } /* Data layers mathematics. */ BLI_INLINE int VertDataEqual(const float a[], const float b[], const CCGSubSurf *ss) { - int i; - for (i = 0; i < ss->meshIFC.numLayers; i++) { - if (a[i] != b[i]) - return 0; - } - return 1; + int i; + for (i = 0; i < ss->meshIFC.numLayers; i++) { + if (a[i] != b[i]) + return 0; + } + return 1; } BLI_INLINE void VertDataZero(float v[], const CCGSubSurf *ss) { - memset(v, 0, sizeof(float) * ss->meshIFC.numLayers); + memset(v, 0, sizeof(float) * ss->meshIFC.numLayers); } BLI_INLINE void VertDataCopy(float dst[], const float src[], const CCGSubSurf *ss) { - int i; - for (i = 0; i < ss->meshIFC.numLayers; i++) - dst[i] = src[i]; + int i; + for (i = 0; i < ss->meshIFC.numLayers; i++) + dst[i] = src[i]; } BLI_INLINE void VertDataAdd(float a[], const float b[], const CCGSubSurf *ss) { - int i; - for (i = 0; i < ss->meshIFC.numLayers; i++) - a[i] += b[i]; + int i; + for (i = 0; i < ss->meshIFC.numLayers; i++) + a[i] += b[i]; } BLI_INLINE void VertDataSub(float a[], const float b[], const CCGSubSurf *ss) { - int i; - for (i = 0; i < ss->meshIFC.numLayers; i++) - a[i] -= b[i]; + int i; + for (i = 0; i < ss->meshIFC.numLayers; i++) + a[i] -= b[i]; } BLI_INLINE void VertDataMulN(float v[], float f, const CCGSubSurf *ss) { - int i; - for (i = 0; i < ss->meshIFC.numLayers; i++) - v[i] *= f; + int i; + for (i = 0; i < ss->meshIFC.numLayers; i++) + v[i] *= f; } BLI_INLINE void VertDataAvg4(float v[], - const float a[], const float b[], - const float c[], const float d[], + const float a[], + const float b[], + const float c[], + const float d[], const CCGSubSurf *ss) { - int i; - for (i = 0; i < ss->meshIFC.numLayers; i++) - v[i] = (a[i] + b[i] + c[i] + d[i]) * 0.25f; + int i; + for (i = 0; i < ss->meshIFC.numLayers; i++) + v[i] = (a[i] + b[i] + c[i] + d[i]) * 0.25f; } -#endif /* __CCGSUBSURF_INLINE_H__ */ +#endif /* __CCGSUBSURF_INLINE_H__ */ |