diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-07 08:41:14 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-07 08:41:14 +0400 |
| commit | 71e5edeb6a769e2fd861f5fe374e75391415402a (patch) | |
| tree | 3de5b78bf14355bb00fc06383a357433c6bcadfa /source/blender/blenkernel/intern/editderivedmesh.c | |
| parent | b563870fd992ec2539a0332e024ba4eda72a6d6e (diff) | |
Code cleanup: use typedefs for DerivedMesh drawing callbacks.
There are still fairly bewildering set of callbacks being tossed
around, but it's at least a little less verbose now.
Diffstat (limited to 'source/blender/blenkernel/intern/editderivedmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/editderivedmesh.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index 717f6d5e9fa..ae52322a0c5 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -399,7 +399,7 @@ static void emDM_foreachMappedEdge( static void emDM_drawMappedEdges( DerivedMesh *dm, - int (*setDrawOptions)(void *userData, int index), + DMSetDrawOptions setDrawOptions, void *userData) { EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm; @@ -443,8 +443,8 @@ static void emDM_drawEdges( static void emDM_drawMappedEdgesInterp( DerivedMesh *dm, - int (*setDrawOptions)(void *userData, int index), - void (*setDrawInterpOptions)(void *userData, int index, float t), + DMSetDrawOptions setDrawOptions, + DMSetDrawInterpOptions setDrawInterpOptions, void *userData) { EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm; @@ -579,9 +579,9 @@ static void emDM_foreachMappedFaceCenter( static void emDM_drawMappedFaces( DerivedMesh *dm, - int (*setDrawOptions)(void *userData, int index, int *drawSmooth_r), - int (*setMaterial)(int, void *attribs), - int (*compareDrawOptions)(void *userData, int cur_index, int next_index), + DMSetDrawOptionsShading setDrawOptions, + DMSetMaterial setMaterial, + DMCompareDrawOptions compareDrawOptions, void *userData, int UNUSED(useColors)) { EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm; @@ -777,9 +777,9 @@ static void bmdm_get_tri_tex(BMesh *bm, BMLoop **ls, MLoopUV *luv[3], MLoopCol * static void emDM_drawFacesTex_common( DerivedMesh *dm, - int (*drawParams)(MTFace *tface, int has_vcol, int matnr), - int (*drawParamsMapped)(void *userData, int index), - int (*compareDrawOptions)(void *userData, int cur_index, int next_index), + DMSetDrawOptionsTex drawParams, + DMSetDrawOptions drawParamsMapped, + DMCompareDrawOptions compareDrawOptions, void *userData) { EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm; @@ -960,8 +960,8 @@ static void emDM_drawFacesTex_common( static void emDM_drawFacesTex( DerivedMesh *dm, - int (*setDrawOptions)(MTFace *tface, int has_vcol, int matnr), - int (*compareDrawOptions)(void *userData, int cur_index, int next_index), + DMSetDrawOptionsTex setDrawOptions, + DMCompareDrawOptions compareDrawOptions, void *userData) { emDM_drawFacesTex_common(dm, setDrawOptions, NULL, compareDrawOptions, userData); @@ -969,8 +969,8 @@ static void emDM_drawFacesTex( static void emDM_drawMappedFacesTex( DerivedMesh *dm, - int (*setDrawOptions)(void *userData, int index), - int (*compareDrawOptions)(void *userData, int cur_index, int next_index), + DMSetDrawOptions setDrawOptions, + DMCompareDrawOptions compareDrawOptions, void *userData) { emDM_drawFacesTex_common(dm, NULL, setDrawOptions, compareDrawOptions, userData); @@ -978,8 +978,8 @@ static void emDM_drawMappedFacesTex( static void emDM_drawMappedFacesGLSL( DerivedMesh *dm, - int (*setMaterial)(int, void *attribs), - int (*setDrawOptions)(void *userData, int index), + DMSetMaterial setMaterial, + DMSetDrawOptions setDrawOptions, void *userData) { EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm; |