diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/BKE_subsurf.h | 18 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/CCGSubSurf.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/CCGSubSurf.h | 25 |
3 files changed, 24 insertions, 27 deletions
diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h index 35de1c21a54..8f32063c243 100644 --- a/source/blender/blenkernel/BKE_subsurf.h +++ b/source/blender/blenkernel/BKE_subsurf.h @@ -41,10 +41,10 @@ struct MultiresSubsurf; struct Object; struct PBVH; struct SubsurfModifierData; -struct _CCGEdge; -struct _CCGFace; -struct _CCGSubsurf; -struct _CCGVert; +struct CCGEdge; +struct CCGFace; +struct CCGSubsurf; +struct CCGVert; struct EdgeHash; struct PBVH; struct DMGridData; @@ -65,14 +65,14 @@ void subsurf_calculate_limit_positions(struct Mesh *me, float (*positions_r)[3]) typedef struct CCGDerivedMesh { DerivedMesh dm; - struct _CCGSubSurf *ss; + struct CCGSubSurf *ss; int freeSS; int drawInteriorEdges, useSubsurfUv; - struct {int startVert; struct _CCGVert *vert;} *vertMap; - struct {int startVert; int startEdge; struct _CCGEdge *edge;} *edgeMap; + struct {int startVert; struct CCGVert *vert;} *vertMap; + struct {int startVert; int startEdge; struct CCGEdge *edge;} *edgeMap; struct {int startVert; int startEdge; - int startFace; struct _CCGFace *face;} *faceMap; + int startFace; struct CCGFace *face;} *faceMap; short *edgeFlags; char *faceFlags; @@ -89,7 +89,7 @@ typedef struct CCGDerivedMesh { struct DMGridData **gridData; struct DMGridAdjacency *gridAdjacency; int *gridOffset; - struct _CCGFace **gridFaces; + struct CCGFace **gridFaces; struct { struct MultiresModifierData *mmd; 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); |