From 5ebebcfbfff4c218ab4101ee7f6a66617ee9b01f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 14 Jul 2018 23:49:00 +0200 Subject: WM: rename manipulator to gizmo internally --- .../blender/editors/mesh/editmesh_extrude_spin.c | 208 ++++++++++----------- 1 file changed, 104 insertions(+), 104 deletions(-) (limited to 'source/blender/editors/mesh/editmesh_extrude_spin.c') diff --git a/source/blender/editors/mesh/editmesh_extrude_spin.c b/source/blender/editors/mesh/editmesh_extrude_spin.c index 74e2833b2d9..3864bd63036 100644 --- a/source/blender/editors/mesh/editmesh_extrude_spin.c +++ b/source/blender/editors/mesh/editmesh_extrude_spin.c @@ -54,27 +54,27 @@ #include "mesh_intern.h" /* own include */ -#define USE_MANIPULATOR +#define USE_GIZMO -#ifdef USE_MANIPULATOR +#ifdef USE_GIZMO #include "ED_gizmo_library.h" #include "ED_undo.h" #endif /* -------------------------------------------------------------------- */ -/** \name Spin Manipulator +/** \name Spin Gizmo * \{ */ -#ifdef USE_MANIPULATOR -typedef struct ManipulatorSpinGroup { +#ifdef USE_GIZMO +typedef struct GizmoSpinGroup { /* Arrow to change plane depth. */ - struct wmManipulator *translate_z; + struct wmGizmo *translate_z; /* Translate XYZ */ - struct wmManipulator *translate_c; - /* For grabbing the manipulator and moving freely. */ - struct wmManipulator *rotate_c; + struct wmGizmo *translate_c; + /* For grabbing the gizmo and moving freely. */ + struct wmGizmo *rotate_c; /* Spin angle */ - struct wmManipulator *angle_z; + struct wmGizmo *angle_z; /* We could store more vars here! */ struct { @@ -87,14 +87,14 @@ typedef struct ManipulatorSpinGroup { float rotate_axis[3]; float rotate_up[3]; } data; -} ManipulatorSpinGroup; +} GizmoSpinGroup; /** * XXX. calling redo from property updates is not great. * This is needed because changing the RNA doesn't cause a redo * and we're not using operator UI which does just this. */ -static void manipulator_spin_exec(ManipulatorSpinGroup *man) +static void gizmo_spin_exec(GizmoSpinGroup *man) { wmOperator *op = man->data.op; if (op == WM_operator_last_redo((bContext *)man->data.context)) { @@ -102,7 +102,7 @@ static void manipulator_spin_exec(ManipulatorSpinGroup *man) } } -static void manipulator_mesh_spin_update_from_op(ManipulatorSpinGroup *man) +static void gizmo_mesh_spin_update_from_op(GizmoSpinGroup *man) { wmOperator *op = man->data.op; @@ -111,15 +111,15 @@ static void manipulator_mesh_spin_update_from_op(ManipulatorSpinGroup *man) RNA_property_float_get_array(op->ptr, man->data.prop_axis_co, plane_co); RNA_property_float_get_array(op->ptr, man->data.prop_axis_no, plane_no); - WM_manipulator_set_matrix_location(man->translate_z, plane_co); - WM_manipulator_set_matrix_location(man->rotate_c, plane_co); - WM_manipulator_set_matrix_location(man->angle_z, plane_co); + WM_gizmo_set_matrix_location(man->translate_z, plane_co); + WM_gizmo_set_matrix_location(man->rotate_c, plane_co); + WM_gizmo_set_matrix_location(man->angle_z, plane_co); /* translate_c location comes from the property. */ - WM_manipulator_set_matrix_rotation_from_z_axis(man->translate_z, plane_no); - WM_manipulator_set_matrix_rotation_from_z_axis(man->angle_z, plane_no); + WM_gizmo_set_matrix_rotation_from_z_axis(man->translate_z, plane_no); + WM_gizmo_set_matrix_rotation_from_z_axis(man->angle_z, plane_no); - WM_manipulator_set_scale(man->translate_c, 0.2); + WM_gizmo_set_scale(man->translate_c, 0.2); RegionView3D *rv3d = ED_view3d_context_rv3d(man->data.context); if (rv3d) { @@ -130,23 +130,23 @@ static void manipulator_mesh_spin_update_from_op(ManipulatorSpinGroup *man) project_plane_normalized_v3_v3v3(man->data.rotate_up, man->data.rotate_up, man->data.rotate_axis); normalize_v3(man->data.rotate_up); - WM_manipulator_set_matrix_rotation_from_z_axis(man->translate_c, plane_no); - WM_manipulator_set_matrix_rotation_from_yz_axis(man->rotate_c, plane_no, man->data.rotate_axis); + WM_gizmo_set_matrix_rotation_from_z_axis(man->translate_c, plane_no); + WM_gizmo_set_matrix_rotation_from_yz_axis(man->rotate_c, plane_no, man->data.rotate_axis); /* show the axis instead of mouse cursor */ RNA_enum_set(man->rotate_c->ptr, "draw_options", - ED_MANIPULATOR_DIAL_DRAW_FLAG_ANGLE_MIRROR | - ED_MANIPULATOR_DIAL_DRAW_FLAG_ANGLE_START_Y); + ED_GIZMO_DIAL_DRAW_FLAG_ANGLE_MIRROR | + ED_GIZMO_DIAL_DRAW_FLAG_ANGLE_START_Y); } } /* depth callbacks */ -static void manipulator_spin_prop_depth_get( - const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, +static void gizmo_spin_prop_depth_get( + const wmGizmo *mpr, wmGizmoProperty *mpr_prop, void *value_p) { - ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata; + GizmoSpinGroup *man = mpr->parent_mgroup->customdata; wmOperator *op = man->data.op; float *value = value_p; @@ -160,11 +160,11 @@ static void manipulator_spin_prop_depth_get( value[0] = dot_v3v3(plane_no, plane_co) - dot_v3v3(plane_no, mpr->matrix_basis[3]); } -static void manipulator_spin_prop_depth_set( - const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, +static void gizmo_spin_prop_depth_set( + const wmGizmo *mpr, wmGizmoProperty *mpr_prop, const void *value_p) { - ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata; + GizmoSpinGroup *man = mpr->parent_mgroup->customdata; wmOperator *op = man->data.op; const float *value = value_p; @@ -183,15 +183,15 @@ static void manipulator_spin_prop_depth_set( RNA_property_float_set_array(op->ptr, man->data.prop_axis_co, plane_co); - manipulator_spin_exec(man); + gizmo_spin_exec(man); } /* translate callbacks */ -static void manipulator_spin_prop_translate_get( - const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, +static void gizmo_spin_prop_translate_get( + const wmGizmo *mpr, wmGizmoProperty *mpr_prop, void *value_p) { - ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata; + GizmoSpinGroup *man = mpr->parent_mgroup->customdata; wmOperator *op = man->data.op; float *value = value_p; @@ -201,11 +201,11 @@ static void manipulator_spin_prop_translate_get( RNA_property_float_get_array(op->ptr, man->data.prop_axis_co, value); } -static void manipulator_spin_prop_translate_set( - const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, +static void gizmo_spin_prop_translate_set( + const wmGizmo *mpr, wmGizmoProperty *mpr_prop, const void *value) { - ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata; + GizmoSpinGroup *man = mpr->parent_mgroup->customdata; wmOperator *op = man->data.op; BLI_assert(mpr_prop->type->array_length == 3); @@ -213,15 +213,15 @@ static void manipulator_spin_prop_translate_set( RNA_property_float_set_array(op->ptr, man->data.prop_axis_co, value); - manipulator_spin_exec(man); + gizmo_spin_exec(man); } /* angle callbacks */ -static void manipulator_spin_prop_axis_angle_get( - const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, +static void gizmo_spin_prop_axis_angle_get( + const wmGizmo *mpr, wmGizmoProperty *mpr_prop, void *value_p) { - ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata; + GizmoSpinGroup *man = mpr->parent_mgroup->customdata; wmOperator *op = man->data.op; float *value = value_p; @@ -244,11 +244,11 @@ static void manipulator_spin_prop_axis_angle_get( } } -static void manipulator_spin_prop_axis_angle_set( - const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, +static void gizmo_spin_prop_axis_angle_set( + const wmGizmo *mpr, wmGizmoProperty *mpr_prop, const void *value_p) { - ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata; + GizmoSpinGroup *man = mpr->parent_mgroup->customdata; wmOperator *op = man->data.op; const float *value = value_p; @@ -273,17 +273,17 @@ static void manipulator_spin_prop_axis_angle_set( /* re-normalize - seems acceptable */ RNA_property_float_set_array(op->ptr, man->data.prop_axis_no, plane_no); - manipulator_spin_exec(man); + gizmo_spin_exec(man); } } } /* angle callbacks */ -static void manipulator_spin_prop_angle_get( - const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, +static void gizmo_spin_prop_angle_get( + const wmGizmo *mpr, wmGizmoProperty *mpr_prop, void *value_p) { - ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata; + GizmoSpinGroup *man = mpr->parent_mgroup->customdata; wmOperator *op = man->data.op; float *value = value_p; @@ -292,31 +292,31 @@ static void manipulator_spin_prop_angle_get( value[0] = RNA_property_float_get(op->ptr, man->data.prop_angle); } -static void manipulator_spin_prop_angle_set( - const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, +static void gizmo_spin_prop_angle_set( + const wmGizmo *mpr, wmGizmoProperty *mpr_prop, const void *value_p) { - ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata; + GizmoSpinGroup *man = mpr->parent_mgroup->customdata; wmOperator *op = man->data.op; BLI_assert(mpr_prop->type->array_length == 1); UNUSED_VARS_NDEBUG(mpr_prop); const float *value = value_p; RNA_property_float_set(op->ptr, man->data.prop_angle, value[0]); - manipulator_spin_exec(man); + gizmo_spin_exec(man); } -static bool manipulator_mesh_spin_poll(const bContext *C, wmManipulatorGroupType *wgt) +static bool gizmo_mesh_spin_poll(const bContext *C, wmGizmoGroupType *wgt) { wmOperator *op = WM_operator_last_redo(C); if (op == NULL || !STREQ(op->type->idname, "MESH_OT_spin")) { - WM_manipulator_group_type_unlink_delayed_ptr(wgt); + WM_gizmo_group_type_unlink_delayed_ptr(wgt); return false; } return true; } -static void manipulator_mesh_spin_setup(const bContext *C, wmManipulatorGroup *mgroup) +static void gizmo_mesh_spin_setup(const bContext *C, wmGizmoGroup *mgroup) { wmOperator *op = WM_operator_last_redo(C); @@ -324,32 +324,32 @@ static void manipulator_mesh_spin_setup(const bContext *C, wmManipulatorGroup *m return; } - struct ManipulatorSpinGroup *man = MEM_callocN(sizeof(ManipulatorSpinGroup), __func__); + struct GizmoSpinGroup *man = MEM_callocN(sizeof(GizmoSpinGroup), __func__); mgroup->customdata = man; - const wmManipulatorType *wt_arrow = WM_manipulatortype_find("MANIPULATOR_WT_arrow_3d", true); - const wmManipulatorType *wt_grab = WM_manipulatortype_find("MANIPULATOR_WT_grab_3d", true); - const wmManipulatorType *wt_dial = WM_manipulatortype_find("MANIPULATOR_WT_dial_3d", true); + const wmGizmoType *wt_arrow = WM_gizmotype_find("GIZMO_WT_arrow_3d", true); + const wmGizmoType *wt_grab = WM_gizmotype_find("GIZMO_WT_grab_3d", true); + const wmGizmoType *wt_dial = WM_gizmotype_find("GIZMO_WT_dial_3d", true); - man->translate_z = WM_manipulator_new_ptr(wt_arrow, mgroup, NULL); - man->translate_c = WM_manipulator_new_ptr(wt_grab, mgroup, NULL); - man->rotate_c = WM_manipulator_new_ptr(wt_dial, mgroup, NULL); - man->angle_z = WM_manipulator_new_ptr(wt_dial, mgroup, NULL); + man->translate_z = WM_gizmo_new_ptr(wt_arrow, mgroup, NULL); + man->translate_c = WM_gizmo_new_ptr(wt_grab, mgroup, NULL); + man->rotate_c = WM_gizmo_new_ptr(wt_dial, mgroup, NULL); + man->angle_z = WM_gizmo_new_ptr(wt_dial, mgroup, NULL); - UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, man->translate_z->color); - UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, man->translate_c->color); - UI_GetThemeColor3fv(TH_MANIPULATOR_SECONDARY, man->rotate_c->color); + UI_GetThemeColor3fv(TH_GIZMO_PRIMARY, man->translate_z->color); + UI_GetThemeColor3fv(TH_GIZMO_PRIMARY, man->translate_c->color); + UI_GetThemeColor3fv(TH_GIZMO_SECONDARY, man->rotate_c->color); UI_GetThemeColor3fv(TH_AXIS_Z, man->angle_z->color); - RNA_enum_set(man->translate_z->ptr, "draw_style", ED_MANIPULATOR_ARROW_STYLE_NORMAL); - RNA_enum_set(man->translate_c->ptr, "draw_style", ED_MANIPULATOR_GRAB_STYLE_RING_2D); + RNA_enum_set(man->translate_z->ptr, "draw_style", ED_GIZMO_ARROW_STYLE_NORMAL); + RNA_enum_set(man->translate_c->ptr, "draw_style", ED_GIZMO_GRAB_STYLE_RING_2D); - WM_manipulator_set_flag(man->translate_c, WM_MANIPULATOR_DRAW_VALUE, true); - WM_manipulator_set_flag(man->rotate_c, WM_MANIPULATOR_DRAW_VALUE, true); - WM_manipulator_set_flag(man->angle_z, WM_MANIPULATOR_DRAW_VALUE, true); + WM_gizmo_set_flag(man->translate_c, WM_GIZMO_DRAW_VALUE, true); + WM_gizmo_set_flag(man->rotate_c, WM_GIZMO_DRAW_VALUE, true); + WM_gizmo_set_flag(man->angle_z, WM_GIZMO_DRAW_VALUE, true); - WM_manipulator_set_scale(man->angle_z, 0.5f); + WM_gizmo_set_scale(man->angle_z, 0.5f); { man->data.context = (bContext *)C; @@ -359,42 +359,42 @@ static void manipulator_mesh_spin_setup(const bContext *C, wmManipulatorGroup *m man->data.prop_angle = RNA_struct_find_property(op->ptr, "angle"); } - manipulator_mesh_spin_update_from_op(man); + gizmo_mesh_spin_update_from_op(man); /* Setup property callbacks */ { - WM_manipulator_target_property_def_func( + WM_gizmo_target_property_def_func( man->translate_z, "offset", - &(const struct wmManipulatorPropertyFnParams) { - .value_get_fn = manipulator_spin_prop_depth_get, - .value_set_fn = manipulator_spin_prop_depth_set, + &(const struct wmGizmoPropertyFnParams) { + .value_get_fn = gizmo_spin_prop_depth_get, + .value_set_fn = gizmo_spin_prop_depth_set, .range_get_fn = NULL, .user_data = NULL, }); - WM_manipulator_target_property_def_func( + WM_gizmo_target_property_def_func( man->translate_c, "offset", - &(const struct wmManipulatorPropertyFnParams) { - .value_get_fn = manipulator_spin_prop_translate_get, - .value_set_fn = manipulator_spin_prop_translate_set, + &(const struct wmGizmoPropertyFnParams) { + .value_get_fn = gizmo_spin_prop_translate_get, + .value_set_fn = gizmo_spin_prop_translate_set, .range_get_fn = NULL, .user_data = NULL, }); - WM_manipulator_target_property_def_func( + WM_gizmo_target_property_def_func( man->rotate_c, "offset", - &(const struct wmManipulatorPropertyFnParams) { - .value_get_fn = manipulator_spin_prop_axis_angle_get, - .value_set_fn = manipulator_spin_prop_axis_angle_set, + &(const struct wmGizmoPropertyFnParams) { + .value_get_fn = gizmo_spin_prop_axis_angle_get, + .value_set_fn = gizmo_spin_prop_axis_angle_set, .range_get_fn = NULL, .user_data = NULL, }); - WM_manipulator_target_property_def_func( + WM_gizmo_target_property_def_func( man->angle_z, "offset", - &(const struct wmManipulatorPropertyFnParams) { - .value_get_fn = manipulator_spin_prop_angle_get, - .value_set_fn = manipulator_spin_prop_angle_set, + &(const struct wmGizmoPropertyFnParams) { + .value_get_fn = gizmo_spin_prop_angle_get, + .value_set_fn = gizmo_spin_prop_angle_set, .range_get_fn = NULL, .user_data = NULL, }); @@ -402,34 +402,34 @@ static void manipulator_mesh_spin_setup(const bContext *C, wmManipulatorGroup *m } } -static void manipulator_mesh_spin_draw_prepare( - const bContext *UNUSED(C), wmManipulatorGroup *mgroup) +static void gizmo_mesh_spin_draw_prepare( + const bContext *UNUSED(C), wmGizmoGroup *mgroup) { - ManipulatorSpinGroup *man = mgroup->customdata; + GizmoSpinGroup *man = mgroup->customdata; if (man->data.op->next) { man->data.op = WM_operator_last_redo((bContext *)man->data.context); } - manipulator_mesh_spin_update_from_op(man); + gizmo_mesh_spin_update_from_op(man); } -static void MESH_WGT_spin(struct wmManipulatorGroupType *wgt) +static void MESH_WGT_spin(struct wmGizmoGroupType *wgt) { wgt->name = "Mesh Spin"; wgt->idname = "MESH_WGT_spin"; - wgt->flag = WM_MANIPULATORGROUPTYPE_3D; + wgt->flag = WM_GIZMOGROUPTYPE_3D; wgt->mmap_params.spaceid = SPACE_VIEW3D; wgt->mmap_params.regionid = RGN_TYPE_WINDOW; - wgt->poll = manipulator_mesh_spin_poll; - wgt->setup = manipulator_mesh_spin_setup; - wgt->draw_prepare = manipulator_mesh_spin_draw_prepare; + wgt->poll = gizmo_mesh_spin_poll; + wgt->setup = gizmo_mesh_spin_setup; + wgt->draw_prepare = gizmo_mesh_spin_draw_prepare; } /** \} */ -#endif /* USE_MANIPULATOR */ +#endif /* USE_GIZMO */ /* -------------------------------------------------------------------- */ /** \name Spin Operator @@ -508,11 +508,11 @@ static int edbm_spin_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(e int ret = edbm_spin_exec(C, op); -#ifdef USE_MANIPULATOR +#ifdef USE_GIZMO if (ret & OPERATOR_FINISHED) { - /* Setup manipulators */ - if (v3d && ((v3d->mpr_flag & V3D_MANIPULATOR_HIDE) == 0)) { - WM_manipulator_group_type_ensure("MESH_WGT_spin"); + /* Setup gizmos */ + if (v3d && ((v3d->mpr_flag & V3D_GIZMO_HIDE) == 0)) { + WM_gizmo_group_type_ensure("MESH_WGT_spin"); } } #endif @@ -548,7 +548,7 @@ void MESH_OT_spin(wmOperatorType *ot) "Center", "Center in global view space", -1e4f, 1e4f); RNA_def_float_vector(ot->srna, "axis", 3, NULL, -1.0f, 1.0f, "Axis", "Axis in global view space", -1.0f, 1.0f); -#ifdef USE_MANIPULATOR - WM_manipulatorgrouptype_append(MESH_WGT_spin); +#ifdef USE_GIZMO + WM_gizmogrouptype_append(MESH_WGT_spin); #endif } -- cgit v1.2.3