diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-27 08:46:52 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-27 08:46:52 +0400 |
commit | 09f29c0b70357684b270745167cc30a3134b8d98 (patch) | |
tree | 8cb909d1fa49f5f017e0a0c4d09b426a4d1bd7cb /source/blender/editors/include | |
parent | ea270a690387c8c65ca31610a3c8ce5f06328eac (diff) |
style/name cleanup: have EDBM_* functions match our style guide and also match BM_ function naming conventions
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/ED_mesh.h | 202 |
1 files changed, 90 insertions, 112 deletions
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index 69376a9bde3..71bce196ddf 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -71,74 +71,52 @@ struct Material; struct Object; struct rcti; -#define EM_FGON_DRAW 1 // face flag -#define EM_FGON 2 // edge and face flag both +#define EM_FGON_DRAW 1 // face flag +#define EM_FGON 2 // edge and face flag both /* editbutflag */ -#define B_CLOCKWISE 1 -#define B_KEEPORIG 2 -#define B_BEAUTY 4 -#define B_SMOOTH 8 -#define B_BEAUTY_SHORT 0x10 -#define B_AUTOFGON 0x20 -#define B_KNIFE 0x80 -#define B_PERCENTSUBD 0x40 +#define B_CLOCKWISE 1 +#define B_KEEPORIG 2 +#define B_BEAUTY 4 +#define B_SMOOTH 8 +#define B_BEAUTY_SHORT 0x10 +#define B_AUTOFGON 0x20 +#define B_KNIFE 0x80 +#define B_PERCENTSUBD 0x40 //#define B_MESH_X_MIRROR 0x100 // deprecated, use mesh -#define B_JOINTRIA_UV 0x200 -#define B_JOINTRIA_VCOL 0X400 -#define B_JOINTRIA_SHARP 0X800 -#define B_JOINTRIA_MAT 0X1000 -#define B_FRACTAL 0x2000 -#define B_SPHERE 0x4000 +#define B_JOINTRIA_UV 0x200 +#define B_JOINTRIA_VCOL 0X400 +#define B_JOINTRIA_SHARP 0X800 +#define B_JOINTRIA_MAT 0X1000 +#define B_FRACTAL 0x2000 +#define B_SPHERE 0x4000 intptr_t mesh_octree_table(struct Object *ob, struct BMEditMesh *em, float *co, char mode); int mesh_mirrtopo_table(struct Object *ob, char mode); /* bmeshutils.c */ -/** - * [note: I've decided to use ideasman's code for non-editmode stuff, but since - * it has a big "not for editmode!" disclaimer, I'm going to keep what I have here - * - joeedh] - * - * x-mirror editing api. usage: - * - * EDBM_CacheMirrorVerts(em); - * ... - * ... - * BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - * mirrorv = EDBM_GetMirrorVert(em, v); - * } - * ... - * ... - * EDBM_EndMirrorCache(em); - * - * \note why do we only allow x axis mirror editing? - */ -void EDBM_CacheMirrorVerts(struct BMEditMesh *em, const short use_select); /* note, replaces EM_cache_x_mirror_vert in trunk */ /* retrieves mirrored cache vert, or NULL if there isn't one. * note: calling this without ensuring the mirror cache state * is bad.*/ -struct BMVert *EDBM_GetMirrorVert(struct BMEditMesh *em, struct BMVert *v); -void EDBM_ClearMirrorVert(struct BMEditMesh *em, struct BMVert *v); -void EDBM_EndMirrorCache(struct BMEditMesh *em); -void EDBM_ApplyMirrorCache(struct BMEditMesh *em, const int sel_from, const int sel_to); +void EDBM_verts_mirror_cache_begin(struct BMEditMesh *em, const short use_select); /* note, replaces EM_cache_x_mirror_vert in trunk */ +void EDBM_verts_mirror_apply(struct BMEditMesh *em, const int sel_from, const int sel_to); +struct BMVert *EDBM_verts_mirror_get(struct BMEditMesh *em, struct BMVert *v); +void EDBM_verts_mirror_cache_clear(struct BMEditMesh *em, struct BMVert *v); +void EDBM_verts_mirror_cache_end(struct BMEditMesh *em); -void EDBM_RecalcNormals(struct BMEditMesh *em); +void EDBM_mesh_normals_update(struct BMEditMesh *em); -void EDBM_MakeEditBMesh(struct ToolSettings *ts, struct Scene *scene, struct Object *ob); -void EDBM_FreeEditBMesh(struct BMEditMesh *tm); -void EDBM_LoadEditBMesh(struct Scene *scene, struct Object *ob); +void EDBM_mesh_make(struct ToolSettings *ts, struct Scene *scene, struct Object *ob); +void EDBM_mesh_free(struct BMEditMesh *tm); +void EDBM_mesh_load(struct Scene *scene, struct Object *ob); -void EDBM_init_index_arrays(struct BMEditMesh *em, int forvert, int foredge, int forface); -void EDBM_free_index_arrays(struct BMEditMesh *em); -struct BMVert *EDBM_get_vert_for_index(struct BMEditMesh *em, int index); -struct BMEdge *EDBM_get_edge_for_index(struct BMEditMesh *em, int index); -struct BMFace *EDBM_get_face_for_index(struct BMEditMesh *em, int index); - -int EDBM_CallAndSelectOpf(struct BMEditMesh *em, struct wmOperator *op, - const char *selectslot, const char *fmt, ...); +void EDBM_index_arrays_init(struct BMEditMesh *em, int forvert, int foredge, int forface); +void EDBM_index_arrays_free(struct BMEditMesh *em); +struct BMVert *EDBM_vert_at_index(struct BMEditMesh *em, int index); +struct BMEdge *EDBM_edge_at_index(struct BMEditMesh *em, int index); +struct BMFace *EDBM_face_at_index(struct BMEditMesh *em, int index); /* flushes based on the current select mode. if in vertex select mode, * verts select/deselect edges and faces, if in edge select mode, @@ -147,8 +125,6 @@ int EDBM_CallAndSelectOpf(struct BMEditMesh *em, struct wmOperator *op, void EDBM_select_more(struct BMEditMesh *em); void EDBM_select_less(struct BMEditMesh *em); -int EDBM_get_actSelection(struct BMEditMesh *em, struct BMEditSelection *ese); - void EDBM_selectmode_flush_ex(struct BMEditMesh *em, int selectmode); void EDBM_selectmode_flush(struct BMEditMesh *em); @@ -156,45 +132,47 @@ void EDBM_deselect_flush(struct BMEditMesh *em); void EDBM_select_flush(struct BMEditMesh *em); void EDBM_selectmode_set(struct BMEditMesh *em); -void EDBM_convertsel(struct BMEditMesh *em, short oldmode, short selectmode); -void undo_push_mesh(struct bContext *C, const char *name); +void EDBM_selectmode_convert(struct BMEditMesh *em, short oldmode, short selectmode); +void undo_push_mesh(struct bContext *C, const char *name); +int EDBM_editselection_active_get(struct BMEditMesh *em, struct BMEditSelection *ese); void EDBM_editselection_center(struct BMEditMesh *em, float *center, struct BMEditSelection *ese); void EDBM_editselection_plane(struct BMEditMesh *em, float *plane, struct BMEditSelection *ese); void EDBM_editselection_normal(float *normal, struct BMEditSelection *ese); -int EDBM_vertColorCheck(struct BMEditMesh *em); -void EDBM_validate_selections(struct BMEditMesh *em); +int EDBM_vert_color_check(struct BMEditMesh *em); +void EDBM_editselection_validate(struct BMEditMesh *em); -void EDBM_hide_mesh(struct BMEditMesh *em, int swap); -void EDBM_reveal_mesh(struct BMEditMesh *em); +void EDBM_mesh_hide(struct BMEditMesh *em, int swap); +void EDBM_mesh_reveal(struct BMEditMesh *em); void EDBM_update_generic(struct bContext *C, struct BMEditMesh *em, const short do_tessface); -int EDBM_check_backbuf(unsigned int index); -int EDBM_mask_init_backbuf_border(struct ViewContext *vc, int mcords[][2], short tot, short xmin, short ymin, short xmax, short ymax); -void EDBM_free_backbuf(void); -int EDBM_init_backbuf_border(struct ViewContext *vc, short xmin, short ymin, short xmax, short ymax); -int EDBM_init_backbuf_circle(struct ViewContext *vc, short xs, short ys, short rads); +int EDBM_backbuf_check(unsigned int index); +int EDBM_backbuf_border_mask_init(struct ViewContext *vc, int mcords[][2], short tot, + short xmin, short ymin, short xmax, short ymax); +void EDBM_backbuf_free(void); +int EDBM_backbuf_border_init(struct ViewContext *vc, short xmin, short ymin, short xmax, short ymax); +int EDBM_backbuf_circle_init(struct ViewContext *vc, short xs, short ys, short rads); void EDBM_deselect_by_material(struct BMEditMesh *em, const short index, const short select); -int EDBM_select_interior_faces(struct BMEditMesh *em); +struct UvElementMap *EDBM_uv_element_map_create(struct BMEditMesh *em, int selected, int doIslands); +void EDBM_uv_element_map_free(struct UvElementMap *vmap); -struct UvElementMap *EDBM_make_uv_element_map(struct BMEditMesh *em, int selected, int doIslands); -void EDBM_free_uv_element_map(struct UvElementMap *vmap); +int EDBM_mtexpoly_check(struct BMEditMesh *em); +struct MTexPoly *EDBM_mtexpoly_active_get(struct BMEditMesh *em, struct BMFace **r_act_efa, int sloppy); -void EDBM_select_swap(struct BMEditMesh *em); /* exported for UV */ - -int EDBM_texFaceCheck(struct BMEditMesh *em); -struct MTexPoly *EDBM_get_active_mtexpoly(struct BMEditMesh *em, struct BMFace **r_act_efa, int sloppy); +void EDBM_uv_vert_map_free(struct UvVertMap *vmap); +struct UvMapVert *EDBM_uv_vert_map_at_index(struct UvVertMap *vmap, unsigned int v); +struct UvVertMap *EDBM_uv_vert_map_create(struct BMEditMesh *em, int selected, int do_face_idx_array, float *limit); -void EDBM_free_uv_vert_map(struct UvVertMap *vmap); -struct UvMapVert *EDBM_get_uv_map_vert(struct UvVertMap *vmap, unsigned int v); -struct UvVertMap *EDBM_make_uv_vert_map(struct BMEditMesh *em, int selected, int do_face_idx_array, float *limit); -void EM_add_data_layer(struct BMEditMesh *em, struct CustomData *data, int type, const char *name); -void EM_free_data_layer(struct BMEditMesh *em, struct CustomData *data, int type); +void EDBM_data_layer_add(struct BMEditMesh *em, struct CustomData *data, int type, const char *name); +void EDBM_data_layer_free(struct BMEditMesh *em, struct CustomData *data, int type); void EDBM_select_toggle_all(struct BMEditMesh *em); +void EDBM_select_swap(struct BMEditMesh *em); /* exported for UV */ +int EDBM_select_interior_faces(struct BMEditMesh *em); + void EDBM_flag_enable_all(struct BMEditMesh *em, const char hflag); void EDBM_flag_disable_all(struct BMEditMesh *em, const char hflag); void EDBM_select_mirrored(struct Object *obedit, struct BMEditMesh *em, int extend); @@ -203,25 +181,25 @@ void EDBM_automerge(struct Scene *scene, struct Object *ob, int update); /* editmesh_mods.c */ extern unsigned int bm_vertoffs, bm_solidoffs, bm_wireoffs; -int mouse_mesh(struct bContext *C, const int mval[2], short extend); +int mouse_mesh(struct bContext *C, const int mval[2], short extend); -struct BMVert *editbmesh_get_x_mirror_vert(struct Object *ob, struct BMEditMesh *em, struct BMVert *eve, float *co, int index); -int mesh_get_x_mirror_vert(struct Object *ob, int index); -int *mesh_get_x_mirror_faces(struct Object *ob, struct BMEditMesh *em); +struct BMVert *editbmesh_get_x_mirror_vert(struct Object *ob, struct BMEditMesh *em, struct BMVert *eve, float *co, int index); +int mesh_get_x_mirror_vert(struct Object *ob, int index); +int *mesh_get_x_mirror_faces(struct Object *ob, struct BMEditMesh *em); -int join_mesh_exec(struct bContext *C, struct wmOperator *op); -int join_mesh_shapes_exec(struct bContext *C, struct wmOperator *op); +int join_mesh_exec(struct bContext *C, struct wmOperator *op); +int join_mesh_shapes_exec(struct bContext *C, struct wmOperator *op); /* mesh_ops.c */ -void ED_operatortypes_mesh(void); -void ED_operatormacros_mesh(void); -void ED_keymap_mesh(struct wmKeyConfig *keyconf); +void ED_operatortypes_mesh(void); +void ED_operatormacros_mesh(void); +void ED_keymap_mesh(struct wmKeyConfig *keyconf); /* editmesh.c */ -void ED_spacetypes_init(void); -void ED_keymap_mesh(struct wmKeyConfig *keyconf); +void ED_spacetypes_init(void); +void ED_keymap_mesh(struct wmKeyConfig *keyconf); /* bmesh_mods.c */ extern unsigned int bm_vertoffs, bm_solidoffs, bm_wireoffs; @@ -241,7 +219,7 @@ void paintface_hide(struct Object *ob, const int unselected); void paintface_reveal(struct Object *ob); void paintvert_deselect_all_visible(struct Object *ob, int action, short flush_flags); -void paintvert_flush_flags(struct Object *ob); +void paintvert_flush_flags(struct Object *ob); /* object_vgroup.c */ @@ -249,25 +227,25 @@ void paintvert_flush_flags(struct Object *ob); #define WEIGHT_ADD 2 #define WEIGHT_SUBTRACT 3 -struct bDeformGroup *ED_vgroup_add(struct Object *ob); -struct bDeformGroup *ED_vgroup_add_name(struct Object *ob, const char *name); -void ED_vgroup_delete(struct Object *ob, struct bDeformGroup *defgroup); -void ED_vgroup_clear(struct Object *ob); -void ED_vgroup_select_by_name(struct Object *ob, const char *name); -int ED_vgroup_data_create(struct ID *id); -int ED_vgroup_give_array(struct ID *id, struct MDeformVert **dvert_arr, int *dvert_tot); -int ED_vgroup_copy_array(struct Object *ob, struct Object *ob_from); -void ED_vgroup_mirror(struct Object *ob, const short mirror_weights, const short flip_vgroups, const short all_vgroups); +struct bDeformGroup *ED_vgroup_add(struct Object *ob); +struct bDeformGroup *ED_vgroup_add_name(struct Object *ob, const char *name); +void ED_vgroup_delete(struct Object *ob, struct bDeformGroup *defgroup); +void ED_vgroup_clear(struct Object *ob); +void ED_vgroup_select_by_name(struct Object *ob, const char *name); +int ED_vgroup_data_create(struct ID *id); +int ED_vgroup_give_array(struct ID *id, struct MDeformVert **dvert_arr, int *dvert_tot); +int ED_vgroup_copy_array(struct Object *ob, struct Object *ob_from); +void ED_vgroup_mirror(struct Object *ob, const short mirror_weights, const short flip_vgroups, const short all_vgroups); -int ED_vgroup_object_is_edit_mode(struct Object *ob); +int ED_vgroup_object_is_edit_mode(struct Object *ob); -void ED_vgroup_vert_add(struct Object *ob, struct bDeformGroup *dg, int vertnum, float weight, int assignmode); -void ED_vgroup_vert_remove(struct Object *ob, struct bDeformGroup *dg, int vertnum); -float ED_vgroup_vert_weight(struct Object *ob, struct bDeformGroup *dg, int vertnum); +void ED_vgroup_vert_add(struct Object *ob, struct bDeformGroup *dg, int vertnum, float weight, int assignmode); +void ED_vgroup_vert_remove(struct Object *ob, struct bDeformGroup *dg, int vertnum); +float ED_vgroup_vert_weight(struct Object *ob, struct bDeformGroup *dg, int vertnum); -struct BMVert *EDBM_findnearestvert(struct ViewContext *vc, int *dist, short sel, short strict); -struct BMEdge *EDBM_findnearestedge(struct ViewContext *vc, int *dist); -struct BMFace *EDBM_findnearestface(struct ViewContext *vc, int *dist); +struct BMVert *EDBM_vert_find_nearest(struct ViewContext *vc, int *dist, short sel, short strict); +struct BMEdge *EDBM_edge_find_nearest(struct ViewContext *vc, int *dist); +struct BMFace *EDBM_face_find_nearest(struct ViewContext *vc, int *dist); /* mesh_data.c */ // void ED_mesh_geometry_add(struct Mesh *mesh, struct ReportList *reports, int verts, int edges, int faces); @@ -295,7 +273,7 @@ int ED_mesh_color_remove(struct bContext *C, struct Object *ob, struct Mesh *me) int ED_mesh_color_remove_named(struct bContext *C, struct Object *ob, struct Mesh *me, const char *name); void EDBM_selectmode_to_scene(struct bContext *C); -void EDBM_ClearMesh(struct BMEditMesh *em); +void EDBM_mesh_clear(struct BMEditMesh *em); #include "../mesh/editmesh_bvh.h" @@ -303,9 +281,9 @@ void EDBM_ClearMesh(struct BMEditMesh *em); /* mirrtopo */ typedef struct MirrTopoStore_t { intptr_t *index_lookup; - int prev_vert_tot; - int prev_edge_tot; - int prev_ob_mode; + int prev_vert_tot; + int prev_edge_tot; + int prev_ob_mode; } MirrTopoStore_t; int ED_mesh_mirrtopo_recalc_check(struct Mesh *me, const int ob_mode, MirrTopoStore_t *mesh_topo_store); @@ -319,9 +297,9 @@ void ED_mesh_mirrtopo_free(MirrTopoStore_t *mesh_topo_store); #define SUBDIV_SELECT_LOOPCUT 3 /* edge subdivide corner cut types */ -#define SUBDIV_CORNER_PATH 0 -#define SUBDIV_CORNER_INNERVERT 1 -#define SUBDIV_CORNER_FAN 2 +#define SUBDIV_CORNER_PATH 0 +#define SUBDIV_CORNER_INNERVERT 1 +#define SUBDIV_CORNER_FAN 2 #ifdef __cplusplus } |