archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.5

Browse Source 
- Finished adding primitives in Mesh editmode. 
  For test pleasure: hotkeys CTRL 0-9 add them.

More fun for testers: 
 
- F3: gives menu of all registered ops. You can use
  it too, it then execs it again, and makes it the
  last executed operator.
  
- F4: executes last registered operator without menu.
This commit is contained in:
Ton Roosendaal
2009-01-15 18:28:40 +00:00
parent 2b96a86298
commit 2784d5b995
5 changed files with 250 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

217
source/blender/editors/mesh/editmesh_add.c
View File

@@ -1103,7 +1103,9 @@ static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int se
}
break;
default: /* all types except grid, sphere... */
if(ext==0 && type!=7) depth= 0.0f;
if(type==PRIM_CONE);
else if(ext==0)
depth= 0.0f;
/* vertices */
vtop= vdown= v1= v2= 0;
@@ -1112,7 +1114,7 @@ static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int se
vec[0]= dia*sin(phi);
vec[1]= dia*cos(phi);
vec[2]= depth;
vec[2]= b?depth:-depth;
Mat4MulVecfl(mat, vec);
eve= addvertlist(em, vec, NULL);
@@ -1123,19 +1125,19 @@ static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int se
}
phi+=phid;
}
depth= -depth;
}
/* center vertices */
/* type 7, a cone can only have 1 one side filled
/* type PRIM_CONE can only have 1 one side filled
* if the cone has no capping, dont add vtop */
if((fill && type>1) || type == 7) {
if((fill && type>1) || type == PRIM_CONE) {
vec[0]= vec[1]= 0.0f;
vec[2]-= -depth;
vec[2]= -depth;
Mat4MulVecfl(mat, vec);
vdown= addvertlist(em, vec, NULL);
if((ext || type==7) && fill) {
if((ext || type==PRIM_CONE) && fill) {
vec[0]= vec[1]= 0.0f;
vec[2]-= depth;
vec[2]= depth;
Mat4MulVecfl(mat,vec);
vtop= addvertlist(em, vec, NULL);
}
@@ -1147,7 +1149,7 @@ static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int se
if(vdown) vdown->f= SELECT;
/* top and bottom face */
if(fill || type==7) {
if(fill || type==PRIM_CONE) {
if(tot==4 && (type==0 || type==1)) {
v3= v1->next->next;
if(ext) v4= v2->next->next;
@@ -1173,7 +1175,7 @@ static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int se
}
}
}
else if(type==4) { /* we need edges for a circle */
else if(type==PRIM_CIRCLE) { /* we need edges for a circle */
v3= v1;
for(a=1;a<tot;a++) {
addedgelist(em, v3, v3->next, NULL);
@@ -1192,7 +1194,7 @@ static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int se
}
addfacelist(em, v3, v1, v2, v4, NULL, NULL);
}
else if(type==7 && fill) {
else if(type==PRIM_CONE && fill) {
/* add the bottom flat area of the cone
* if capping is disabled dont bother */
v3= v1;
@@ -1433,7 +1435,6 @@ static int add_primitive_plane_exec(bContext *C, wmOperator *op)
float dia, mat[4][4];
dia= new_primitive_matrix(C, mat);
/* plane (diameter of 1.41 makes it unit size) */
dia*= sqrt(2.0f);
@@ -1454,6 +1455,9 @@ void MESH_OT_add_primitive_plane(wmOperatorType *ot)
/* api callbacks */
ot->exec= add_primitive_plane_exec;
ot->poll= ED_operator_editmesh;
/* flags */
ot->flag= OPTYPE_REGISTER;
}
static int add_primitive_cube_exec(bContext *C, wmOperator *op)
@@ -1462,7 +1466,6 @@ static int add_primitive_cube_exec(bContext *C, wmOperator *op)
float dia, mat[4][4];
dia= new_primitive_matrix(C, mat);
/* plane (diameter of 1.41 makes it unit size) */
dia*= sqrt(2.0f);
@@ -1483,6 +1486,9 @@ void MESH_OT_add_primitive_cube(wmOperatorType *ot)
/* api callbacks */
ot->exec= add_primitive_cube_exec;
ot->poll= ED_operator_editmesh;
/* flags */
ot->flag= OPTYPE_REGISTER;
}
static int add_primitive_circle_exec(bContext *C, wmOperator *op)
@@ -1491,10 +1497,10 @@ static int add_primitive_circle_exec(bContext *C, wmOperator *op)
float dia, mat[4][4];
dia= new_primitive_matrix(C, mat);
dia *= RNA_float_get(op->ptr,"Radius");
dia = RNA_float_get(op->ptr,"radius");
make_prim(obedit, PRIM_CIRCLE, mat, RNA_int_get(op->ptr,"vertices"), 0, 0, dia, 0.0f, 0, RNA_boolean_get(op->ptr, "fill"));
make_prim(obedit, PRIM_CIRCLE, mat, RNA_int_get(op->ptr,"Vertices"), 0, 0, dia, 0.0f, 0,
RNA_boolean_get(op->ptr, "Fill"));
ED_undo_push(C, "Add Circle"); // Note this will become depricated
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
@@ -1504,6 +1510,8 @@ static int add_primitive_circle_exec(bContext *C, wmOperator *op)
void MESH_OT_add_primitive_circle(wmOperatorType *ot)
{
PropertyRNA *prop;
/* identifiers */
ot->name= "Add Circle";
ot->idname= "MESH_OT_add_primitive_circle";
@@ -1516,10 +1524,12 @@ void MESH_OT_add_primitive_circle(wmOperatorType *ot)
ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/;
/* props */
RNA_def_property(ot->srna, "vertices", PROP_INT, PROP_NONE);
RNA_def_property(ot->srna, "radius", PROP_FLOAT, PROP_NONE);
RNA_def_property(ot->srna, "fill", PROP_BOOLEAN, PROP_NONE);
prop= RNA_def_property(ot->srna, "Vertices", PROP_INT, PROP_NONE);
RNA_def_property_int_default(prop, 32);
prop= RNA_def_property(ot->srna, "Radius", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_default(prop, 1.0f);
prop= RNA_def_property(ot->srna, "Fill", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_default(prop, 0);
}
static int add_primitive_cylinder_exec(bContext *C, wmOperator *op)
@@ -1528,11 +1538,10 @@ static int add_primitive_cylinder_exec(bContext *C, wmOperator *op)
float dia, mat[4][4];
dia= new_primitive_matrix(C, mat);
dia *= RNA_float_get(op->ptr,"Radius");
dia = RNA_float_get(op->ptr,"radius");
// XXX cylinder turns out a bit wacky.. play with the cursor to get even more interesting stuff
make_prim(obedit, PRIM_CYLINDER, mat, RNA_int_get(op->ptr,"vertices"),32, 2, dia, RNA_float_get(op->ptr,"depth"), 1, 1);
make_prim(obedit, PRIM_CYLINDER, mat, RNA_int_get(op->ptr,"Vertices"), 0, 0, dia,
RNA_float_get(op->ptr,"Depth"), 1, 1);
ED_undo_push(C, "Add Cylinder"); // Note this will become depricated
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
@@ -1542,6 +1551,8 @@ static int add_primitive_cylinder_exec(bContext *C, wmOperator *op)
void MESH_OT_add_primitive_cylinder(wmOperatorType *ot)
{
PropertyRNA *prop;
/* identifiers */
ot->name= "Add Cylinder";
ot->idname= "MESH_OT_add_primitive_cylinder";
@@ -1554,10 +1565,12 @@ void MESH_OT_add_primitive_cylinder(wmOperatorType *ot)
ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/;
/* props */
RNA_def_property(ot->srna, "vertices", PROP_INT, PROP_NONE);
RNA_def_property(ot->srna, "radius", PROP_FLOAT, PROP_NONE);
RNA_def_property(ot->srna, "depth", PROP_FLOAT, PROP_NONE);
prop= RNA_def_property(ot->srna, "Vertices", PROP_INT, PROP_NONE);
RNA_def_property_int_default(prop, 32);
prop= RNA_def_property(ot->srna, "Radius", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_default(prop, 1.0f);
prop= RNA_def_property(ot->srna, "Depth", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_default(prop, 1.0f);
}
static int add_primitive_tube_exec(bContext *C, wmOperator *op)
@@ -1566,10 +1579,10 @@ static int add_primitive_tube_exec(bContext *C, wmOperator *op)
float dia, mat[4][4];
dia= new_primitive_matrix(C, mat);
dia *= RNA_float_get(op->ptr,"Radius");
dia = RNA_float_get(op->ptr,"radius");
make_prim(obedit, PRIM_CYLINDER, mat, RNA_int_get(op->ptr,"vertices"), 32, 2, dia, RNA_float_get(op->ptr,"depth")/2, 1, 0);
make_prim(obedit, PRIM_CYLINDER, mat, RNA_int_get(op->ptr,"Vertices"), 0, 0, dia,
RNA_float_get(op->ptr,"Depth"), 1, 0);
ED_undo_push(C, "Add Tube"); // Note this will become depricated
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
@@ -1579,6 +1592,8 @@ static int add_primitive_tube_exec(bContext *C, wmOperator *op)
void MESH_OT_add_primitive_tube(wmOperatorType *ot)
{
PropertyRNA *prop;
/* identifiers */
ot->name= "Add Tube";
ot->idname= "MESH_OT_add_primitive_tube";
@@ -1591,10 +1606,12 @@ void MESH_OT_add_primitive_tube(wmOperatorType *ot)
ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/;
/* props */
RNA_def_property(ot->srna, "vertices", PROP_INT, PROP_NONE);
RNA_def_property(ot->srna, "radius", PROP_FLOAT, PROP_NONE);
RNA_def_property(ot->srna, "depth", PROP_FLOAT, PROP_NONE);
prop= RNA_def_property(ot->srna, "Vertices", PROP_INT, PROP_NONE);
RNA_def_property_int_default(prop, 32);
prop= RNA_def_property(ot->srna, "Radius", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_default(prop, 1.0f);
prop= RNA_def_property(ot->srna, "Depth", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_default(prop, 1.0f);
}
static int add_primitive_cone_exec(bContext *C, wmOperator *op)
@@ -1603,10 +1620,10 @@ static int add_primitive_cone_exec(bContext *C, wmOperator *op)
float dia, mat[4][4];
dia= new_primitive_matrix(C, mat);
dia *= RNA_float_get(op->ptr,"Radius");
dia = RNA_float_get(op->ptr,"radius");
make_prim(obedit, PRIM_CONE, mat, RNA_int_get(op->ptr,"vertices"), 32, 2, dia, RNA_float_get(op->ptr,"depth")/2, 1, RNA_int_get(op->ptr,"cap_end"));
make_prim(obedit, PRIM_CONE, mat, RNA_int_get(op->ptr,"Vertices"), 0, 0, dia,
RNA_float_get(op->ptr,"Depth"), 0, RNA_int_get(op->ptr,"Cap_end"));
ED_undo_push(C, "Add Cone"); // Note this will become depricated
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
@@ -1616,6 +1633,8 @@ static int add_primitive_cone_exec(bContext *C, wmOperator *op)
void MESH_OT_add_primitive_cone(wmOperatorType *ot)
{
PropertyRNA *prop;
/* identifiers */
ot->name= "Add Cone";
ot->idname= "MESH_OT_add_primitive_cone";
@@ -1628,11 +1647,14 @@ void MESH_OT_add_primitive_cone(wmOperatorType *ot)
ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/;
/* props */
RNA_def_property(ot->srna, "vertices", PROP_INT, PROP_NONE);
RNA_def_property(ot->srna, "radius", PROP_FLOAT, PROP_NONE);
RNA_def_property(ot->srna, "depth", PROP_FLOAT, PROP_NONE);
RNA_def_property(ot->srna, "cap_end",PROP_INT, PROP_NONE);
prop= RNA_def_property(ot->srna, "Vertices", PROP_INT, PROP_NONE);
RNA_def_property_int_default(prop, 32);
prop= RNA_def_property(ot->srna, "Radius", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_default(prop, 1.0f);
prop= RNA_def_property(ot->srna, "Depth", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_default(prop, 1.0f);
prop= RNA_def_property(ot->srna, "Cap_end", PROP_INT, PROP_NONE);
RNA_def_property_int_default(prop, 1);
}
static int add_primitive_grid_exec(bContext *C, wmOperator *op)
@@ -1641,11 +1663,10 @@ static int add_primitive_grid_exec(bContext *C, wmOperator *op)
float dia, mat[4][4];
dia= new_primitive_matrix(C, mat);
dia*= RNA_float_get(op->ptr, "Size");
/* plane (diameter of 1.41 makes it unit size) */
dia*= sqrt(2.0f);
make_prim(obedit, PRIM_GRID, mat, 10, 10, 0, dia, 0.0f, 0, 1);
make_prim(obedit, PRIM_GRID, mat, RNA_int_get(op->ptr, "X_Subdiv"),
RNA_int_get(op->ptr, "Y_Subdiv"), 0, dia, 0.0f, 0, 1);
ED_undo_push(C, "Add Grid"); // Note this will become depricated
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
@@ -1655,6 +1676,8 @@ static int add_primitive_grid_exec(bContext *C, wmOperator *op)
void MESH_OT_add_primitive_grid(wmOperatorType *ot)
{
PropertyRNA *prop;
/* identifiers */
ot->name= "Add Grid";
ot->idname= "MESH_OT_add_primitive_grid";
@@ -1662,16 +1685,27 @@ void MESH_OT_add_primitive_grid(wmOperatorType *ot)
/* api callbacks */
ot->exec= add_primitive_grid_exec;
ot->poll= ED_operator_editmesh;
/* flags */
ot->flag= OPTYPE_REGISTER;
/* props */
prop= RNA_def_property(ot->srna, "X_Subdiv", PROP_INT, PROP_NONE);
RNA_def_property_int_default(prop, 10);
prop= RNA_def_property(ot->srna, "Y_Subdiv", PROP_INT, PROP_NONE);
RNA_def_property_int_default(prop, 10);
prop= RNA_def_property(ot->srna, "Size", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_default(prop, 1.0f);
}
static int add_primitive_monkey_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
float dia, mat[4][4];
float mat[4][4];
dia= new_primitive_matrix(C, mat);
new_primitive_matrix(C, mat);
make_prim(obedit, PRIM_MONKEY, mat, 32, 32, 2, dia, 0.0f, 0, 0);
make_prim(obedit, PRIM_MONKEY, mat, 0, 0, 2, 0.0f, 0.0f, 0, 0);
ED_undo_push(C, "Add Monkey"); // Note this will become depricated
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
@@ -1688,4 +1722,87 @@ void MESH_OT_add_primitive_monkey(wmOperatorType *ot)
/* api callbacks */
ot->exec= add_primitive_monkey_exec;
ot->poll= ED_operator_editmesh;
/* flags */
ot->flag= OPTYPE_REGISTER;
}
static int add_primitive_uvsphere_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
float dia, mat[4][4];
dia= new_primitive_matrix(C, mat);
dia*= RNA_float_get(op->ptr, "Size");
make_prim(obedit, PRIM_UVSPHERE, mat, RNA_int_get(op->ptr, "Rings"),
RNA_int_get(op->ptr, "Segments"), 0, dia, 0.0f, 0, 0);
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
return OPERATOR_FINISHED;
}
void MESH_OT_add_primitive_uv_sphere(wmOperatorType *ot)
{
PropertyRNA *prop;
/* identifiers */
ot->name= "Add UV Sphere";
ot->idname= "MESH_OT_add_primitive_uv_sphere";
/* api callbacks */
ot->exec= add_primitive_uvsphere_exec;
ot->poll= ED_operator_editmesh;
/* flags */
ot->flag= OPTYPE_REGISTER;
/* props */
prop= RNA_def_property(ot->srna, "Segments", PROP_INT, PROP_NONE);
RNA_def_property_int_default(prop, 32);
prop= RNA_def_property(ot->srna, "Rings", PROP_INT, PROP_NONE);
RNA_def_property_int_default(prop, 24);
prop= RNA_def_property(ot->srna, "Size", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_default(prop, 1.0f);
}
static int add_primitive_icosphere_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
float dia, mat[4][4];
dia= new_primitive_matrix(C, mat);
dia*= RNA_float_get(op->ptr, "Size");
make_prim(obedit, PRIM_ICOSPHERE, mat, 0, 0,
RNA_int_get(op->ptr, "Subdivision"), dia, 0.0f, 0, 0);
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
return OPERATOR_FINISHED;
}
void MESH_OT_add_primitive_ico_sphere(wmOperatorType *ot)
{
PropertyRNA *prop;
/* identifiers */
ot->name= "Add Ico Sphere";
ot->idname= "MESH_OT_add_primitive_ico_sphere";
/* api callbacks */
ot->exec= add_primitive_icosphere_exec;
ot->poll= ED_operator_editmesh;
/* flags */
ot->flag= OPTYPE_REGISTER;
/* props */
prop= RNA_def_property(ot->srna, "Subdivision", PROP_INT, PROP_NONE);
RNA_def_property_int_default(prop, 2);
RNA_def_property_range(prop, 0.0, 6.0);
prop= RNA_def_property(ot->srna, "Size", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_default(prop, 1.0f);
}

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

@@ -102,7 +102,8 @@ void MESH_OT_add_primitive_tube(struct wmOperatorType *ot);
void MESH_OT_add_primitive_cone(struct wmOperatorType *ot);
void MESH_OT_add_primitive_grid(struct wmOperatorType *ot);
void MESH_OT_add_primitive_monkey(struct wmOperatorType *ot);
void MESH_OT_add_primitive_uv_sphere(struct wmOperatorType *ot);
void MESH_OT_add_primitive_ico_sphere(struct wmOperatorType *ot);
/* ******************* editmesh_lib.c */
void EM_stats_update(EditMesh *em);

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

@@ -84,14 +84,14 @@ void ED_operatortypes_mesh(void)
WM_operatortype_append(MESH_OT_add_primitive_cone);
WM_operatortype_append(MESH_OT_add_primitive_grid);
WM_operatortype_append(MESH_OT_add_primitive_monkey);
WM_operatortype_append(MESH_OT_add_primitive_uv_sphere);
WM_operatortype_append(MESH_OT_add_primitive_ico_sphere);
}
/* note mesh keymap also for other space? */
void ED_keymap_mesh(wmWindowManager *wm)
{
wmKeymapItem *circle,*cylinder,*tube, *cone;
{
ListBase *keymap= WM_keymap_listbase(wm, "EditMesh", 0, 0);
/* selecting */
@@ -117,30 +117,13 @@ void ED_keymap_mesh(wmWindowManager *wm)
/* add */
WM_keymap_add_item(keymap, "MESH_OT_add_primitive_plane", ZEROKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "MESH_OT_add_primitive_cube", ONEKEY, KM_PRESS, KM_CTRL, 0);
circle = WM_keymap_add_item(keymap, "MESH_OT_add_primitive_circle", TWOKEY, KM_PRESS, KM_CTRL, 0);
RNA_int_set(circle->ptr,"vertices",32);
RNA_boolean_set(circle->ptr,"fill",1);
RNA_float_set(circle->ptr,"radius",2);
cylinder = WM_keymap_add_item(keymap, "MESH_OT_add_primitive_cylinder", THREEKEY, KM_PRESS, KM_CTRL, 0);
RNA_int_set(cylinder->ptr,"vertices",32);
RNA_float_set(cylinder->ptr,"radius",2);
RNA_float_set(cylinder->ptr,"depth",3);
tube = WM_keymap_add_item(keymap, "MESH_OT_add_primitive_tube", FOURKEY, KM_PRESS, KM_CTRL, 0);
RNA_int_set(tube->ptr,"vertices",32);
RNA_float_set(tube->ptr,"radius",2);
RNA_float_set(tube->ptr,"depth",3);
cone = WM_keymap_add_item(keymap, "MESH_OT_add_primitive_cone", FIVEKEY, KM_PRESS, KM_CTRL, 0);
RNA_int_set(cone->ptr,"vertices",32);
RNA_float_set(cone->ptr,"radius",2);
RNA_float_set(cone->ptr,"depth",-3);
RNA_float_set(cone->ptr,"cap_end",0);
WM_keymap_add_item(keymap, "MESH_OT_add_primitive_grid", NINEKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "MESH_OT_add_primitive_monkey", SIXKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "MESH_OT_add_primitive_circle", TWOKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "MESH_OT_add_primitive_cylinder", THREEKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "MESH_OT_add_primitive_tube", FOURKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "MESH_OT_add_primitive_cone", FIVEKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "MESH_OT_add_primitive_grid", SIXKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "MESH_OT_add_primitive_uv_sphere", SEVENKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "MESH_OT_add_primitive_ico_sphere", EIGHTKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "MESH_OT_add_primitive_monkey", NINEKEY, KM_PRESS, KM_CTRL, 0);
}

1
source/blender/editors/object/object_edit.c
View File

@@ -3053,7 +3053,6 @@ void OBJECT_OT_toggle_editmode(wmOperatorType *ot)
ot->exec= toggle_editmode_exec;
ot->poll= ED_operator_object_active;
ot->flag= OPTYPE_REGISTER;
}
/* *************************** */

76
source/blender/editors/screen/screen_ops.c
View File

@@ -53,6 +53,8 @@
#include "RNA_access.h"
#include "RNA_define.h"
#include "UI_interface.h"
#include "screen_intern.h" /* own module include */
/* ************** Exported Poll tests ********************** */
@@ -1331,8 +1333,10 @@ static int repeat_last_exec(bContext *C, wmOperator *op)
wmOperator *lastop= CTX_wm_manager(C)->operators.last;
if(lastop) {
printf("repeat %s\n", lastop->type->idname);
lastop->type->exec(C, lastop);
if(lastop->type->poll==NULL || lastop->type->poll(C)) {
printf("repeat %s\n", lastop->type->idname);
lastop->type->exec(C, lastop);
}
}
return OPERATOR_FINISHED;
@@ -1345,13 +1349,71 @@ void SCREEN_OT_repeat_last(wmOperatorType *ot)
ot->idname= "SCREEN_OT_repeat_last";
/* api callbacks */
ot->invoke= WM_operator_confirm;
ot->exec= repeat_last_exec;
ot->poll= ED_operator_screenactive;
}
static int repeat_history_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
wmWindowManager *wm= CTX_wm_manager(C);
wmOperator *lastop;
int items, i;
char *menu, *p;
items= BLI_countlist(&wm->operators);
if(items==0)
return OPERATOR_CANCELLED;
menu= MEM_callocN(items * OP_MAX_TYPENAME, "string");
p= menu + sprintf(menu, "%s %%t", op->type->name);
for (i=items-1, lastop= wm->operators.last; lastop; lastop= lastop->prev, i--)
p+= sprintf(p, "|%s %%x%d", lastop->type->name, i);
uiPupmenuOperator(C, i/20, op, "index", menu);
MEM_freeN(menu);
return OPERATOR_RUNNING_MODAL;
}
static int repeat_history_exec(bContext *C, wmOperator *op)
{
wmWindowManager *wm= CTX_wm_manager(C);
op= BLI_findlink(&wm->operators, RNA_int_get(op->ptr, "index"));
if(op) {
/* let's put it as last operator in list */
BLI_remlink(&wm->operators, op);
BLI_addtail(&wm->operators, op);
if(op->type->poll==NULL || op->type->poll(C)) {
printf("repeat %s\n", op->type->idname);
op->type->exec(C, op);
}
}
return OPERATOR_FINISHED;
}
void SCREEN_OT_repeat_history(wmOperatorType *ot)
{
PropertyRNA *prop;
/* identifiers */
ot->name= "Repeat History";
ot->idname= "SCREEN_OT_repeat_history";
/* api callbacks */
ot->invoke= repeat_history_invoke;
ot->exec= repeat_history_exec;
ot->poll= ED_operator_screenactive;
prop= RNA_def_property(ot->srna, "index", PROP_ENUM, PROP_NONE);
}
/* ************** region split operator ***************************** */
/* insert a region in the area region list */
@@ -1534,6 +1596,7 @@ void ED_operatortypes_screen(void)
/* generic UI stuff */
WM_operatortype_append(SCREEN_OT_actionzone);
WM_operatortype_append(SCREEN_OT_repeat_last);
WM_operatortype_append(SCREEN_OT_repeat_history);
/* screen tools */
WM_operatortype_append(SCREEN_OT_area_move);
@@ -1564,8 +1627,8 @@ void ED_keymap_screen(wmWindowManager *wm)
WM_keymap_verify_item(keymap, "SCREEN_OT_actionzone", LEFTMOUSE, KM_PRESS, 0, 0);
WM_keymap_verify_item(keymap, "SCREEN_OT_area_move", LEFTMOUSE, KM_PRESS, 0, 0);
WM_keymap_verify_item(keymap, "SCREEN_OT_area_split", EVT_ACTIONZONE, 0, 0, 0); /* action tria */
WM_keymap_verify_item(keymap, "SCREEN_OT_area_join", EVT_ACTIONZONE, 0, 0, 0); /* action tria */
WM_keymap_verify_item(keymap, "SCREEN_OT_area_split", EVT_ACTIONZONE, 0, 0, 0);
WM_keymap_verify_item(keymap, "SCREEN_OT_area_join", EVT_ACTIONZONE, 0, 0, 0);
WM_keymap_verify_item(keymap, "SCREEN_OT_area_rip", RKEY, KM_PRESS, KM_CTRL|KM_ALT, 0);
RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_screen_set", RIGHTARROWKEY, KM_PRESS, KM_CTRL, 0)->ptr, "delta", 1);
RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_screen_set", LEFTARROWKEY, KM_PRESS, KM_CTRL, 0)->ptr, "delta", -1);
@@ -1584,8 +1647,9 @@ void ED_keymap_screen(wmWindowManager *wm)
RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_offset", LEFTARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", -1);
RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_offset", RIGHTARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", 1);
WM_keymap_add_item(keymap, "SCREEN_OT_region_flip", F5KEY, KM_PRESS, 0, 0);
WM_keymap_verify_item(keymap, "SCREEN_OT_repeat_history", F3KEY, KM_PRESS, 0, 0);
WM_keymap_verify_item(keymap, "SCREEN_OT_repeat_last", F4KEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "SCREEN_OT_region_flip", F5KEY, KM_PRESS, 0, 0);
/* undo */
WM_keymap_add_item(keymap, "ED_OT_undo", ZKEY, KM_PRESS, KM_CTRL, 0);