diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-02-26 10:50:54 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-02-26 10:50:54 +0400 |
commit | e3877a625ea29fdaf0129b0e7cf1e1069842233c (patch) | |
tree | bc2135203eeaf33b9465049bb6f6d75a9155153f /source/blender/blenkernel/intern | |
parent | 1004b03578302da08b656cad5051ee1652883920 (diff) |
Style cleanup: remove underscore prefix from CCG struct names.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/CCGSubSurf.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/CCGSubSurf.h | 25 |
2 files changed, 15 insertions, 18 deletions
diff --git a/source/blender/blenkernel/intern/CCGSubSurf.c b/source/blender/blenkernel/intern/CCGSubSurf.c index 59aa79a139e..4e531892d32 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.c +++ b/source/blender/blenkernel/intern/CCGSubSurf.c @@ -306,7 +306,7 @@ enum { Face_eEffected = (1 << 0) } /*FaceFlags*/; -struct _CCGVert { +struct CCGVert { CCGVert *next; /* EHData.next */ CCGVertHDL vHDL; /* EHData.key */ @@ -319,7 +319,7 @@ struct _CCGVert { }; #define VERT_getLevelData(v) ((byte *) &(v)[1]) -struct _CCGEdge { +struct CCGEdge { CCGEdge *next; /* EHData.next */ CCGEdgeHDL eHDL; /* EHData.key */ @@ -334,7 +334,7 @@ struct _CCGEdge { }; #define EDGE_getLevelData(e) ((byte *) &(e)[1]) -struct _CCGFace { +struct CCGFace { CCGFace *next; /* EHData.next */ CCGFaceHDL fHDL; /* EHData.key */ @@ -358,7 +358,7 @@ typedef enum { eSyncState_Partial } SyncState; -struct _CCGSubSurf { +struct CCGSubSurf { EHash *vMap; /* map of CCGVertHDL -> Vert */ EHash *eMap; /* map of CCGEdgeHDL -> Edge */ EHash *fMap; /* map of CCGFaceHDL -> Face */ diff --git a/source/blender/blenkernel/intern/CCGSubSurf.h b/source/blender/blenkernel/intern/CCGSubSurf.h index 543411f26f4..444b6632d7a 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.h +++ b/source/blender/blenkernel/intern/CCGSubSurf.h @@ -8,28 +8,27 @@ typedef void* CCGVertHDL; typedef void* CCGEdgeHDL; typedef void* CCGFaceHDL; -typedef struct _CCGVert CCGVert; -typedef struct _CCGEdge CCGEdge; -typedef struct _CCGFace CCGFace; +typedef struct CCGSubSurf CCGSubSurf; +typedef struct CCGVert CCGVert; +typedef struct CCGEdge CCGEdge; +typedef struct CCGFace CCGFace; -typedef struct _CCGMeshIFC CCGMeshIFC; -struct _CCGMeshIFC { +typedef struct CCGMeshIFC { int vertUserSize, edgeUserSize, faceUserSize; int vertDataSize; -}; +} CCGMeshIFC; /***/ typedef void* CCGAllocatorHDL; -typedef struct _CCGAllocatorIFC CCGAllocatorIFC; -struct _CCGAllocatorIFC { +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); -}; +} CCGAllocatorIFC; /***/ @@ -46,8 +45,6 @@ typedef enum { /***/ -typedef struct _CCGSubSurf CCGSubSurf; - CCGSubSurf* ccgSubSurf_new (CCGMeshIFC *ifc, int subdivisionLevels, CCGAllocatorIFC *allocatorIFC, CCGAllocatorHDL allocator); void ccgSubSurf_free (CCGSubSurf *ss); @@ -141,9 +138,9 @@ int ccgSubSurf_getNumFinalFaces (const CCGSubSurf *ss); /***/ -typedef struct _CCGVertIterator CCGVertIterator; -typedef struct _CCGEdgeIterator CCGEdgeIterator; -typedef struct _CCGFaceIterator CCGFaceIterator; +typedef struct CCGVertIterator CCGVertIterator; +typedef struct CCGEdgeIterator CCGEdgeIterator; +typedef struct CCGFaceIterator CCGFaceIterator; CCGVertIterator* ccgSubSurf_getVertIterator (CCGSubSurf *ss); CCGEdgeIterator* ccgSubSurf_getEdgeIterator (CCGSubSurf *ss); |