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.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.h')
-rw-r--r-- | source/blender/blenkernel/intern/CCGSubSurf.h | 267 |
1 files changed, 143 insertions, 124 deletions
diff --git a/source/blender/blenkernel/intern/CCGSubSurf.h b/source/blender/blenkernel/intern/CCGSubSurf.h index 8ce5099305c..83b59941ac7 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.h +++ b/source/blender/blenkernel/intern/CCGSubSurf.h @@ -32,10 +32,10 @@ typedef struct CCGSubSurf CCGSubSurf; typedef struct CCGVert CCGVert; typedef struct CCGMeshIFC { - int vertUserSize, edgeUserSize, faceUserSize; - int numLayers; - int vertDataSize; - int simpleSubdiv; + int vertUserSize, edgeUserSize, faceUserSize; + int numLayers; + int vertDataSize; + int simpleSubdiv; } CCGMeshIFC; /***/ @@ -43,26 +43,26 @@ typedef struct CCGMeshIFC { typedef void *CCGAllocatorHDL; typedef struct CCGAllocatorIFC { - void* (*alloc) (CCGAllocatorHDL a, int numBytes); - void* (*realloc) (CCGAllocatorHDL a, void *ptr, int newSize, int oldSize); - void (*free) (CCGAllocatorHDL a, void *ptr); - void (*release) (CCGAllocatorHDL a); + void *(*alloc)(CCGAllocatorHDL a, int numBytes); + void *(*realloc)(CCGAllocatorHDL a, void *ptr, int newSize, int oldSize); + void (*free)(CCGAllocatorHDL a, void *ptr); + void (*release)(CCGAllocatorHDL a); } CCGAllocatorIFC; /* private, so we can allocate on the stack */ typedef struct _EHashIterator { - struct _EHash *eh; - int curBucket; - struct _EHEntry *curEntry; + struct _EHash *eh; + int curBucket; + struct _EHEntry *curEntry; } EHashIterator; /***/ typedef enum { - eCCGError_None = 0, + eCCGError_None = 0, - eCCGError_InvalidSyncState, - eCCGError_InvalidValue, + eCCGError_InvalidSyncState, + eCCGError_InvalidValue, } CCGError; /***/ @@ -72,101 +72,122 @@ typedef enum { /***/ -CCGSubSurf* ccgSubSurf_new (CCGMeshIFC *ifc, int subdivisionLevels, CCGAllocatorIFC *allocatorIFC, CCGAllocatorHDL allocator); -void ccgSubSurf_free (CCGSubSurf *ss); +CCGSubSurf *ccgSubSurf_new(CCGMeshIFC *ifc, + int subdivisionLevels, + CCGAllocatorIFC *allocatorIFC, + CCGAllocatorHDL allocator); +void ccgSubSurf_free(CCGSubSurf *ss); -CCGError ccgSubSurf_initFullSync (CCGSubSurf *ss); -CCGError ccgSubSurf_initPartialSync (CCGSubSurf *ss); +CCGError ccgSubSurf_initFullSync(CCGSubSurf *ss); +CCGError ccgSubSurf_initPartialSync(CCGSubSurf *ss); #ifdef WITH_OPENSUBDIV -CCGError ccgSubSurf_initOpenSubdivSync (CCGSubSurf *ss); +CCGError ccgSubSurf_initOpenSubdivSync(CCGSubSurf *ss); #endif -CCGError ccgSubSurf_syncVert (CCGSubSurf *ss, CCGVertHDL vHDL, const void *vertData, int seam, CCGVert **v_r); -CCGError ccgSubSurf_syncEdge (CCGSubSurf *ss, CCGEdgeHDL eHDL, CCGVertHDL e_vHDL0, CCGVertHDL e_vHDL1, float crease, CCGEdge **e_r); -CCGError ccgSubSurf_syncFace (CCGSubSurf *ss, CCGFaceHDL fHDL, int numVerts, CCGVertHDL *vHDLs, CCGFace **f_r); - -CCGError ccgSubSurf_syncVertDel (CCGSubSurf *ss, CCGVertHDL vHDL); -CCGError ccgSubSurf_syncEdgeDel (CCGSubSurf *ss, CCGEdgeHDL eHDL); -CCGError ccgSubSurf_syncFaceDel (CCGSubSurf *ss, CCGFaceHDL fHDL); - -CCGError ccgSubSurf_processSync (CCGSubSurf *ss); - -CCGError ccgSubSurf_updateFromFaces(CCGSubSurf *ss, int lvl, CCGFace **faces, int numFaces); -CCGError ccgSubSurf_updateToFaces(CCGSubSurf *ss, int lvl, CCGFace **faces, int numFaces); -CCGError ccgSubSurf_updateNormals(CCGSubSurf *ss, CCGFace **faces, int numFaces); -CCGError ccgSubSurf_updateLevels(CCGSubSurf *ss, int lvl, CCGFace **faces, int numFaces); -CCGError ccgSubSurf_stitchFaces(CCGSubSurf *ss, int lvl, CCGFace **faces, int numFaces); - -CCGError ccgSubSurf_setSubdivisionLevels (CCGSubSurf *ss, int subdivisionLevels); - -CCGError ccgSubSurf_setAllowEdgeCreation (CCGSubSurf *ss, int allowEdgeCreation, float defaultCreaseValue, void *defaultUserData); -void ccgSubSurf_getAllowEdgeCreation (CCGSubSurf *ss, int *allowEdgeCreation_r, float *defaultCreaseValue_r, void *defaultUserData_r); - -void ccgSubSurf_getUseAgeCounts (CCGSubSurf *ss, int *useAgeCounts_r, int *vertUserOffset_r, int *edgeUserOffset_r, int *faceUserOffset_r); -CCGError ccgSubSurf_setUseAgeCounts (CCGSubSurf *ss, int useAgeCounts, int vertUserOffset, int edgeUserOffset, int faceUserOffset); - -CCGError ccgSubSurf_setCalcVertexNormals (CCGSubSurf *ss, int useVertNormals, int normalDataOffset); -void ccgSubSurf_setAllocMask (CCGSubSurf *ss, int allocMask, int maskOffset); - -void ccgSubSurf_setNumLayers (CCGSubSurf *ss, int numLayers); +CCGError ccgSubSurf_syncVert( + CCGSubSurf *ss, CCGVertHDL vHDL, const void *vertData, int seam, CCGVert **v_r); +CCGError ccgSubSurf_syncEdge(CCGSubSurf *ss, + CCGEdgeHDL eHDL, + CCGVertHDL e_vHDL0, + CCGVertHDL e_vHDL1, + float crease, + CCGEdge **e_r); +CCGError ccgSubSurf_syncFace( + CCGSubSurf *ss, CCGFaceHDL fHDL, int numVerts, CCGVertHDL *vHDLs, CCGFace **f_r); + +CCGError ccgSubSurf_syncVertDel(CCGSubSurf *ss, CCGVertHDL vHDL); +CCGError ccgSubSurf_syncEdgeDel(CCGSubSurf *ss, CCGEdgeHDL eHDL); +CCGError ccgSubSurf_syncFaceDel(CCGSubSurf *ss, CCGFaceHDL fHDL); + +CCGError ccgSubSurf_processSync(CCGSubSurf *ss); + +CCGError ccgSubSurf_updateFromFaces(CCGSubSurf *ss, int lvl, CCGFace **faces, int numFaces); +CCGError ccgSubSurf_updateToFaces(CCGSubSurf *ss, int lvl, CCGFace **faces, int numFaces); +CCGError ccgSubSurf_updateNormals(CCGSubSurf *ss, CCGFace **faces, int numFaces); +CCGError ccgSubSurf_updateLevels(CCGSubSurf *ss, int lvl, CCGFace **faces, int numFaces); +CCGError ccgSubSurf_stitchFaces(CCGSubSurf *ss, int lvl, CCGFace **faces, int numFaces); + +CCGError ccgSubSurf_setSubdivisionLevels(CCGSubSurf *ss, int subdivisionLevels); + +CCGError ccgSubSurf_setAllowEdgeCreation(CCGSubSurf *ss, + int allowEdgeCreation, + float defaultCreaseValue, + void *defaultUserData); +void ccgSubSurf_getAllowEdgeCreation(CCGSubSurf *ss, + int *allowEdgeCreation_r, + float *defaultCreaseValue_r, + void *defaultUserData_r); + +void ccgSubSurf_getUseAgeCounts(CCGSubSurf *ss, + int *useAgeCounts_r, + int *vertUserOffset_r, + int *edgeUserOffset_r, + int *faceUserOffset_r); +CCGError ccgSubSurf_setUseAgeCounts( + CCGSubSurf *ss, int useAgeCounts, int vertUserOffset, int edgeUserOffset, int faceUserOffset); + +CCGError ccgSubSurf_setCalcVertexNormals(CCGSubSurf *ss, int useVertNormals, int normalDataOffset); +void ccgSubSurf_setAllocMask(CCGSubSurf *ss, int allocMask, int maskOffset); + +void ccgSubSurf_setNumLayers(CCGSubSurf *ss, int numLayers); /***/ -int ccgSubSurf_getNumVerts (const CCGSubSurf *ss); -int ccgSubSurf_getNumEdges (const CCGSubSurf *ss); -int ccgSubSurf_getNumFaces (const CCGSubSurf *ss); - -int ccgSubSurf_getSubdivisionLevels (const CCGSubSurf *ss); -int ccgSubSurf_getEdgeSize (const CCGSubSurf *ss); -int ccgSubSurf_getEdgeLevelSize (const CCGSubSurf *ss, int level); -int ccgSubSurf_getGridSize (const CCGSubSurf *ss); -int ccgSubSurf_getGridLevelSize (const CCGSubSurf *ss, int level); -int ccgSubSurf_getSimpleSubdiv (const CCGSubSurf *ss); - -CCGVert* ccgSubSurf_getVert (CCGSubSurf *ss, CCGVertHDL v); -CCGVertHDL ccgSubSurf_getVertVertHandle (CCGVert *v); -int ccgSubSurf_getVertNumFaces (CCGVert *v); -CCGFace* ccgSubSurf_getVertFace (CCGVert *v, int index); -int ccgSubSurf_getVertNumEdges (CCGVert *v); -CCGEdge* ccgSubSurf_getVertEdge (CCGVert *v, int index); - -int ccgSubSurf_getVertAge (CCGSubSurf *ss, CCGVert *v); -void* ccgSubSurf_getVertUserData (CCGSubSurf *ss, CCGVert *v); -void* ccgSubSurf_getVertData (CCGSubSurf *ss, CCGVert *v); -void* ccgSubSurf_getVertLevelData (CCGSubSurf *ss, CCGVert *v, int level); - -CCGEdge* ccgSubSurf_getEdge (CCGSubSurf *ss, CCGEdgeHDL e); -CCGEdgeHDL ccgSubSurf_getEdgeEdgeHandle (CCGEdge *e); -int ccgSubSurf_getEdgeNumFaces (CCGEdge *e); -CCGFace* ccgSubSurf_getEdgeFace (CCGEdge *e, int index); -CCGVert* ccgSubSurf_getEdgeVert0 (CCGEdge *e); -CCGVert* ccgSubSurf_getEdgeVert1 (CCGEdge *e); -float ccgSubSurf_getEdgeCrease (CCGEdge *e); - -int ccgSubSurf_getEdgeAge (CCGSubSurf *ss, CCGEdge *e); -void* ccgSubSurf_getEdgeUserData (CCGSubSurf *ss, CCGEdge *e); -void* ccgSubSurf_getEdgeDataArray (CCGSubSurf *ss, CCGEdge *e); -void* ccgSubSurf_getEdgeData (CCGSubSurf *ss, CCGEdge *e, int x); -void* ccgSubSurf_getEdgeLevelData (CCGSubSurf *ss, CCGEdge *e, int x, int level); - -CCGFace* ccgSubSurf_getFace (CCGSubSurf *ss, CCGFaceHDL f); -CCGFaceHDL ccgSubSurf_getFaceFaceHandle (CCGFace *f); -int ccgSubSurf_getFaceNumVerts (CCGFace *f); -CCGVert* ccgSubSurf_getFaceVert (CCGFace *f, int index); -CCGEdge* ccgSubSurf_getFaceEdge (CCGFace *f, int index); -int ccgSubSurf_getFaceEdgeIndex (CCGFace *f, CCGEdge *e); - -int ccgSubSurf_getFaceAge (CCGSubSurf *ss, CCGFace *f); -void* ccgSubSurf_getFaceUserData (CCGSubSurf *ss, CCGFace *f); -void* ccgSubSurf_getFaceCenterData (CCGFace *f); -void* ccgSubSurf_getFaceGridEdgeDataArray (CCGSubSurf *ss, CCGFace *f, int gridIndex); -void* ccgSubSurf_getFaceGridEdgeData (CCGSubSurf *ss, CCGFace *f, int gridIndex, int x); -void* ccgSubSurf_getFaceGridDataArray (CCGSubSurf *ss, CCGFace *f, int gridIndex); -void* ccgSubSurf_getFaceGridData (CCGSubSurf *ss, CCGFace *f, int gridIndex, int x, int y); - -int ccgSubSurf_getNumFinalVerts (const CCGSubSurf *ss); -int ccgSubSurf_getNumFinalEdges (const CCGSubSurf *ss); -int ccgSubSurf_getNumFinalFaces (const CCGSubSurf *ss); +int ccgSubSurf_getNumVerts(const CCGSubSurf *ss); +int ccgSubSurf_getNumEdges(const CCGSubSurf *ss); +int ccgSubSurf_getNumFaces(const CCGSubSurf *ss); + +int ccgSubSurf_getSubdivisionLevels(const CCGSubSurf *ss); +int ccgSubSurf_getEdgeSize(const CCGSubSurf *ss); +int ccgSubSurf_getEdgeLevelSize(const CCGSubSurf *ss, int level); +int ccgSubSurf_getGridSize(const CCGSubSurf *ss); +int ccgSubSurf_getGridLevelSize(const CCGSubSurf *ss, int level); +int ccgSubSurf_getSimpleSubdiv(const CCGSubSurf *ss); + +CCGVert *ccgSubSurf_getVert(CCGSubSurf *ss, CCGVertHDL v); +CCGVertHDL ccgSubSurf_getVertVertHandle(CCGVert *v); +int ccgSubSurf_getVertNumFaces(CCGVert *v); +CCGFace *ccgSubSurf_getVertFace(CCGVert *v, int index); +int ccgSubSurf_getVertNumEdges(CCGVert *v); +CCGEdge *ccgSubSurf_getVertEdge(CCGVert *v, int index); + +int ccgSubSurf_getVertAge(CCGSubSurf *ss, CCGVert *v); +void *ccgSubSurf_getVertUserData(CCGSubSurf *ss, CCGVert *v); +void *ccgSubSurf_getVertData(CCGSubSurf *ss, CCGVert *v); +void *ccgSubSurf_getVertLevelData(CCGSubSurf *ss, CCGVert *v, int level); + +CCGEdge *ccgSubSurf_getEdge(CCGSubSurf *ss, CCGEdgeHDL e); +CCGEdgeHDL ccgSubSurf_getEdgeEdgeHandle(CCGEdge *e); +int ccgSubSurf_getEdgeNumFaces(CCGEdge *e); +CCGFace *ccgSubSurf_getEdgeFace(CCGEdge *e, int index); +CCGVert *ccgSubSurf_getEdgeVert0(CCGEdge *e); +CCGVert *ccgSubSurf_getEdgeVert1(CCGEdge *e); +float ccgSubSurf_getEdgeCrease(CCGEdge *e); + +int ccgSubSurf_getEdgeAge(CCGSubSurf *ss, CCGEdge *e); +void *ccgSubSurf_getEdgeUserData(CCGSubSurf *ss, CCGEdge *e); +void *ccgSubSurf_getEdgeDataArray(CCGSubSurf *ss, CCGEdge *e); +void *ccgSubSurf_getEdgeData(CCGSubSurf *ss, CCGEdge *e, int x); +void *ccgSubSurf_getEdgeLevelData(CCGSubSurf *ss, CCGEdge *e, int x, int level); + +CCGFace *ccgSubSurf_getFace(CCGSubSurf *ss, CCGFaceHDL f); +CCGFaceHDL ccgSubSurf_getFaceFaceHandle(CCGFace *f); +int ccgSubSurf_getFaceNumVerts(CCGFace *f); +CCGVert *ccgSubSurf_getFaceVert(CCGFace *f, int index); +CCGEdge *ccgSubSurf_getFaceEdge(CCGFace *f, int index); +int ccgSubSurf_getFaceEdgeIndex(CCGFace *f, CCGEdge *e); + +int ccgSubSurf_getFaceAge(CCGSubSurf *ss, CCGFace *f); +void *ccgSubSurf_getFaceUserData(CCGSubSurf *ss, CCGFace *f); +void *ccgSubSurf_getFaceCenterData(CCGFace *f); +void *ccgSubSurf_getFaceGridEdgeDataArray(CCGSubSurf *ss, CCGFace *f, int gridIndex); +void *ccgSubSurf_getFaceGridEdgeData(CCGSubSurf *ss, CCGFace *f, int gridIndex, int x); +void *ccgSubSurf_getFaceGridDataArray(CCGSubSurf *ss, CCGFace *f, int gridIndex); +void *ccgSubSurf_getFaceGridData(CCGSubSurf *ss, CCGFace *f, int gridIndex, int x, int y); + +int ccgSubSurf_getNumFinalVerts(const CCGSubSurf *ss); +int ccgSubSurf_getNumFinalEdges(const CCGSubSurf *ss); +int ccgSubSurf_getNumFinalFaces(const CCGSubSurf *ss); /***/ @@ -174,21 +195,21 @@ typedef struct _EHashIterator CCGEdgeIterator; typedef struct _EHashIterator CCGFaceIterator; typedef struct _EHashIterator CCGVertIterator; -void ccgSubSurf_initVertIterator(CCGSubSurf *ss, CCGVertIterator *viter); -void ccgSubSurf_initEdgeIterator(CCGSubSurf *ss, CCGEdgeIterator *eiter); -void ccgSubSurf_initFaceIterator(CCGSubSurf *ss, CCGFaceIterator *fiter); +void ccgSubSurf_initVertIterator(CCGSubSurf *ss, CCGVertIterator *viter); +void ccgSubSurf_initEdgeIterator(CCGSubSurf *ss, CCGEdgeIterator *eiter); +void ccgSubSurf_initFaceIterator(CCGSubSurf *ss, CCGFaceIterator *fiter); -CCGVert* ccgVertIterator_getCurrent (CCGVertIterator *vi); -int ccgVertIterator_isStopped (CCGVertIterator *vi); -void ccgVertIterator_next (CCGVertIterator *vi); +CCGVert *ccgVertIterator_getCurrent(CCGVertIterator *vi); +int ccgVertIterator_isStopped(CCGVertIterator *vi); +void ccgVertIterator_next(CCGVertIterator *vi); -CCGEdge* ccgEdgeIterator_getCurrent (CCGEdgeIterator *ei); -int ccgEdgeIterator_isStopped (CCGEdgeIterator *ei); -void ccgEdgeIterator_next (CCGEdgeIterator *ei); +CCGEdge *ccgEdgeIterator_getCurrent(CCGEdgeIterator *ei); +int ccgEdgeIterator_isStopped(CCGEdgeIterator *ei); +void ccgEdgeIterator_next(CCGEdgeIterator *ei); -CCGFace* ccgFaceIterator_getCurrent (CCGFaceIterator *fi); -int ccgFaceIterator_isStopped (CCGFaceIterator *fi); -void ccgFaceIterator_next (CCGFaceIterator *fi); +CCGFace *ccgFaceIterator_getCurrent(CCGFaceIterator *fi); +int ccgFaceIterator_isStopped(CCGFaceIterator *fi); +void ccgFaceIterator_next(CCGFaceIterator *fi); #ifdef WITH_OPENSUBDIV struct DerivedMesh; @@ -209,8 +230,10 @@ bool ccgSubSurf_prepareGLMesh(CCGSubSurf *ss, bool use_osd_glsl, int active_uv_i * TODO(sergey): fill_quads is actually an invariant and should be part * of the prepare routine. */ -void ccgSubSurf_drawGLMesh(CCGSubSurf *ss, bool fill_quads, - int start_partition, int num_partitions); +void ccgSubSurf_drawGLMesh(CCGSubSurf *ss, + bool fill_quads, + int start_partition, + int num_partitions); /* Get number of base faces in a particular GL mesh. */ int ccgSubSurf_getNumGLMeshBaseFaces(CCGSubSurf *ss); @@ -227,15 +250,11 @@ bool ccgSubSurf_needGrids(CCGSubSurf *ss); /* Set evaluator's face varying data from UV coordinates. * Used for CPU evaluation. */ -void ccgSubSurf_evaluatorSetFVarUV(CCGSubSurf *ss, - struct DerivedMesh *dm, - int layer_index); +void ccgSubSurf_evaluatorSetFVarUV(CCGSubSurf *ss, struct DerivedMesh *dm, int layer_index); /* TODO(sergey): Temporary call to test things. */ -void ccgSubSurf_evaluatorFVarUV(CCGSubSurf *ss, - int face_index, int S, - float grid_u, float grid_v, - float uv[2]); +void ccgSubSurf_evaluatorFVarUV( + CCGSubSurf *ss, int face_index, int S, float grid_u, float grid_v, float uv[2]); void ccgSubSurf_free_osd_mesh(CCGSubSurf *ss); @@ -245,4 +264,4 @@ void ccgSubSurf__sync_subdivUvs(CCGSubSurf *ss, bool subsurf_uvs); #endif -#endif /* __CCGSUBSURF_H__ */ +#endif /* __CCGSUBSURF_H__ */ |