griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

edit mesh operators for edit mesh view

Browse Source
This commit is contained in:
Shaul Kedem
2009-01-13 02:09:58 +00:00
parent ae25863d6c
commit d8a269541f
3 changed files with 338 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

280
source/blender/editors/mesh/editmesh_mods.c
View File

@@ -2097,7 +2097,7 @@ void mouse_mesh(bContext *C, short mval[2], short extend)
// rightmouse_transform();
}
// XXX should we use CTX_scene(C)->selectmode & SCE_SELECT_FACE like it was in the past ? calls selectconnected_delimit_mesh_all if true
void selectconnected_mesh_all(EditMesh *em)
{
EditVert *v1,*v2;
@@ -2142,6 +2142,29 @@ void selectconnected_mesh_all(EditMesh *em)
BIF_undo_push("Select Connected (All)");
}
static int selectconnected_mesh_all_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
EditMesh *em= ((Mesh *)obedit->data)->edit_mesh;
selectconnected_mesh_all(em);
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
return OPERATOR_FINISHED;
}
void MESH_OT_selectconnected_mesh_all(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Select All of the Connected Mesh";
ot->idname= "MESH_OT_selectconnected_mesh_all";
/* api callbacks */
ot->exec= selectconnected_mesh_all_exec;
ot->poll= ED_operator_editmesh;
}
// XXX should we use CTX_scene(C)->selectmode & SCE_SELECT_FACE like it was in the past ? calls selectconnected_delimit_mesh if true
void selectconnected_mesh(bContext *C)
{
ViewContext vc;
@@ -2217,6 +2240,27 @@ void selectconnected_mesh(bContext *C)
}
static int selectconnected_mesh_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
selectconnected_mesh(C);
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
return OPERATOR_FINISHED;
}
void MESH_OT_selectconnected_mesh(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Select Connected Mesh";
ot->idname= "MESH_OT_selectconnected_mesh";
/* api callbacks */
ot->exec= selectconnected_mesh_exec;
ot->poll= ED_operator_editmesh;
}
/* for use with selectconnected_delimit_mesh only! */
#define is_edge_delimit_ok(eed) ((eed->tmp.l == 1) && (eed->seam==0))
#define is_face_tag(efa) is_edge_delimit_ok(efa->e1) || is_edge_delimit_ok(efa->e2) || is_edge_delimit_ok(efa->e3) || (efa->v4 && is_edge_delimit_ok(efa->e4))
@@ -2428,6 +2472,37 @@ void hide_mesh(EditMesh *em, int swap)
BIF_undo_push("Hide");
}
static int hide_mesh_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
EditMesh *em= ((Mesh *)obedit->data)->edit_mesh;
/* 'standard' behaviour - check if selected, then apply relevant selection */
if (RNA_boolean_get(op->ptr, "swap"))
hide_mesh(em,1);
else
hide_mesh(em,0);
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
return OPERATOR_FINISHED;
}
void MESH_OT_hide_mesh(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Hide vertice or Hide All of the Mesh";
ot->idname= "MESH_OT_hide_mesh";
/* api callbacks */
ot->exec= hide_mesh_exec;
ot->poll= ED_operator_editmesh;
/* flags */
ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/;
/* props */
RNA_def_property(ot->srna, "swap", PROP_BOOLEAN, PROP_NONE);
}
void reveal_mesh(EditMesh *em)
{
@@ -2466,6 +2541,28 @@ void reveal_mesh(EditMesh *em)
BIF_undo_push("Reveal");
}
static int reveal_mesh_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
EditMesh *em= ((Mesh *)obedit->data)->edit_mesh;
reveal_mesh(em);
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
return OPERATOR_FINISHED;
}
void MESH_OT_reveal_mesh(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Reveal the Mesh";
ot->idname= "MESH_OT_reveal_mesh";
/* api callbacks */
ot->exec= reveal_mesh_exec;
ot->poll= ED_operator_editmesh;
}
void hide_tface_uv(EditMesh *em, int swap)
{
#if 0
@@ -2727,7 +2824,7 @@ void select_faces_by_numverts(EditMesh *em, int numverts)
BIF_undo_push("Select non-Triangles/Quads");
}
void select_sharp_edges(EditMesh *em)
void select_sharp_edges(EditMesh *em, float fsharpness)
{
/* Find edges that have exactly two neighboring faces,
* check the angle between those faces, and if angle is
@@ -2739,7 +2836,6 @@ void select_sharp_edges(EditMesh *em)
EditFace **efa2;
intptr_t edgecount = 0, i;
static short sharpness = 135;
float fsharpness;
if(em->selectmode==SCE_SELECT_FACE) {
error("Doesn't work in face selection mode");
@@ -2827,7 +2923,40 @@ void select_sharp_edges(EditMesh *em)
BIF_undo_push("Select Sharp Edges");
}
void select_linked_flat_faces(EditMesh *em)
static int select_sharp_edges_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
EditMesh *em= ((Mesh *)obedit->data)->edit_mesh;
/* 'standard' behaviour - check if selected, then apply relevant selection */
// XXX we need a message here - for 1 its recalculate normals inside, for 2 its outside
righthandfaces(em,RNA_float_get(op->ptr, "fsharpness"));
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); //TODO is this needed ?
return OPERATOR_FINISHED;
}
void MESH_OT_select_sharp_edges(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Select Sharp Edges";
ot->idname= "MESH_OT_select_sharp_edges";
/* api callbacks */
ot->exec= select_sharp_edges_exec;
ot->poll= ED_operator_editmesh;
/* flags */
ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/;
/* props */
RNA_def_property(ot->srna, "fsharpness", PROP_FLOAT, PROP_NONE);
}
// XXX looks like more work is needed in order for this to work (see in function)
void select_linked_flat_faces(EditMesh *em, float fsharpness)
{
/* Find faces that are linked to selected faces that are
* relatively flat (angle between faces is higher than
@@ -2839,7 +2968,7 @@ void select_linked_flat_faces(EditMesh *em)
EditFace **efa2;
intptr_t edgecount = 0, i, faceselcount=0, faceselcountold=0;
static short sharpness = 135;
float fsharpness;
if(em->selectmode!=SCE_SELECT_FACE) {
error("Only works in face selection mode");
@@ -2969,6 +3098,34 @@ void select_linked_flat_faces(EditMesh *em)
BIF_undo_push("Select Linked Flat Faces");
}
static int select_linked_flat_faces_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
EditMesh *em= ((Mesh *)obedit->data)->edit_mesh;
select_linked_flat_faces(em,RNA_float_get(op->ptr, "fsharpness"));
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
return OPERATOR_FINISHED;
}
void MESH_OT_select_linked_flat_faces(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Select Linked Flat Faces";
ot->idname= "MESH_OT_select_linked_flat_faces";
/* api callbacks */
ot->exec= select_linked_flat_faces_exec;
ot->poll= ED_operator_editmesh;
/* flags */
ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/;
/* props */
RNA_def_property(ot->srna, "fsharpness", PROP_FLOAT, PROP_NONE);
}
void select_non_manifold(EditMesh *em)
{
EditVert *eve;
@@ -3040,6 +3197,28 @@ void select_non_manifold(EditMesh *em)
BIF_undo_push("Select Non Manifold");
}
static int select_non_manifold_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
EditMesh *em= ((Mesh *)obedit->data)->edit_mesh;
select_non_manifold(em);
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
return OPERATOR_FINISHED;
}
void MESH_OT_select_non_manifold(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Select Non Manifold";
ot->idname= "MESH_OT_select_non_manifold";
/* api callbacks */
ot->exec= select_non_manifold_exec;
ot->poll= ED_operator_editmesh;
}
void selectswap_mesh(EditMesh *em) /* UI level */
{
EditVert *eve;
@@ -3078,6 +3257,28 @@ void selectswap_mesh(EditMesh *em) /* UI level */
}
static int selectswap_mesh_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
EditMesh *em= ((Mesh *)obedit->data)->edit_mesh;
selectswap_mesh(em);
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
return OPERATOR_FINISHED;
}
void MESH_OT_selectswap_mesh(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Select Swap";
ot->idname= "MESH_OT_selectswap_mesh";
/* api callbacks */
ot->exec= selectswap_mesh_exec;
ot->poll= ED_operator_editmesh;
}
/* ******************** (de)select all operator **************** */
static int toggle_select_all_exec(bContext *C, wmOperator *op)
@@ -3152,13 +3353,30 @@ void EM_select_more(EditMesh *em)
}
}
void select_more(EditMesh *em)
static int select_more(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
EditMesh *em= ((Mesh *)obedit->data)->edit_mesh;
EM_select_more(em);
// if (EM_texFaceCheck(em))
BIF_undo_push("Select More");
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
return OPERATOR_FINISHED;
}
void MESH_OT_select_more(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Select More";
ot->idname= "MESH_OT_select_more";
/* api callbacks */
ot->exec= select_more;
ot->poll= ED_operator_editmesh;
}
void EM_select_less(EditMesh *em)
@@ -3222,15 +3440,30 @@ void EM_select_less(EditMesh *em)
}
}
void select_less(EditMesh *em)
static int select_less(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
EditMesh *em= ((Mesh *)obedit->data)->edit_mesh;
EM_select_less(em);
BIF_undo_push("Select Less");
// if (EM_texFaceCheck(em))
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
return OPERATOR_FINISHED;
}
void MESH_OT_select_less(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Select Less";
ot->idname= "MESH_OT_select_less";
/* api callbacks */
ot->exec= select_less;
ot->poll= ED_operator_editmesh;
}
void selectrandom_mesh(EditMesh *em) /* randomly selects a user-set % of vertices/edges/faces */
{
@@ -3782,6 +4015,37 @@ void righthandfaces(EditMesh *em, int select) /* makes faces righthand turning *
}
static int righthandfaces_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
EditMesh *em= ((Mesh *)obedit->data)->edit_mesh;
/* 'standard' behaviour - check if selected, then apply relevant selection */
// XXX we need a message here - for 1 its recalculate normals inside, for 2 its outside
righthandfaces(em,RNA_int_get(op->ptr, "select"));
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); //TODO is this needed ?
return OPERATOR_FINISHED;
}
void MESH_OT_righthandfaces(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Manipulate Normals";
ot->idname= "MESH_OT_righthandfaces";
/* api callbacks */
ot->exec= righthandfaces_exec;
ot->poll= ED_operator_editmesh;
/* flags */
ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/;
/* props */
RNA_def_property(ot->srna, "select", PROP_INT, PROP_NONE);
}
/* ********** ALIGN WITH VIEW **************** */

