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

spin mesh is alt Rkey - ton, please check and advise regarding screw_mesh and defaults. F3 fails while pressed continuously

Browse Source
This commit is contained in:
Shaul Kedem
2009-02-16 20:04:01 +00:00
parent 2415040b9f
commit 312c822945
3 changed files with 56 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
source/blender/editors/mesh/editmesh_tools.c
View File

@@ -819,10 +819,18 @@ void MESH_OT_extrude_repeat(wmOperatorType *ot)
RNA_def_int(ot->srna, "steps", 10, 0, 180, "Steps", "", 0, INT_MAX);
}
void spin_mesh(View3D *v3d, Object *obedit, EditMesh *em, wmOperator *op, int steps, float degr, float *dvec, int mode)
void spin_mesh(bContext *C, wmOperator *op,float *dvec )
{
Scene *scene= NULL; // XXX from context!
RegionView3D *rv3d= NULL; // XXX from context
Object *obedit= CTX_data_edit_object(C);
View3D *v3d = CTX_wm_view3d(C);
Scene *scene = CTX_data_scene(C);
EditMesh *em= ((Mesh *)obedit->data)->edit_mesh;
int steps = RNA_int_get(op->ptr,"steps");
float degr = RNA_float_get(op->ptr,"degrees");
int mode = RNA_int_get(op->ptr,"steps");
RegionView3D *rv3d= CTX_wm_region_view3d(C);
EditVert *eve,*nextve;
float nor[3]= {0.0, 0.0, 0.0};
float *curs, si,n[3],q[4],cmat[3][3],imat[3][3], tmat[3][3];
@@ -834,7 +842,7 @@ void spin_mesh(View3D *v3d, Object *obedit, EditMesh *em, wmOperator *op, int st
Mat3CpyMat4(bmat, obedit->obmat);
Mat3Inv(imat,bmat);
curs= give_cursor(NULL, v3d); // XXX
curs= give_cursor(scene, v3d);
VECCOPY(cent, curs);
cent[0]-= obedit->obmat[3][0];
cent[1]-= obedit->obmat[3][1];
@@ -903,9 +911,44 @@ void spin_mesh(View3D *v3d, Object *obedit, EditMesh *em, wmOperator *op, int st
}
void screw_mesh(Object *obedit, EditMesh *em, wmOperator *op, int steps, int turns)
static int spin_mesh_exec(bContext *C, wmOperator *op)
{
View3D *v3d= NULL; // XXX
Object *obedit= CTX_data_edit_object(C);
spin_mesh(C, op,NULL);
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
return OPERATOR_FINISHED;
}
void MESH_OT_spin(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Spin";
ot->idname= "MESH_OT_spin";
/* api callbacks */
ot->exec= spin_mesh_exec;
ot->poll= ED_operator_editmesh;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/*props */
//int steps, float degr, float *dvec, int mode
RNA_def_int(ot->srna, "steps", 5, 0, INT_MAX, "Steps", "Steps", 0, INT_MAX);
RNA_def_int(ot->srna, "mode", 5, 0, INT_MAX, "Mode", "Mode", 0, INT_MAX);
RNA_def_float(ot->srna, "degrees", 5.0f, 0.0f, FLT_MAX, "Degrees", "Degrees", 0.0f, FLT_MAX);
//RNA_def_enum(ot->srna, "type", prop_mesh_delete_types, 10, "Type", "Method used for deleting mesh data");
}
void screw_mesh(bContext *C, wmOperator *op, int steps, int turns)
{
Object *obedit= CTX_data_edit_object(C);
EditMesh *em= ((Mesh *)obedit->data)->edit_mesh;
EditVert *eve,*v1=0,*v2=0;
EditEdge *eed;
float dvec[3], nor[3];
@@ -959,7 +1002,8 @@ void screw_mesh(Object *obedit, EditMesh *em, wmOperator *op, int steps, int tur
dvec[2]= -dvec[2];
}
spin_mesh(v3d, obedit, em, op, turns*steps, turns*360, dvec, 0);
//TODO : set : turns*steps, turns*360,0
spin_mesh(C, op, dvec);
}

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

@@ -208,6 +208,7 @@ void MESH_OT_subdivide_multi_fractal(struct wmOperatorType *ot);
void MESH_OT_subdivide_smooth(struct wmOperatorType *ot);
void MESH_OT_removedoublesflag(struct wmOperatorType *ot);
void MESH_OT_extrude(struct wmOperatorType *ot);
void MESH_OT_spin(struct wmOperatorType *ot);
void MESH_OT_fill(struct wmOperatorType *ot);
void MESH_OT_beauty_fill(struct wmOperatorType *ot);

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

@@ -140,6 +140,8 @@ void ED_operatortypes_mesh(void)
WM_operatortype_append(MESH_OT_add_duplicate);
WM_operatortype_append(MESH_OT_removedoublesflag);
WM_operatortype_append(MESH_OT_extrude);
WM_operatortype_append(MESH_OT_spin);
WM_operatortype_append(MESH_OT_vertices_to_sphere);
WM_operatortype_append(MESH_OT_split_mesh);
WM_operatortype_append(MESH_OT_extrude_repeat);
@@ -249,6 +251,8 @@ void ED_keymap_mesh(wmWindowManager *wm)
WM_keymap_add_item(keymap, "MESH_OT_removedoublesflag", VKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "MESH_OT_extrude", EKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "MESH_OT_spin", RKEY, KM_PRESS, KM_ALT, 0);
WM_keymap_add_item(keymap, "VIEW3D_OT_editmesh_face_toolbox", FKEY, KM_PRESS, KM_CTRL, 0); /* operators below are in this toolbox */
WM_keymap_add_item(keymap, "MESH_OT_fill", FKEY, KM_PRESS, KM_SHIFT, 0);
WM_keymap_add_item(keymap, "MESH_OT_beauty_fill", FKEY, KM_PRESS, KM_ALT, 0);