diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-03-17 23:55:10 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-17 23:55:10 +0400 |
commit | 3dababa7ecab02d0c2be03f2230e479cba7686ad (patch) | |
tree | 2ebbc1a7f74d9ff5150731a58c5485d53e9c695f /source/blender/blenkernel/intern | |
parent | 09c41019a8ecb259b2376b5c22c99f54b59f8f24 (diff) |
code cleanup: name mesh functions more consistently, also use bools for mesh args.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 43 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_validate.c | 34 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 4 |
5 files changed, 43 insertions, 42 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index f09de138428..b2a5a3a5593 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -542,7 +542,7 @@ void DM_to_mesh(DerivedMesh *dm, Mesh *me, Object *ob) } /* yes, must be before _and_ after tessellate */ - mesh_update_customdata_pointers(&tmp, false); + BKE_mesh_update_customdata_pointers(&tmp, false); /* since 2.65 caller must do! */ // BKE_mesh_tessface_calc(&tmp); diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 7f2d9437c3d..0469e6ea787 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -215,7 +215,7 @@ static const MeshElemMap *cdDM_getPolyMap(Object *ob, DerivedMesh *dm) if (!cddm->pmap && ob->type == OB_MESH) { Mesh *me = ob->data; - create_vert_poly_map(&cddm->pmap, &cddm->pmap_mem, + BKE_mesh_vert_poly_map_create(&cddm->pmap, &cddm->pmap_mem, me->mpoly, me->mloop, me->totvert, me->totpoly, me->totloop); } diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index b4833cdb53b..de176651c19 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -348,7 +348,7 @@ static void mesh_ensure_tessellation_customdata(Mesh *me) * note that for undo mesh data we want to skip 'ensure_tess_cd' call since * we don't want to store memory for tessface when its only used for older * versions of the mesh. - campbell*/ -static void mesh_update_linked_customdata(Mesh *me, const short do_ensure_tess_cd) +static void mesh_update_linked_customdata(Mesh *me, const bool do_ensure_tess_cd) { if (me->edit_btmesh) BMEdit_UpdateLinkedCustomData(me->edit_btmesh); @@ -360,7 +360,7 @@ static void mesh_update_linked_customdata(Mesh *me, const short do_ensure_tess_c CustomData_bmesh_update_active_layers(&me->fdata, &me->pdata, &me->ldata); } -void mesh_update_customdata_pointers(Mesh *me, const short do_ensure_tess_cd) +void BKE_mesh_update_customdata_pointers(Mesh *me, const bool do_ensure_tess_cd) { mesh_update_linked_customdata(me, do_ensure_tess_cd); @@ -493,7 +493,7 @@ Mesh *BKE_mesh_copy_ex(Main *bmain, Mesh *me) mesh_tessface_clear_intern(men, FALSE); } - mesh_update_customdata_pointers(men, do_tessface); + BKE_mesh_update_customdata_pointers(men, do_tessface); /* ensure indirect linked data becomes lib-extern */ for (i = 0; i < me->fdata.totlayer; i++) { @@ -622,7 +622,7 @@ void BKE_mesh_make_local(Mesh *me) for (ob = bmain->object.first; ob; ob = ob->id.next) { if (me == ob->data) { if (ob->id.lib == NULL) { - set_mesh(ob, me_new); + BKE_mesh_assign_object(ob, me_new); } } } @@ -825,7 +825,7 @@ Mesh *BKE_mesh_from_object(Object *ob) else return NULL; } -void set_mesh(Object *ob, Mesh *me) +void BKE_mesh_assign_object(Object *ob, Mesh *me) { Mesh *old = NULL; @@ -1194,7 +1194,7 @@ void BKE_mesh_from_metaball(ListBase *lb, Mesh *me) index += 4; } - mesh_update_customdata_pointers(me, TRUE); + BKE_mesh_update_customdata_pointers(me, true); BKE_mesh_calc_normals(me->mvert, me->totvert, me->mloop, me->mpoly, me->totloop, me->totpoly, NULL); @@ -1477,7 +1477,7 @@ int BKE_mesh_nurbs_displist_to_mdata(Object *ob, ListBase *dispbase, /* this may fail replacing ob->data, be sure to check ob->type */ -void BKE_mesh_from_nurbs_displist(Object *ob, ListBase *dispbase, int use_orco_uv) +void BKE_mesh_from_nurbs_displist(Object *ob, ListBase *dispbase, const bool use_orco_uv) { Main *bmain = G.main; Object *ob1; @@ -2063,7 +2063,7 @@ void BKE_mesh_convert_mfaces_to_mpolys(Mesh *mesh) mesh->medge, mesh->mface, &mesh->totloop, &mesh->totpoly, &mesh->mloop, &mesh->mpoly); - mesh_update_customdata_pointers(mesh, TRUE); + BKE_mesh_update_customdata_pointers(mesh, true); } /* the same as BKE_mesh_convert_mfaces_to_mpolys but oriented to be used in do_versions from readfile.c @@ -2085,7 +2085,7 @@ void BKE_mesh_do_versions_convert_mfaces_to_mpolys(Mesh *mesh) CustomData_bmesh_do_versions_update_active_layers(&mesh->fdata, &mesh->pdata, &mesh->ldata); - mesh_update_customdata_pointers(mesh, TRUE); + BKE_mesh_update_customdata_pointers(mesh, true); } void BKE_mesh_convert_mfaces_to_mpolys_ex(ID *id, CustomData *fdata, CustomData *ldata, CustomData *pdata, @@ -2190,12 +2190,12 @@ void BKE_mesh_convert_mfaces_to_mpolys_ex(ID *id, CustomData *fdata, CustomData *mloop_r = mloop; } -float (*mesh_getVertexCos(Mesh * me, int *numVerts_r))[3] +float (*mesh_getVertexCos(Mesh * me, int *r_numVerts))[3] { int i, numVerts = me->totvert; float (*cos)[3] = MEM_mallocN(sizeof(*cos) * numVerts, "vertexcos1"); - if (numVerts_r) *numVerts_r = numVerts; + if (r_numVerts) *r_numVerts = numVerts; for (i = 0; i < numVerts; i++) copy_v3_v3(cos[i], me->mvert[i].co); @@ -2207,7 +2207,8 @@ float (*mesh_getVertexCos(Mesh * me, int *numVerts_r))[3] /* this replaces the non bmesh function (in trunk) which takes MTFace's, if we ever need it back we could * but for now this replaces it because its unused. */ -UvVertMap *BKE_mesh_uv_vert_map_make(struct MPoly *mpoly, struct MLoop *mloop, struct MLoopUV *mloopuv, unsigned int totpoly, unsigned int totvert, int selected, float *limit) +UvVertMap *BKE_mesh_uv_vert_map_create(struct MPoly *mpoly, struct MLoop *mloop, struct MLoopUV *mloopuv, + unsigned int totpoly, unsigned int totvert, int selected, float *limit) { UvVertMap *vmap; UvMapVert *buf; @@ -2315,9 +2316,9 @@ void BKE_mesh_uv_vert_map_free(UvVertMap *vmap) /* Generates a map where the key is the vertex and the value is a list * of polys that use that vertex as a corner. The lists are allocated * from one memory pool. */ -void create_vert_poly_map(MeshElemMap **map, int **mem, - const MPoly *mpoly, const MLoop *mloop, - int totvert, int totpoly, int totloop) +void BKE_mesh_vert_poly_map_create(MeshElemMap **map, int **mem, + const MPoly *mpoly, const MLoop *mloop, + int totvert, int totpoly, int totloop) { int i, j; int *indices; @@ -2359,8 +2360,8 @@ void create_vert_poly_map(MeshElemMap **map, int **mem, /* Generates a map where the key is the vertex and the value is a list * of edges that use that vertex as an endpoint. The lists are allocated * from one memory pool. */ -void create_vert_edge_map(MeshElemMap **map, int **mem, - const MEdge *medge, int totvert, int totedge) +void BKE_mesh_vert_edge_map_create(MeshElemMap **map, int **mem, + const MEdge *medge, int totvert, int totedge) { int i, *indices; @@ -2465,7 +2466,7 @@ int BKE_mesh_recalc_tessellation(CustomData *fdata, int totpoly, /* when tessellating to recalculate normals after * we can skip copying here */ - const int do_face_nor_cpy) + const bool do_face_nor_cpy) { /* use this to avoid locking pthread for _every_ polygon * and calling the fill function */ @@ -3335,7 +3336,7 @@ int BKE_mesh_center_centroid(Mesh *me, float cent[3]) return (me->totpoly != 0); } -void BKE_mesh_translate(Mesh *me, float offset[3], int do_keys) +void BKE_mesh_translate(Mesh *me, const float offset[3], const bool do_keys) { int i = me->totvert; MVert *mvert; @@ -3374,9 +3375,9 @@ void BKE_mesh_tessface_calc(Mesh *mesh) mesh->mvert, mesh->totface, mesh->totloop, mesh->totpoly, /* calc normals right after, don't copy from polys here */ - FALSE); + false); - mesh_update_customdata_pointers(mesh, TRUE); + BKE_mesh_update_customdata_pointers(mesh, true); } void BKE_mesh_tessface_ensure(Mesh *mesh) diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index 9d16d38220a..90704cb8b7e 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -190,13 +190,13 @@ int BKE_mesh_validate_arrays(Mesh *mesh, MLoop *mloops, unsigned int totloop, MPoly *mpolys, unsigned int totpoly, MDeformVert *dverts, /* assume totvert length */ - const short do_verbose, const short do_fixes) + const bool do_verbose, const bool do_fixes) { -# define REMOVE_EDGE_TAG(_me) { _me->v2 = _me->v1; do_edge_free = TRUE; } (void)0 +# define REMOVE_EDGE_TAG(_me) { _me->v2 = _me->v1; do_edge_free = true; } (void)0 # define IS_REMOVED_EDGE(_me) (_me->v2 == _me->v1) -# define REMOVE_LOOP_TAG(_ml) { _ml->e = INVALID_LOOP_EDGE_MARKER; do_polyloop_free = TRUE; } (void)0 -# define REMOVE_POLY_TAG(_mp) { _mp->totloop *= -1; do_polyloop_free = TRUE; } (void)0 +# define REMOVE_LOOP_TAG(_ml) { _ml->e = INVALID_LOOP_EDGE_MARKER; do_polyloop_free = true; } (void)0 +# define REMOVE_POLY_TAG(_mp) { _mp->totloop *= -1; do_polyloop_free = true; } (void)0 MVert *mv = mverts; MEdge *me; @@ -205,15 +205,15 @@ int BKE_mesh_validate_arrays(Mesh *mesh, unsigned int i, j; int *v; - short do_edge_free = FALSE; - short do_face_free = FALSE; - short do_polyloop_free = FALSE; /* This regroups loops and polys! */ + bool do_edge_free = false; + bool do_face_free = false; + bool do_polyloop_free = false; /* This regroups loops and polys! */ - short verts_fixed = FALSE; - short vert_weights_fixed = FALSE; - int msel_fixed = FALSE; + bool verts_fixed = false; + bool vert_weights_fixed = false; + bool msel_fixed = false; - int do_edge_recalc = FALSE; + bool do_edge_recalc = false; EdgeHash *edge_hash = BLI_edgehash_new(); @@ -825,7 +825,7 @@ int BKE_mesh_validate_arrays(Mesh *mesh, return (verts_fixed || vert_weights_fixed || do_polyloop_free || do_edge_free || do_edge_recalc || msel_fixed); } -static int mesh_validate_customdata(CustomData *data, short do_verbose, const short do_fixes) +static int mesh_validate_customdata(CustomData *data, const bool do_verbose, const bool do_fixes) { int i = 0, has_fixes = 0; @@ -859,7 +859,7 @@ static int mesh_validate_customdata(CustomData *data, short do_verbose, const sh static int BKE_mesh_validate_all_customdata(CustomData *vdata, CustomData *edata, CustomData *ldata, CustomData *pdata, - short do_verbose, const short do_fixes) + const bool do_verbose, const short do_fixes) { int vfixed = 0, efixed = 0, lfixed = 0, pfixed = 0; @@ -871,7 +871,7 @@ static int BKE_mesh_validate_all_customdata(CustomData *vdata, CustomData *edata return vfixed || efixed || lfixed || pfixed; } -int BKE_mesh_validate(Mesh *me, int do_verbose) +int BKE_mesh_validate(Mesh *me, const int do_verbose) { int layers_fixed = 0, arrays_fixed = 0; @@ -887,13 +887,13 @@ int BKE_mesh_validate(Mesh *me, int do_verbose) me->mloop, me->totloop, me->mpoly, me->totpoly, me->dvert, - do_verbose, TRUE); + do_verbose, true); if (layers_fixed || arrays_fixed) { DAG_id_tag_update(&me->id, OB_RECALC_DATA); - return TRUE; + return true; } - return FALSE; + return false; } int BKE_mesh_validate_dm(DerivedMesh *dm) diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index d38a2e56819..ba4a7b20f55 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -295,7 +295,7 @@ static int ss_sync_from_uv(CCGSubSurf *ss, CCGSubSurf *origss, DerivedMesh *dm, float uv[3] = {0.0f, 0.0f, 0.0f}; /* only first 2 values are written into */ limit[0] = limit[1] = STD_UV_CONNECT_LIMIT; - vmap = BKE_mesh_uv_vert_map_make(mpoly, mloop, mloopuv, totface, totvert, 0, limit); + vmap = BKE_mesh_uv_vert_map_create(mpoly, mloop, mloopuv, totface, totvert, 0, limit); if (!vmap) return 0; @@ -2985,7 +2985,7 @@ static const MeshElemMap *ccgDM_getPolyMap(Object *ob, DerivedMesh *dm) if (!ccgdm->multires.mmd && !ccgdm->pmap && ob->type == OB_MESH) { Mesh *me = ob->data; - create_vert_poly_map(&ccgdm->pmap, &ccgdm->pmap_mem, + BKE_mesh_vert_poly_map_create(&ccgdm->pmap, &ccgdm->pmap_mem, me->mpoly, me->mloop, me->totvert, me->totpoly, me->totloop); } |