14
source/blender/editors/mesh/mesh_intern.h
View File

@@ -159,6 +159,20 @@ extern struct EditFace *EM_face_from_faces(EditMesh *em, struct EditFace *efa1,
/* ******************* editmesh_mods.c */
void MESH_OT_de_select_all(struct wmOperatorType *ot);
void MESH_OT_select_more(struct wmOperatorType *ot);
void MESH_OT_select_less(struct wmOperatorType *ot);
void MESH_OT_selectswap_mesh(struct wmOperatorType *ot);
void MESH_OT_select_non_manifold(struct wmOperatorType *ot);
void MESH_OT_selectconnected_mesh_all(struct wmOperatorType *ot);
void MESH_OT_selectconnected_mesh(struct wmOperatorType *ot);
void MESH_OT_hide_mesh(struct wmOperatorType *ot);
void MESH_OT_reveal_mesh(struct wmOperatorType *ot);
void MESH_OT_righthandfaces(struct wmOperatorType *ot);
void MESH_OT_select_linked_flat_faces(struct wmOperatorType *ot);
void MESH_OT_select_sharp_edges(struct wmOperatorType *ot);
extern EditEdge *findnearestedge(ViewContext *vc, int *dist);
extern void EM_automerge(int update);

52
source/blender/editors/mesh/mesh_ops.c
View File

@@ -65,6 +65,29 @@
void ED_operatortypes_mesh(void)
{
WM_operatortype_append(MESH_OT_de_select_all);
WM_operatortype_append(MESH_OT_select_more);
WM_operatortype_append(MESH_OT_select_less);
WM_operatortype_append(MESH_OT_selectswap_mesh);
WM_operatortype_append(MESH_OT_select_non_manifold);
WM_operatortype_append(MESH_OT_selectconnected_mesh_all);
WM_operatortype_append(MESH_OT_selectconnected_mesh);
WM_operatortype_append(MESH_OT_hide_mesh);
WM_operatortype_append(MESH_OT_reveal_mesh);
WM_operatortype_append(MESH_OT_righthandfaces);
WM_operatortype_append(MESH_OT_select_linked_flat_faces);
WM_operatortype_append(MESH_OT_select_sharp_edges);
}
/* note mesh keymap also for other space? */
@@ -74,6 +97,35 @@ void ED_keymap_mesh(wmWindowManager *wm)
WM_keymap_add_item(keymap, "MESH_OT_de_select_all", AKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "MESH_OT_select_more", PADPLUSKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "MESH_OT_select_less", PADMINUS, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "MESH_OT_selectswap_mesh", IKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "MESH_OT_select_non_manifold", MKEY, KM_PRESS, (KM_CTRL|KM_SHIFT|KM_ALT), 0);
WM_keymap_add_item(keymap, "MESH_OT_selectconnected_mesh_all", LKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "MESH_OT_selectconnected_mesh", LKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "MESH_OT_hide_mesh", HKEY, KM_PRESS, 0, 0);
RNA_boolean_set(WM_keymap_add_item(keymap, "MESH_OT_hide_mesh", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "swap", 1);
WM_keymap_add_item(keymap, "MESH_OT_reveal_mesh", HKEY, KM_PRESS, KM_ALT, 0);
RNA_int_set(WM_keymap_add_item(keymap, "MESH_OT_righthandfaces", NKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "select", 2);
RNA_int_set(WM_keymap_add_item(keymap, "MESH_OT_righthandfaces", NKEY, KM_PRESS, KM_CTRL, 0)->ptr, "select", 1);
RNA_float_set(WM_keymap_add_item(keymap, "MESH_OT_select_linked_flat_faces", FKEY, KM_PRESS, (KM_CTRL|KM_SHIFT|KM_ALT), 0)->ptr,"fsharpness",135.0);
RNA_float_set(WM_keymap_add_item(keymap, "MESH_OT_select_sharp_edges", SKEY, KM_PRESS, (KM_CTRL|KM_SHIFT|KM_ALT), 0)->ptr,"fsharpness",135.0);
// RNA_int_set(WM_keymap_add_item(keymap, "OBJECT_OT_viewzoom", PADPLUSKEY, KM_PRESS, 0, 0)->ptr, "delta", 1);
}