diff options
Diffstat (limited to 'source/blender/editors/space_view3d')
14 files changed, 395 insertions, 395 deletions
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 691baaf48f7..6d4009e9d2b 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -451,12 +451,12 @@ static void view3d_main_region_init(wmWindowManager *wm, ARegion *ar) ListBase *lb; wmKeyMap *keymap; - if (ar->manipulator_map == NULL) { - ar->manipulator_map = WM_manipulatormap_new_from_type( - &(const struct wmManipulatorMapType_Params) {SPACE_VIEW3D, RGN_TYPE_WINDOW}); + if (ar->gizmo_map == NULL) { + ar->gizmo_map = WM_gizmomap_new_from_type( + &(const struct wmGizmoMapType_Params) {SPACE_VIEW3D, RGN_TYPE_WINDOW}); } - WM_manipulatormap_add_handlers(ar, ar->manipulator_map); + WM_gizmomap_add_handlers(ar, ar->gizmo_map); /* object ops. */ @@ -716,26 +716,26 @@ static void view3d_dropboxes(void) static void view3d_widgets(void) { - wmManipulatorMapType *mmap_type = WM_manipulatormaptype_ensure( - &(const struct wmManipulatorMapType_Params){SPACE_VIEW3D, RGN_TYPE_WINDOW}); - - WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_lamp_spot); - WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_lamp_area); - WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_lamp_target); - WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_force_field); - WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_camera); - WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_camera_view); - WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_empty_image); - WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_armature_spline); - - WM_manipulatorgrouptype_append(TRANSFORM_WGT_manipulator); - WM_manipulatorgrouptype_append(VIEW3D_WGT_xform_cage); - - WM_manipulatorgrouptype_append(VIEW3D_WGT_ruler); - WM_manipulatortype_append(VIEW3D_WT_ruler_item); - - WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_navigate); - WM_manipulatortype_append(VIEW3D_WT_navigate_rotate); + wmGizmoMapType *mmap_type = WM_gizmomaptype_ensure( + &(const struct wmGizmoMapType_Params){SPACE_VIEW3D, RGN_TYPE_WINDOW}); + + WM_gizmogrouptype_append_and_link(mmap_type, VIEW3D_WGT_lamp_spot); + WM_gizmogrouptype_append_and_link(mmap_type, VIEW3D_WGT_lamp_area); + WM_gizmogrouptype_append_and_link(mmap_type, VIEW3D_WGT_lamp_target); + WM_gizmogrouptype_append_and_link(mmap_type, VIEW3D_WGT_force_field); + WM_gizmogrouptype_append_and_link(mmap_type, VIEW3D_WGT_camera); + WM_gizmogrouptype_append_and_link(mmap_type, VIEW3D_WGT_camera_view); + WM_gizmogrouptype_append_and_link(mmap_type, VIEW3D_WGT_empty_image); + WM_gizmogrouptype_append_and_link(mmap_type, VIEW3D_WGT_armature_spline); + + WM_gizmogrouptype_append(TRANSFORM_WGT_gizmo); + WM_gizmogrouptype_append(VIEW3D_WGT_xform_cage); + + WM_gizmogrouptype_append(VIEW3D_WGT_ruler); + WM_gizmotype_append(VIEW3D_WT_ruler_item); + + WM_gizmogrouptype_append_and_link(mmap_type, VIEW3D_WGT_navigate); + WM_gizmotype_append(VIEW3D_WT_navigate_rotate); } @@ -815,13 +815,13 @@ static void view3d_main_region_listener( { View3D *v3d = sa->spacedata.first; RegionView3D *rv3d = ar->regiondata; - wmManipulatorMap *mmap = ar->manipulator_map; + wmGizmoMap *mmap = ar->gizmo_map; /* context changes */ switch (wmn->category) { case NC_WM: if (ELEM(wmn->data, ND_UNDO)) { - WM_manipulatormap_tag_refresh(mmap); + WM_gizmomap_tag_refresh(mmap); } break; case NC_ANIMATION: @@ -848,14 +848,14 @@ static void view3d_main_region_listener( if (wmn->reference) view3d_recalc_used_layers(ar, wmn, wmn->reference); ED_region_tag_redraw(ar); - WM_manipulatormap_tag_refresh(mmap); + WM_gizmomap_tag_refresh(mmap); break; case ND_LAYER: if (wmn->reference) { BKE_screen_view3d_sync(v3d, wmn->reference); } ED_region_tag_redraw(ar); - WM_manipulatormap_tag_refresh(mmap); + WM_gizmomap_tag_refresh(mmap); break; case ND_OB_ACTIVE: case ND_OB_SELECT: @@ -867,7 +867,7 @@ static void view3d_main_region_listener( case ND_MARKERS: case ND_MODE: ED_region_tag_redraw(ar); - WM_manipulatormap_tag_refresh(mmap); + WM_gizmomap_tag_refresh(mmap); break; case ND_WORLD: /* handled by space_view3d_listener() for v3d access */ @@ -899,7 +899,7 @@ static void view3d_main_region_listener( case ND_POINTCACHE: case ND_LOD: ED_region_tag_redraw(ar); - WM_manipulatormap_tag_refresh(mmap); + WM_gizmomap_tag_refresh(mmap); break; } switch (wmn->action) { @@ -912,7 +912,7 @@ static void view3d_main_region_listener( switch (wmn->data) { case ND_SELECT: { - WM_manipulatormap_tag_refresh(mmap); + WM_gizmomap_tag_refresh(mmap); ATTR_FALLTHROUGH; } case ND_DATA: @@ -993,7 +993,7 @@ static void view3d_main_region_listener( break; case ND_LIGHTING_DRAW: ED_region_tag_redraw(ar); - WM_manipulatormap_tag_refresh(mmap); + WM_gizmomap_tag_refresh(mmap); break; } break; @@ -1019,7 +1019,7 @@ static void view3d_main_region_listener( rv3d->rflag |= RV3D_GPULIGHT_UPDATE; } ED_region_tag_redraw(ar); - WM_manipulatormap_tag_refresh(mmap); + WM_gizmomap_tag_refresh(mmap); } break; case NC_ID: @@ -1035,7 +1035,7 @@ static void view3d_main_region_listener( case ND_LAYOUTBROWSE: case ND_LAYOUTDELETE: case ND_LAYOUTSET: - WM_manipulatormap_tag_refresh(mmap); + WM_gizmomap_tag_refresh(mmap); ED_region_tag_redraw(ar); break; case ND_LAYER: @@ -1545,7 +1545,7 @@ void ED_spacetype_view3d(void) st->operatortypes = view3d_operatortypes; st->keymap = view3d_keymap; st->dropboxes = view3d_dropboxes; - st->manipulators = view3d_widgets; + st->gizmos = view3d_widgets; st->context = view3d_context; st->id_remap = view3d_id_remap; diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 62e9d4ee3bf..3b86e574a1a 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -1203,10 +1203,10 @@ void view3d_draw_region_info(const bContext *C, ARegion *ar, const int UNUSED(of BLF_batch_draw_begin(); - if ((U.uiflag & USER_SHOW_MANIPULATOR_AXIS) || + if ((U.uiflag & USER_SHOW_GIZMO_AXIS) || (v3d->flag2 & V3D_RENDER_OVERRIDE) || - /* No need to display manipulator and this info. */ - (v3d->mpr_flag & (V3D_MANIPULATOR_HIDE | V3D_MANIPULATOR_HIDE_NAVIGATE))) + /* No need to display gizmo and this info. */ + (v3d->mpr_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_NAVIGATE))) { /* pass */ } diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index b6e20def432..792a341fba4 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -2812,8 +2812,8 @@ static int viewselected_exec(bContext *C, wmOperator *op) ViewLayer *view_layer_eval = DEG_get_evaluated_view_layer(depsgraph); bGPdata *gpd = CTX_data_gpencil_data(C); const bool is_gp_edit = ((gpd) && (gpd->flag & GP_DATA_STROKE_EDITMODE)); - const bool is_face_map = ((is_gp_edit == false) && ar->manipulator_map && - WM_manipulatormap_is_any_selected(ar->manipulator_map)); + const bool is_face_map = ((is_gp_edit == false) && ar->gizmo_map && + WM_gizmomap_is_any_selected(ar->gizmo_map)); Object *ob_eval = OBACT(view_layer_eval); Object *obedit = CTX_data_edit_object(C); float min[3], max[3]; @@ -2858,7 +2858,7 @@ static int viewselected_exec(bContext *C, wmOperator *op) CTX_DATA_END; } else if (is_face_map) { - ok = WM_manipulatormap_minmax(ar->manipulator_map, true, true, min, max); + ok = WM_gizmomap_minmax(ar->gizmo_map, true, true, min, max); } else if (obedit) { /* only selected */ @@ -3705,7 +3705,7 @@ static int view_axis_exec(bContext *C, wmOperator *op) Object *obact = CTX_data_active_object(C); if (obact != NULL) { float twmat[3][3]; - /* same as transform manipulator when normal is set */ + /* same as transform gizmo when normal is set */ ED_getTransformOrientationMatrix(C, twmat, V3D_AROUND_ACTIVE); align_quat = align_quat_buf; mat3_to_quat(align_quat, twmat); diff --git a/source/blender/editors/space_view3d/view3d_gizmo_armature.c b/source/blender/editors/space_view3d/view3d_gizmo_armature.c index 16c7d574873..c7b12529798 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_armature.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_armature.c @@ -52,7 +52,7 @@ /* -------------------------------------------------------------------- */ -/** \name Armature Spline Manipulator +/** \name Armature Spline Gizmo * * \{ */ @@ -68,7 +68,7 @@ #define BBONE_SCALE_Y 3.0f struct BoneSplineHandle { - wmManipulator *manipulator; + wmGizmo *gizmo; bPoseChannel *pchan; /* We could remove, keep since at the moment for checking the conversion. */ float co[3]; @@ -79,8 +79,8 @@ struct BoneSplineWidgetGroup { struct BoneSplineHandle handles[2]; }; -static void manipulator_bbone_offset_get( - const wmManipulator *UNUSED(mpr), wmManipulatorProperty *mpr_prop, +static void gizmo_bbone_offset_get( + const wmGizmo *UNUSED(mpr), wmGizmoProperty *mpr_prop, void *value_p) { struct BoneSplineHandle *bh = mpr_prop->custom_func.user_data; @@ -102,8 +102,8 @@ static void manipulator_bbone_offset_get( copy_v3_v3(value, bh->co); } -static void manipulator_bbone_offset_set( - const wmManipulator *UNUSED(mpr), wmManipulatorProperty *mpr_prop, +static void gizmo_bbone_offset_set( + const wmGizmo *UNUSED(mpr), wmGizmoProperty *mpr_prop, const void *value_p) { struct BoneSplineHandle *bh = mpr_prop->custom_func.user_data; @@ -127,7 +127,7 @@ static void manipulator_bbone_offset_set( } -static bool WIDGETGROUP_armature_spline_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt)) +static bool WIDGETGROUP_armature_spline_poll(const bContext *C, wmGizmoGroupType *UNUSED(wgt)) { Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C)); if (ob != NULL) { @@ -136,7 +136,7 @@ static bool WIDGETGROUP_armature_spline_poll(const bContext *C, wmManipulatorGro if (arm->act_bone && arm->act_bone->segments > 1) { View3D *v3d = CTX_wm_view3d(C); if ((v3d->flag2 & V3D_RENDER_OVERRIDE) || - (v3d->mpr_flag & (V3D_MANIPULATOR_HIDE | V3D_MANIPULATOR_HIDE_CONTEXT))) + (v3d->mpr_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_CONTEXT))) { /* pass */ } @@ -150,27 +150,27 @@ static bool WIDGETGROUP_armature_spline_poll(const bContext *C, wmManipulatorGro } -static void WIDGETGROUP_armature_spline_setup(const bContext *C, wmManipulatorGroup *mgroup) +static void WIDGETGROUP_armature_spline_setup(const bContext *C, wmGizmoGroup *mgroup) { Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C)); bPoseChannel *pchan = BKE_pose_channel_active(ob); - const wmManipulatorType *wt_grab = WM_manipulatortype_find("MANIPULATOR_WT_grab_3d", true); + const wmGizmoType *wt_grab = WM_gizmotype_find("GIZMO_WT_grab_3d", true); struct BoneSplineWidgetGroup *bspline_group = MEM_callocN(sizeof(struct BoneSplineWidgetGroup), __func__); mgroup->customdata = bspline_group; /* Handles */ for (int i = 0; i < ARRAY_SIZE(bspline_group->handles); i++) { - wmManipulator *mpr; - mpr = bspline_group->handles[i].manipulator = WM_manipulator_new_ptr(wt_grab, mgroup, NULL); - RNA_enum_set(mpr->ptr, "draw_style", ED_MANIPULATOR_GRAB_STYLE_RING_2D); + wmGizmo *mpr; + mpr = bspline_group->handles[i].gizmo = WM_gizmo_new_ptr(wt_grab, mgroup, NULL); + RNA_enum_set(mpr->ptr, "draw_style", ED_GIZMO_GRAB_STYLE_RING_2D); RNA_enum_set(mpr->ptr, "draw_options", - ED_MANIPULATOR_GRAB_DRAW_FLAG_FILL | ED_MANIPULATOR_GRAB_DRAW_FLAG_ALIGN_VIEW); - WM_manipulator_set_flag(mpr, WM_MANIPULATOR_DRAW_VALUE, true); + ED_GIZMO_GRAB_DRAW_FLAG_FILL | ED_GIZMO_GRAB_DRAW_FLAG_ALIGN_VIEW); + WM_gizmo_set_flag(mpr, WM_GIZMO_DRAW_VALUE, true); - UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, mpr->color); - UI_GetThemeColor3fv(TH_MANIPULATOR_HI, mpr->color_hi); + UI_GetThemeColor3fv(TH_GIZMO_PRIMARY, mpr->color); + UI_GetThemeColor3fv(TH_GIZMO_HI, mpr->color_hi); mpr->scale_basis = 0.06f; @@ -180,7 +180,7 @@ static void WIDGETGROUP_armature_spline_setup(const bContext *C, wmManipulatorGr } } -static void WIDGETGROUP_armature_spline_refresh(const bContext *C, wmManipulatorGroup *mgroup) +static void WIDGETGROUP_armature_spline_refresh(const bContext *C, wmGizmoGroup *mgroup) { Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C)); @@ -192,7 +192,7 @@ static void WIDGETGROUP_armature_spline_refresh(const bContext *C, wmManipulator /* Handles */ for (int i = 0; i < ARRAY_SIZE(bspline_group->handles); i++) { - wmManipulator *mpr = bspline_group->handles[i].manipulator; + wmGizmo *mpr = bspline_group->handles[i].gizmo; bspline_group->handles[i].pchan = pchan; bspline_group->handles[i].index = i; @@ -201,24 +201,24 @@ static void WIDGETGROUP_armature_spline_refresh(const bContext *C, wmManipulator copy_m4_m4(mpr->matrix_space, mat); /* need to set property here for undo. TODO would prefer to do this in _init */ - WM_manipulator_target_property_def_func( + WM_gizmo_target_property_def_func( mpr, "offset", - &(const struct wmManipulatorPropertyFnParams) { - .value_get_fn = manipulator_bbone_offset_get, - .value_set_fn = manipulator_bbone_offset_set, + &(const struct wmGizmoPropertyFnParams) { + .value_get_fn = gizmo_bbone_offset_get, + .value_set_fn = gizmo_bbone_offset_set, .range_get_fn = NULL, .user_data = &bspline_group->handles[i], }); } } -void VIEW3D_WGT_armature_spline(wmManipulatorGroupType *wgt) +void VIEW3D_WGT_armature_spline(wmGizmoGroupType *wgt) { wgt->name = "Armature Spline Widgets"; wgt->idname = "VIEW3D_WGT_armature_spline"; - wgt->flag = (WM_MANIPULATORGROUPTYPE_PERSISTENT | - WM_MANIPULATORGROUPTYPE_3D); + wgt->flag = (WM_GIZMOGROUPTYPE_PERSISTENT | + WM_GIZMOGROUPTYPE_3D); wgt->poll = WIDGETGROUP_armature_spline_poll; wgt->setup = WIDGETGROUP_armature_spline_setup; diff --git a/source/blender/editors/space_view3d/view3d_gizmo_camera.c b/source/blender/editors/space_view3d/view3d_gizmo_camera.c index 0c97669a9af..b011e6e2e21 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_camera.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_camera.c @@ -52,20 +52,20 @@ /* -------------------------------------------------------------------- */ -/** \name Camera Manipulators +/** \name Camera Gizmos * \{ */ struct CameraWidgetGroup { - wmManipulator *dop_dist; - wmManipulator *focal_len; - wmManipulator *ortho_scale; + wmGizmo *dop_dist; + wmGizmo *focal_len; + wmGizmo *ortho_scale; }; -static bool WIDGETGROUP_camera_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt)) +static bool WIDGETGROUP_camera_poll(const bContext *C, wmGizmoGroupType *UNUSED(wgt)) { View3D *v3d = CTX_wm_view3d(C); if ((v3d->flag2 & V3D_RENDER_OVERRIDE) || - (v3d->mpr_flag & (V3D_MANIPULATOR_HIDE | V3D_MANIPULATOR_HIDE_CONTEXT))) + (v3d->mpr_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_CONTEXT))) { return false; } @@ -81,12 +81,12 @@ static bool WIDGETGROUP_camera_poll(const bContext *C, wmManipulatorGroupType *U return false; } -static void WIDGETGROUP_camera_setup(const bContext *C, wmManipulatorGroup *mgroup) +static void WIDGETGROUP_camera_setup(const bContext *C, wmGizmoGroup *mgroup) { Object *ob = CTX_data_active_object(C); float dir[3]; - const wmManipulatorType *wt_arrow = WM_manipulatortype_find("MANIPULATOR_WT_arrow_3d", true); + const wmGizmoType *wt_arrow = WM_gizmotype_find("GIZMO_WT_arrow_3d", true); struct CameraWidgetGroup *camgroup = MEM_callocN(sizeof(struct CameraWidgetGroup), __func__); mgroup->customdata = camgroup; @@ -95,38 +95,38 @@ static void WIDGETGROUP_camera_setup(const bContext *C, wmManipulatorGroup *mgro /* dof distance */ { - wmManipulator *mpr; - mpr = camgroup->dop_dist = WM_manipulator_new_ptr(wt_arrow, mgroup, NULL); - RNA_enum_set(mpr->ptr, "draw_style", ED_MANIPULATOR_ARROW_STYLE_CROSS); - WM_manipulator_set_flag(mpr, WM_MANIPULATOR_DRAW_HOVER, true); + wmGizmo *mpr; + mpr = camgroup->dop_dist = WM_gizmo_new_ptr(wt_arrow, mgroup, NULL); + RNA_enum_set(mpr->ptr, "draw_style", ED_GIZMO_ARROW_STYLE_CROSS); + WM_gizmo_set_flag(mpr, WM_GIZMO_DRAW_HOVER, true); - UI_GetThemeColor3fv(TH_MANIPULATOR_A, mpr->color); - UI_GetThemeColor3fv(TH_MANIPULATOR_HI, mpr->color_hi); + UI_GetThemeColor3fv(TH_GIZMO_A, mpr->color); + UI_GetThemeColor3fv(TH_GIZMO_HI, mpr->color_hi); } /* focal length * - logic/calculations are similar to BKE_camera_view_frame_ex, better keep in sync */ { - wmManipulator *mpr; - mpr = camgroup->focal_len = WM_manipulator_new_ptr(wt_arrow, mgroup, NULL); - mpr->flag |= WM_MANIPULATOR_DRAW_NO_SCALE; - RNA_enum_set(mpr->ptr, "draw_style", ED_MANIPULATOR_ARROW_STYLE_CONE); - RNA_enum_set(mpr->ptr, "transform", ED_MANIPULATOR_ARROW_XFORM_FLAG_CONSTRAINED); - - UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, mpr->color); - UI_GetThemeColor3fv(TH_MANIPULATOR_HI, mpr->color_hi); - - mpr = camgroup->ortho_scale = WM_manipulator_new_ptr(wt_arrow, mgroup, NULL); - mpr->flag |= WM_MANIPULATOR_DRAW_NO_SCALE; - RNA_enum_set(mpr->ptr, "draw_style", ED_MANIPULATOR_ARROW_STYLE_CONE); - RNA_enum_set(mpr->ptr, "transform", ED_MANIPULATOR_ARROW_XFORM_FLAG_CONSTRAINED); - - UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, mpr->color); - UI_GetThemeColor3fv(TH_MANIPULATOR_HI, mpr->color_hi); + wmGizmo *mpr; + mpr = camgroup->focal_len = WM_gizmo_new_ptr(wt_arrow, mgroup, NULL); + mpr->flag |= WM_GIZMO_DRAW_NO_SCALE; + RNA_enum_set(mpr->ptr, "draw_style", ED_GIZMO_ARROW_STYLE_CONE); + RNA_enum_set(mpr->ptr, "transform", ED_GIZMO_ARROW_XFORM_FLAG_CONSTRAINED); + + UI_GetThemeColor3fv(TH_GIZMO_PRIMARY, mpr->color); + UI_GetThemeColor3fv(TH_GIZMO_HI, mpr->color_hi); + + mpr = camgroup->ortho_scale = WM_gizmo_new_ptr(wt_arrow, mgroup, NULL); + mpr->flag |= WM_GIZMO_DRAW_NO_SCALE; + RNA_enum_set(mpr->ptr, "draw_style", ED_GIZMO_ARROW_STYLE_CONE); + RNA_enum_set(mpr->ptr, "transform", ED_GIZMO_ARROW_XFORM_FLAG_CONSTRAINED); + + UI_GetThemeColor3fv(TH_GIZMO_PRIMARY, mpr->color); + UI_GetThemeColor3fv(TH_GIZMO_HI, mpr->color_hi); } } -static void WIDGETGROUP_camera_refresh(const bContext *C, wmManipulatorGroup *mgroup) +static void WIDGETGROUP_camera_refresh(const bContext *C, wmGizmoGroup *mgroup) { if (!mgroup->customdata) return; @@ -149,16 +149,16 @@ static void WIDGETGROUP_camera_refresh(const bContext *C, wmManipulatorGroup *mg negate_v3_v3(dir, ob->obmat[2]); if (ca->flag & CAM_SHOWLIMITS) { - WM_manipulator_set_matrix_location(camgroup->dop_dist, ob->obmat[3]); - WM_manipulator_set_matrix_rotation_from_yz_axis(camgroup->dop_dist, ob->obmat[1], dir); - WM_manipulator_set_scale(camgroup->dop_dist, ca->drawsize); - WM_manipulator_set_flag(camgroup->dop_dist, WM_MANIPULATOR_HIDDEN, false); + WM_gizmo_set_matrix_location(camgroup->dop_dist, ob->obmat[3]); + WM_gizmo_set_matrix_rotation_from_yz_axis(camgroup->dop_dist, ob->obmat[1], dir); + WM_gizmo_set_scale(camgroup->dop_dist, ca->drawsize); + WM_gizmo_set_flag(camgroup->dop_dist, WM_GIZMO_HIDDEN, false); /* need to set property here for undo. TODO would prefer to do this in _init */ - WM_manipulator_target_property_def_rna(camgroup->dop_dist, "offset", &camera_ptr, "dof_distance", -1); + WM_gizmo_target_property_def_rna(camgroup->dop_dist, "offset", &camera_ptr, "dof_distance", -1); } else { - WM_manipulator_set_flag(camgroup->dop_dist, WM_MANIPULATOR_HIDDEN, true); + WM_gizmo_set_flag(camgroup->dop_dist, WM_GIZMO_HIDDEN, true); } /* TODO - make focal length/ortho ob_scale_inv widget optional */ @@ -167,14 +167,14 @@ static void WIDGETGROUP_camera_refresh(const bContext *C, wmManipulatorGroup *mg const float aspy = (float)scene->r.ysch * scene->r.yasp; const bool is_ortho = (ca->type == CAM_ORTHO); const int sensor_fit = BKE_camera_sensor_fit(ca->sensor_fit, aspx, aspy); - wmManipulator *widget = is_ortho ? camgroup->ortho_scale : camgroup->focal_len; + wmGizmo *widget = is_ortho ? camgroup->ortho_scale : camgroup->focal_len; float scale_matrix; if (true) { float offset[3]; float aspect[2]; - WM_manipulator_set_flag(widget, WM_MANIPULATOR_HIDDEN, false); - WM_manipulator_set_flag(is_ortho ? camgroup->focal_len : camgroup->ortho_scale, WM_MANIPULATOR_HIDDEN, true); + WM_gizmo_set_flag(widget, WM_GIZMO_HIDDEN, false); + WM_gizmo_set_flag(is_ortho ? camgroup->focal_len : camgroup->ortho_scale, WM_GIZMO_HIDDEN, true); /* account for lens shifting */ @@ -187,8 +187,8 @@ static void WIDGETGROUP_camera_refresh(const bContext *C, wmManipulatorGroup *mg aspect[1] = (sensor_fit == CAMERA_SENSOR_FIT_HOR) ? aspy / aspx : 1.0f; unit_m4(widget->matrix_basis); - WM_manipulator_set_matrix_location(widget, ob->obmat[3]); - WM_manipulator_set_matrix_rotation_from_yz_axis(widget, ob->obmat[1], dir); + WM_gizmo_set_matrix_location(widget, ob->obmat[3]); + WM_gizmo_set_matrix_rotation_from_yz_axis(widget, ob->obmat[1], dir); if (is_ortho) { scale_matrix = ca->ortho_scale * 0.5f; @@ -201,16 +201,16 @@ static void WIDGETGROUP_camera_refresh(const bContext *C, wmManipulatorGroup *mg RNA_float_set_array(widget->ptr, "aspect", aspect); - WM_manipulator_set_matrix_offset_location(widget, offset); + WM_gizmo_set_matrix_offset_location(widget, offset); } /* define & update properties */ { const char *propname = is_ortho ? "ortho_scale" : "lens"; PropertyRNA *prop = RNA_struct_find_property(&camera_ptr, propname); - const wmManipulatorPropertyType *mpr_prop_type = WM_manipulatortype_target_property_find(widget->type, "offset"); + const wmGizmoPropertyType *mpr_prop_type = WM_gizmotype_target_property_find(widget->type, "offset"); - WM_manipulator_target_property_clear_rna_ptr(widget, mpr_prop_type); + WM_gizmo_target_property_clear_rna_ptr(widget, mpr_prop_type); float min, max, range; float step, precision; @@ -219,20 +219,20 @@ static void WIDGETGROUP_camera_refresh(const bContext *C, wmManipulatorGroup *mg RNA_property_float_ui_range(&camera_ptr, prop, &min, &max, &step, &precision); range = max - min; - ED_manipulator_arrow3d_set_range_fac( + ED_gizmo_arrow3d_set_range_fac( widget, is_ortho ? (ca->drawsize * range) : (scale_matrix * range / /* Half sensor, intentionally use sensor from camera and not calculated above. */ (0.5f * ((ca->sensor_fit == CAMERA_SENSOR_FIT_HOR) ? ca->sensor_x : ca->sensor_x)))); - WM_manipulator_target_property_def_rna_ptr(widget, mpr_prop_type, &camera_ptr, prop, -1); + WM_gizmo_target_property_def_rna_ptr(widget, mpr_prop_type, &camera_ptr, prop, -1); } } static void WIDGETGROUP_camera_message_subscribe( - const bContext *C, wmManipulatorGroup *mgroup, struct wmMsgBus *mbus) + const bContext *C, wmGizmoGroup *mgroup, struct wmMsgBus *mbus) { ARegion *ar = CTX_wm_region(C); Object *ob = CTX_data_active_object(C); @@ -241,7 +241,7 @@ static void WIDGETGROUP_camera_message_subscribe( wmMsgSubscribeValue msg_sub_value_mpr_tag_refresh = { .owner = ar, .user_data = mgroup->parent_mmap, - .notify = WM_manipulator_do_msg_notify_tag_refresh, + .notify = WM_gizmo_do_msg_notify_tag_refresh, }; { @@ -283,14 +283,14 @@ static void WIDGETGROUP_camera_message_subscribe( } } -void VIEW3D_WGT_camera(wmManipulatorGroupType *wgt) +void VIEW3D_WGT_camera(wmGizmoGroupType *wgt) { wgt->name = "Camera Widgets"; wgt->idname = "VIEW3D_WGT_camera"; - wgt->flag = (WM_MANIPULATORGROUPTYPE_PERSISTENT | - WM_MANIPULATORGROUPTYPE_3D | - WM_MANIPULATORGROUPTYPE_DEPTH_3D); + wgt->flag = (WM_GIZMOGROUPTYPE_PERSISTENT | + WM_GIZMOGROUPTYPE_3D | + WM_GIZMOGROUPTYPE_DEPTH_3D); wgt->poll = WIDGETGROUP_camera_poll; wgt->setup = WIDGETGROUP_camera_setup; @@ -302,11 +302,11 @@ void VIEW3D_WGT_camera(wmManipulatorGroupType *wgt) /* -------------------------------------------------------------------- */ -/** \name CameraView Manipulators +/** \name CameraView Gizmos * \{ */ struct CameraViewWidgetGroup { - wmManipulator *border; + wmGizmo *border; struct { rctf *edit_border; @@ -315,8 +315,8 @@ struct CameraViewWidgetGroup { }; /* scale callbacks */ -static void manipulator_render_border_prop_matrix_get( - const wmManipulator *UNUSED(mpr), wmManipulatorProperty *mpr_prop, +static void gizmo_render_border_prop_matrix_get( + const wmGizmo *UNUSED(mpr), wmGizmoProperty *mpr_prop, void *value_p) { float (*matrix)[4] = value_p; @@ -331,8 +331,8 @@ static void manipulator_render_border_prop_matrix_get( matrix[3][1] = BLI_rctf_cent_y(border); } -static void manipulator_render_border_prop_matrix_set( - const wmManipulator *UNUSED(mpr), wmManipulatorProperty *mpr_prop, +static void gizmo_render_border_prop_matrix_set( + const wmGizmo *UNUSED(mpr), wmGizmoProperty *mpr_prop, const void *value_p) { const float (*matrix)[4] = value_p; @@ -345,7 +345,7 @@ static void manipulator_render_border_prop_matrix_set( BLI_rctf_isect(&(rctf){.xmin = 0, .ymin = 0, .xmax = 1, .ymax = 1}, border, border); } -static bool WIDGETGROUP_camera_view_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt)) +static bool WIDGETGROUP_camera_view_poll(const bContext *C, wmGizmoGroupType *UNUSED(wgt)) { Scene *scene = CTX_data_scene(C); @@ -361,7 +361,7 @@ static bool WIDGETGROUP_camera_view_poll(const bContext *C, wmManipulatorGroupTy View3D *v3d = CTX_wm_view3d(C); if ((v3d->flag2 & V3D_RENDER_OVERRIDE) || - (v3d->mpr_flag & (V3D_MANIPULATOR_HIDE | V3D_MANIPULATOR_HIDE_CONTEXT))) + (v3d->mpr_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_CONTEXT))) { return false; } @@ -382,22 +382,22 @@ static bool WIDGETGROUP_camera_view_poll(const bContext *C, wmManipulatorGroupTy return false; } -static void WIDGETGROUP_camera_view_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup) +static void WIDGETGROUP_camera_view_setup(const bContext *UNUSED(C), wmGizmoGroup *mgroup) { struct CameraViewWidgetGroup *viewgroup = MEM_mallocN(sizeof(struct CameraViewWidgetGroup), __func__); - viewgroup->border = WM_manipulator_new("MANIPULATOR_WT_cage_2d", mgroup, NULL); + viewgroup->border = WM_gizmo_new("GIZMO_WT_cage_2d", mgroup, NULL); RNA_enum_set(viewgroup->border->ptr, "transform", - ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE | ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE); + ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE | ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE); /* Box style is more subtle in this case. */ - RNA_enum_set(viewgroup->border->ptr, "draw_style", ED_MANIPULATOR_CAGE2D_STYLE_BOX); + RNA_enum_set(viewgroup->border->ptr, "draw_style", ED_GIZMO_CAGE2D_STYLE_BOX); mgroup->customdata = viewgroup; } -static void WIDGETGROUP_camera_view_draw_prepare(const bContext *C, wmManipulatorGroup *mgroup) +static void WIDGETGROUP_camera_view_draw_prepare(const bContext *C, wmGizmoGroup *mgroup) { struct CameraViewWidgetGroup *viewgroup = mgroup->customdata; @@ -413,7 +413,7 @@ static void WIDGETGROUP_camera_view_draw_prepare(const bContext *C, wmManipulato viewgroup->state.view_border = (rctf){.xmin = 0, .ymin = 0, .xmax = ar->winx, .ymax = ar->winy}; } - wmManipulator *mpr = viewgroup->border; + wmGizmo *mpr = viewgroup->border; unit_m4(mpr->matrix_space); mul_v3_fl(mpr->matrix_space[0], BLI_rctf_size_x(&viewgroup->state.view_border)); mul_v3_fl(mpr->matrix_space[1], BLI_rctf_size_y(&viewgroup->state.view_border)); @@ -421,7 +421,7 @@ static void WIDGETGROUP_camera_view_draw_prepare(const bContext *C, wmManipulato mpr->matrix_space[3][1] = viewgroup->state.view_border.ymin; } -static void WIDGETGROUP_camera_view_refresh(const bContext *C, wmManipulatorGroup *mgroup) +static void WIDGETGROUP_camera_view_refresh(const bContext *C, wmGizmoGroup *mgroup) { struct CameraViewWidgetGroup *viewgroup = mgroup->customdata; @@ -431,11 +431,11 @@ static void WIDGETGROUP_camera_view_refresh(const bContext *C, wmManipulatorGrou Scene *scene = CTX_data_scene(C); { - wmManipulator *mpr = viewgroup->border; - WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, false); + wmGizmo *mpr = viewgroup->border; + WM_gizmo_set_flag(mpr, WM_GIZMO_HIDDEN, false); RNA_enum_set(viewgroup->border->ptr, "transform", - ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE | ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE); + ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE | ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE); if (rv3d->persp == RV3D_CAMOB) { viewgroup->state.edit_border = &scene->r.border; @@ -444,11 +444,11 @@ static void WIDGETGROUP_camera_view_refresh(const bContext *C, wmManipulatorGrou viewgroup->state.edit_border = &v3d->render_border; } - WM_manipulator_target_property_def_func( + WM_gizmo_target_property_def_func( mpr, "matrix", - &(const struct wmManipulatorPropertyFnParams) { - .value_get_fn = manipulator_render_border_prop_matrix_get, - .value_set_fn = manipulator_render_border_prop_matrix_set, + &(const struct wmGizmoPropertyFnParams) { + .value_get_fn = gizmo_render_border_prop_matrix_get, + .value_set_fn = gizmo_render_border_prop_matrix_set, .range_get_fn = NULL, .user_data = viewgroup, }); @@ -456,13 +456,13 @@ static void WIDGETGROUP_camera_view_refresh(const bContext *C, wmManipulatorGrou } -void VIEW3D_WGT_camera_view(wmManipulatorGroupType *wgt) +void VIEW3D_WGT_camera_view(wmGizmoGroupType *wgt) { wgt->name = "Camera View Widgets"; wgt->idname = "VIEW3D_WGT_camera_view"; - wgt->flag = (WM_MANIPULATORGROUPTYPE_PERSISTENT | - WM_MANIPULATORGROUPTYPE_SCALE); + wgt->flag = (WM_GIZMOGROUPTYPE_PERSISTENT | + WM_GIZMOGROUPTYPE_SCALE); wgt->poll = WIDGETGROUP_camera_view_poll; wgt->setup = WIDGETGROUP_camera_view_setup; diff --git a/source/blender/editors/space_view3d/view3d_gizmo_empty.c b/source/blender/editors/space_view3d/view3d_gizmo_empty.c index 89f55bc1d9a..3b51af5ca15 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_empty.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_empty.c @@ -50,11 +50,11 @@ /* -------------------------------------------------------------------- */ -/** \name Empty Image Manipulators +/** \name Empty Image Gizmos * \{ */ struct EmptyImageWidgetGroup { - wmManipulator *manipulator; + wmGizmo *gizmo; struct { Object *ob; float dims[2]; @@ -62,8 +62,8 @@ struct EmptyImageWidgetGroup { }; /* translate callbacks */ -static void manipulator_empty_image_prop_matrix_get( - const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, +static void gizmo_empty_image_prop_matrix_get( + const wmGizmo *mpr, wmGizmoProperty *mpr_prop, void *value_p) { float (*matrix)[4] = value_p; @@ -84,8 +84,8 @@ static void manipulator_empty_image_prop_matrix_get( matrix[3][1] = (ob->ima_ofs[1] * dims[1]) + (0.5f * dims[1]); } -static void manipulator_empty_image_prop_matrix_set( - const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, +static void gizmo_empty_image_prop_matrix_set( + const wmGizmo *mpr, wmGizmoProperty *mpr_prop, const void *value_p) { const float (*matrix)[4] = value_p; @@ -104,12 +104,12 @@ static void manipulator_empty_image_prop_matrix_set( ob->ima_ofs[1] = (matrix[3][1] - (0.5f * dims[1])) / dims[1]; } -static bool WIDGETGROUP_empty_image_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt)) +static bool WIDGETGROUP_empty_image_poll(const bContext *C, wmGizmoGroupType *UNUSED(wgt)) { View3D *v3d = CTX_wm_view3d(C); if ((v3d->flag2 & V3D_RENDER_OVERRIDE) || - (v3d->mpr_flag & (V3D_MANIPULATOR_HIDE | V3D_MANIPULATOR_HIDE_CONTEXT))) + (v3d->mpr_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_CONTEXT))) { return false; } @@ -122,34 +122,34 @@ static bool WIDGETGROUP_empty_image_poll(const bContext *C, wmManipulatorGroupTy return false; } -static void WIDGETGROUP_empty_image_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup) +static void WIDGETGROUP_empty_image_setup(const bContext *UNUSED(C), wmGizmoGroup *mgroup) { struct EmptyImageWidgetGroup *imgroup = MEM_mallocN(sizeof(struct EmptyImageWidgetGroup), __func__); - imgroup->manipulator = WM_manipulator_new("MANIPULATOR_WT_cage_2d", mgroup, NULL); - wmManipulator *mpr = imgroup->manipulator; + imgroup->gizmo = WM_gizmo_new("GIZMO_WT_cage_2d", mgroup, NULL); + wmGizmo *mpr = imgroup->gizmo; RNA_enum_set(mpr->ptr, "transform", - ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE); + ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE); mgroup->customdata = imgroup; - WM_manipulator_set_flag(mpr, WM_MANIPULATOR_DRAW_HOVER, true); + WM_gizmo_set_flag(mpr, WM_GIZMO_DRAW_HOVER, true); - UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, mpr->color); - UI_GetThemeColor3fv(TH_MANIPULATOR_HI, mpr->color_hi); + UI_GetThemeColor3fv(TH_GIZMO_PRIMARY, mpr->color); + UI_GetThemeColor3fv(TH_GIZMO_HI, mpr->color_hi); } -static void WIDGETGROUP_empty_image_refresh(const bContext *C, wmManipulatorGroup *mgroup) +static void WIDGETGROUP_empty_image_refresh(const bContext *C, wmGizmoGroup *mgroup) { struct EmptyImageWidgetGroup *imgroup = mgroup->customdata; Object *ob = CTX_data_active_object(C); - wmManipulator *mpr = imgroup->manipulator; + wmGizmo *mpr = imgroup->gizmo; copy_m4_m4(mpr->matrix_basis, ob->obmat); RNA_enum_set(mpr->ptr, "transform", - ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE | - ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE | - ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE_UNIFORM); + ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE | + ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE | + ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE_UNIFORM); imgroup->state.ob = ob; @@ -177,24 +177,24 @@ static void WIDGETGROUP_empty_image_refresh(const bContext *C, wmManipulatorGrou } RNA_float_set_array(mpr->ptr, "dimensions", imgroup->state.dims); - WM_manipulator_target_property_def_func( + WM_gizmo_target_property_def_func( mpr, "matrix", - &(const struct wmManipulatorPropertyFnParams) { - .value_get_fn = manipulator_empty_image_prop_matrix_get, - .value_set_fn = manipulator_empty_image_prop_matrix_set, + &(const struct wmGizmoPropertyFnParams) { + .value_get_fn = gizmo_empty_image_prop_matrix_get, + .value_set_fn = gizmo_empty_image_prop_matrix_set, .range_get_fn = NULL, .user_data = imgroup, }); } -void VIEW3D_WGT_empty_image(wmManipulatorGroupType *wgt) +void VIEW3D_WGT_empty_image(wmGizmoGroupType *wgt) { wgt->name = "Area Light Widgets"; wgt->idname = "VIEW3D_WGT_empty_image"; - wgt->flag |= (WM_MANIPULATORGROUPTYPE_PERSISTENT | - WM_MANIPULATORGROUPTYPE_3D | - WM_MANIPULATORGROUPTYPE_DEPTH_3D); + wgt->flag |= (WM_GIZMOGROUPTYPE_PERSISTENT | + WM_GIZMOGROUPTYPE_3D | + WM_GIZMOGROUPTYPE_DEPTH_3D); wgt->poll = WIDGETGROUP_empty_image_poll; wgt->setup = WIDGETGROUP_empty_image_setup; diff --git a/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c b/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c index db985c18c08..d4605bb0c7d 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c @@ -49,15 +49,15 @@ /* -------------------------------------------------------------------- */ -/** \name Force Field Manipulators +/** \name Force Field Gizmos * \{ */ -static bool WIDGETGROUP_forcefield_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt)) +static bool WIDGETGROUP_forcefield_poll(const bContext *C, wmGizmoGroupType *UNUSED(wgt)) { View3D *v3d = CTX_wm_view3d(C); if ((v3d->flag2 & V3D_RENDER_OVERRIDE) || - (v3d->mpr_flag & (V3D_MANIPULATOR_HIDE | V3D_MANIPULATOR_HIDE_CONTEXT))) + (v3d->mpr_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_CONTEXT))) { return false; } @@ -67,26 +67,26 @@ static bool WIDGETGROUP_forcefield_poll(const bContext *C, wmManipulatorGroupTyp return (ob && ob->pd && ob->pd->forcefield); } -static void WIDGETGROUP_forcefield_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup) +static void WIDGETGROUP_forcefield_setup(const bContext *UNUSED(C), wmGizmoGroup *mgroup) { /* only wind effector for now */ - wmManipulatorWrapper *wwrapper = MEM_mallocN(sizeof(wmManipulatorWrapper), __func__); + wmGizmoWrapper *wwrapper = MEM_mallocN(sizeof(wmGizmoWrapper), __func__); mgroup->customdata = wwrapper; - wwrapper->manipulator = WM_manipulator_new("MANIPULATOR_WT_arrow_3d", mgroup, NULL); - wmManipulator *mpr = wwrapper->manipulator; - RNA_enum_set(mpr->ptr, "transform", ED_MANIPULATOR_ARROW_XFORM_FLAG_CONSTRAINED); - ED_manipulator_arrow3d_set_ui_range(mpr, -200.0f, 200.0f); - ED_manipulator_arrow3d_set_range_fac(mpr, 6.0f); + wwrapper->gizmo = WM_gizmo_new("GIZMO_WT_arrow_3d", mgroup, NULL); + wmGizmo *mpr = wwrapper->gizmo; + RNA_enum_set(mpr->ptr, "transform", ED_GIZMO_ARROW_XFORM_FLAG_CONSTRAINED); + ED_gizmo_arrow3d_set_ui_range(mpr, -200.0f, 200.0f); + ED_gizmo_arrow3d_set_range_fac(mpr, 6.0f); - UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, mpr->color); - UI_GetThemeColor3fv(TH_MANIPULATOR_HI, mpr->color_hi); + UI_GetThemeColor3fv(TH_GIZMO_PRIMARY, mpr->color); + UI_GetThemeColor3fv(TH_GIZMO_HI, mpr->color_hi); } -static void WIDGETGROUP_forcefield_refresh(const bContext *C, wmManipulatorGroup *mgroup) +static void WIDGETGROUP_forcefield_refresh(const bContext *C, wmGizmoGroup *mgroup) { - wmManipulatorWrapper *wwrapper = mgroup->customdata; - wmManipulator *mpr = wwrapper->manipulator; + wmGizmoWrapper *wwrapper = mgroup->customdata; + wmGizmo *mpr = wwrapper->gizmo; Object *ob = CTX_data_active_object(C); PartDeflect *pd = ob->pd; @@ -96,26 +96,26 @@ static void WIDGETGROUP_forcefield_refresh(const bContext *C, wmManipulatorGroup PointerRNA field_ptr; RNA_pointer_create(&ob->id, &RNA_FieldSettings, pd, &field_ptr); - WM_manipulator_set_matrix_location(mpr, ob->obmat[3]); - WM_manipulator_set_matrix_rotation_from_z_axis(mpr, ob->obmat[2]); - WM_manipulator_set_matrix_offset_location(mpr, ofs); - WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, false); - WM_manipulator_target_property_def_rna(mpr, "offset", &field_ptr, "strength", -1); + WM_gizmo_set_matrix_location(mpr, ob->obmat[3]); + WM_gizmo_set_matrix_rotation_from_z_axis(mpr, ob->obmat[2]); + WM_gizmo_set_matrix_offset_location(mpr, ofs); + WM_gizmo_set_flag(mpr, WM_GIZMO_HIDDEN, false); + WM_gizmo_target_property_def_rna(mpr, "offset", &field_ptr, "strength", -1); } else { - WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, true); + WM_gizmo_set_flag(mpr, WM_GIZMO_HIDDEN, true); } } -void VIEW3D_WGT_force_field(wmManipulatorGroupType *wgt) +void VIEW3D_WGT_force_field(wmGizmoGroupType *wgt) { wgt->name = "Force Field Widgets"; wgt->idname = "VIEW3D_WGT_force_field"; - wgt->flag |= (WM_MANIPULATORGROUPTYPE_PERSISTENT | - WM_MANIPULATORGROUPTYPE_3D | - WM_MANIPULATORGROUPTYPE_SCALE | - WM_MANIPULATORGROUPTYPE_DEPTH_3D); + wgt->flag |= (WM_GIZMOGROUPTYPE_PERSISTENT | + WM_GIZMOGROUPTYPE_3D | + WM_GIZMOGROUPTYPE_SCALE | + WM_GIZMOGROUPTYPE_DEPTH_3D); wgt->poll = WIDGETGROUP_forcefield_poll; wgt->setup = WIDGETGROUP_forcefield_setup; diff --git a/source/blender/editors/space_view3d/view3d_gizmo_lamp.c b/source/blender/editors/space_view3d/view3d_gizmo_lamp.c index 8087fcbdddd..a872cc96172 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_lamp.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_lamp.c @@ -49,14 +49,14 @@ /* -------------------------------------------------------------------- */ -/** \name Spot Lamp Manipulators +/** \name Spot Lamp Gizmos * \{ */ -static bool WIDGETGROUP_lamp_spot_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt)) +static bool WIDGETGROUP_lamp_spot_poll(const bContext *C, wmGizmoGroupType *UNUSED(wgt)) { View3D *v3d = CTX_wm_view3d(C); if ((v3d->flag2 & V3D_RENDER_OVERRIDE) || - (v3d->mpr_flag & (V3D_MANIPULATOR_HIDE | V3D_MANIPULATOR_HIDE_CONTEXT))) + (v3d->mpr_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_CONTEXT))) { return false; } @@ -70,49 +70,49 @@ static bool WIDGETGROUP_lamp_spot_poll(const bContext *C, wmManipulatorGroupType return false; } -static void WIDGETGROUP_lamp_spot_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup) +static void WIDGETGROUP_lamp_spot_setup(const bContext *UNUSED(C), wmGizmoGroup *mgroup) { - wmManipulatorWrapper *wwrapper = MEM_mallocN(sizeof(wmManipulatorWrapper), __func__); + wmGizmoWrapper *wwrapper = MEM_mallocN(sizeof(wmGizmoWrapper), __func__); - wwrapper->manipulator = WM_manipulator_new("MANIPULATOR_WT_arrow_3d", mgroup, NULL); - wmManipulator *mpr = wwrapper->manipulator; - RNA_enum_set(mpr->ptr, "transform", ED_MANIPULATOR_ARROW_XFORM_FLAG_INVERTED); + wwrapper->gizmo = WM_gizmo_new("GIZMO_WT_arrow_3d", mgroup, NULL); + wmGizmo *mpr = wwrapper->gizmo; + RNA_enum_set(mpr->ptr, "transform", ED_GIZMO_ARROW_XFORM_FLAG_INVERTED); mgroup->customdata = wwrapper; - ED_manipulator_arrow3d_set_range_fac(mpr, 4.0f); + ED_gizmo_arrow3d_set_range_fac(mpr, 4.0f); - UI_GetThemeColor3fv(TH_MANIPULATOR_SECONDARY, mpr->color); + UI_GetThemeColor3fv(TH_GIZMO_SECONDARY, mpr->color); } -static void WIDGETGROUP_lamp_spot_refresh(const bContext *C, wmManipulatorGroup *mgroup) +static void WIDGETGROUP_lamp_spot_refresh(const bContext *C, wmGizmoGroup *mgroup) { - wmManipulatorWrapper *wwrapper = mgroup->customdata; - wmManipulator *mpr = wwrapper->manipulator; + wmGizmoWrapper *wwrapper = mgroup->customdata; + wmGizmo *mpr = wwrapper->gizmo; Object *ob = CTX_data_active_object(C); Lamp *la = ob->data; float dir[3]; negate_v3_v3(dir, ob->obmat[2]); - WM_manipulator_set_matrix_rotation_from_z_axis(mpr, dir); - WM_manipulator_set_matrix_location(mpr, ob->obmat[3]); + WM_gizmo_set_matrix_rotation_from_z_axis(mpr, dir); + WM_gizmo_set_matrix_location(mpr, ob->obmat[3]); /* need to set property here for undo. TODO would prefer to do this in _init */ PointerRNA lamp_ptr; const char *propname = "spot_size"; RNA_pointer_create(&la->id, &RNA_Light, la, &lamp_ptr); - WM_manipulator_target_property_def_rna(mpr, "offset", &lamp_ptr, propname, -1); + WM_gizmo_target_property_def_rna(mpr, "offset", &lamp_ptr, propname, -1); } -void VIEW3D_WGT_lamp_spot(wmManipulatorGroupType *wgt) +void VIEW3D_WGT_lamp_spot(wmGizmoGroupType *wgt) { wgt->name = "Spot Light Widgets"; wgt->idname = "VIEW3D_WGT_lamp_spot"; - wgt->flag |= (WM_MANIPULATORGROUPTYPE_PERSISTENT | - WM_MANIPULATORGROUPTYPE_3D | - WM_MANIPULATORGROUPTYPE_DEPTH_3D); + wgt->flag |= (WM_GIZMOGROUPTYPE_PERSISTENT | + WM_GIZMOGROUPTYPE_3D | + WM_GIZMOGROUPTYPE_DEPTH_3D); wgt->poll = WIDGETGROUP_lamp_spot_poll; wgt->setup = WIDGETGROUP_lamp_spot_setup; @@ -123,12 +123,12 @@ void VIEW3D_WGT_lamp_spot(wmManipulatorGroupType *wgt) /* -------------------------------------------------------------------- */ -/** \name Area Lamp Manipulators +/** \name Area Lamp Gizmos * \{ */ /* scale callbacks */ -static void manipulator_area_lamp_prop_matrix_get( - const wmManipulator *UNUSED(mpr), wmManipulatorProperty *mpr_prop, +static void gizmo_area_lamp_prop_matrix_get( + const wmGizmo *UNUSED(mpr), wmGizmoProperty *mpr_prop, void *value_p) { BLI_assert(mpr_prop->type->array_length == 16); @@ -139,8 +139,8 @@ static void manipulator_area_lamp_prop_matrix_get( matrix[1][1] = ELEM(la->area_shape, LA_AREA_RECT, LA_AREA_ELLIPSE) ? la->area_sizey : la->area_size; } -static void manipulator_area_lamp_prop_matrix_set( - const wmManipulator *UNUSED(mpr), wmManipulatorProperty *mpr_prop, +static void gizmo_area_lamp_prop_matrix_set( + const wmGizmo *UNUSED(mpr), wmGizmoProperty *mpr_prop, const void *value_p) { const float (*matrix)[4] = value_p; @@ -156,7 +156,7 @@ static void manipulator_area_lamp_prop_matrix_set( } } -static bool WIDGETGROUP_lamp_area_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt)) +static bool WIDGETGROUP_lamp_area_poll(const bContext *C, wmGizmoGroupType *UNUSED(wgt)) { View3D *v3d = CTX_wm_view3d(C); if (v3d->flag2 & V3D_RENDER_OVERRIDE) { @@ -171,56 +171,56 @@ static bool WIDGETGROUP_lamp_area_poll(const bContext *C, wmManipulatorGroupType return false; } -static void WIDGETGROUP_lamp_area_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup) +static void WIDGETGROUP_lamp_area_setup(const bContext *UNUSED(C), wmGizmoGroup *mgroup) { - wmManipulatorWrapper *wwrapper = MEM_mallocN(sizeof(wmManipulatorWrapper), __func__); - wwrapper->manipulator = WM_manipulator_new("MANIPULATOR_WT_cage_2d", mgroup, NULL); - wmManipulator *mpr = wwrapper->manipulator; + wmGizmoWrapper *wwrapper = MEM_mallocN(sizeof(wmGizmoWrapper), __func__); + wwrapper->gizmo = WM_gizmo_new("GIZMO_WT_cage_2d", mgroup, NULL); + wmGizmo *mpr = wwrapper->gizmo; RNA_enum_set(mpr->ptr, "transform", - ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE); + ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE); mgroup->customdata = wwrapper; - WM_manipulator_set_flag(mpr, WM_MANIPULATOR_DRAW_HOVER, true); + WM_gizmo_set_flag(mpr, WM_GIZMO_DRAW_HOVER, true); - UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, mpr->color); - UI_GetThemeColor3fv(TH_MANIPULATOR_HI, mpr->color_hi); + UI_GetThemeColor3fv(TH_GIZMO_PRIMARY, mpr->color); + UI_GetThemeColor3fv(TH_GIZMO_HI, mpr->color_hi); } -static void WIDGETGROUP_lamp_area_refresh(const bContext *C, wmManipulatorGroup *mgroup) +static void WIDGETGROUP_lamp_area_refresh(const bContext *C, wmGizmoGroup *mgroup) { - wmManipulatorWrapper *wwrapper = mgroup->customdata; + wmGizmoWrapper *wwrapper = mgroup->customdata; Object *ob = CTX_data_active_object(C); Lamp *la = ob->data; - wmManipulator *mpr = wwrapper->manipulator; + wmGizmo *mpr = wwrapper->gizmo; copy_m4_m4(mpr->matrix_basis, ob->obmat); - int flag = ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE; + int flag = ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE; if (ELEM(la->area_shape, LA_AREA_SQUARE, LA_AREA_DISK)) { - flag |= ED_MANIPULATOR_CAGE2D_XFORM_FLAG_SCALE_UNIFORM; + flag |= ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE_UNIFORM; } RNA_enum_set(mpr->ptr, "transform", flag); /* need to set property here for undo. TODO would prefer to do this in _init */ - WM_manipulator_target_property_def_func( + WM_gizmo_target_property_def_func( mpr, "matrix", - &(const struct wmManipulatorPropertyFnParams) { - .value_get_fn = manipulator_area_lamp_prop_matrix_get, - .value_set_fn = manipulator_area_lamp_prop_matrix_set, + &(const struct wmGizmoPropertyFnParams) { + .value_get_fn = gizmo_area_lamp_prop_matrix_get, + .value_set_fn = gizmo_area_lamp_prop_matrix_set, .range_get_fn = NULL, .user_data = la, }); } -void VIEW3D_WGT_lamp_area(wmManipulatorGroupType *wgt) +void VIEW3D_WGT_lamp_area(wmGizmoGroupType *wgt) { wgt->name = "Area Light Widgets"; wgt->idname = "VIEW3D_WGT_lamp_area"; - wgt->flag |= (WM_MANIPULATORGROUPTYPE_PERSISTENT | - WM_MANIPULATORGROUPTYPE_3D | - WM_MANIPULATORGROUPTYPE_DEPTH_3D); + wgt->flag |= (WM_GIZMOGROUPTYPE_PERSISTENT | + WM_GIZMOGROUPTYPE_3D | + WM_GIZMOGROUPTYPE_DEPTH_3D); wgt->poll = WIDGETGROUP_lamp_area_poll; wgt->setup = WIDGETGROUP_lamp_area_setup; @@ -232,10 +232,10 @@ void VIEW3D_WGT_lamp_area(wmManipulatorGroupType *wgt) /* -------------------------------------------------------------------- */ -/** \name Lamp Target Manipulator +/** \name Lamp Target Gizmo * \{ */ -static bool WIDGETGROUP_lamp_target_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt)) +static bool WIDGETGROUP_lamp_target_poll(const bContext *C, wmGizmoGroupType *UNUSED(wgt)) { View3D *v3d = CTX_wm_view3d(C); if (v3d->flag2 & V3D_RENDER_OVERRIDE) { @@ -258,46 +258,46 @@ static bool WIDGETGROUP_lamp_target_poll(const bContext *C, wmManipulatorGroupTy return false; } -static void WIDGETGROUP_lamp_target_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup) +static void WIDGETGROUP_lamp_target_setup(const bContext *UNUSED(C), wmGizmoGroup *mgroup) { - wmManipulatorWrapper *wwrapper = MEM_mallocN(sizeof(wmManipulatorWrapper), __func__); - wwrapper->manipulator = WM_manipulator_new("MANIPULATOR_WT_grab_3d", mgroup, NULL); - wmManipulator *mpr = wwrapper->manipulator; + wmGizmoWrapper *wwrapper = MEM_mallocN(sizeof(wmGizmoWrapper), __func__); + wwrapper->gizmo = WM_gizmo_new("GIZMO_WT_grab_3d", mgroup, NULL); + wmGizmo *mpr = wwrapper->gizmo; mgroup->customdata = wwrapper; - UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, mpr->color); - UI_GetThemeColor3fv(TH_MANIPULATOR_HI, mpr->color_hi); + UI_GetThemeColor3fv(TH_GIZMO_PRIMARY, mpr->color); + UI_GetThemeColor3fv(TH_GIZMO_HI, mpr->color_hi); mpr->scale_basis = 0.06f; wmOperatorType *ot = WM_operatortype_find("OBJECT_OT_transform_axis_target", true); RNA_enum_set(mpr->ptr, "draw_options", - ED_MANIPULATOR_GRAB_DRAW_FLAG_FILL | ED_MANIPULATOR_GRAB_DRAW_FLAG_ALIGN_VIEW); + ED_GIZMO_GRAB_DRAW_FLAG_FILL | ED_GIZMO_GRAB_DRAW_FLAG_ALIGN_VIEW); - WM_manipulator_operator_set(mpr, 0, ot, NULL); + WM_gizmo_operator_set(mpr, 0, ot, NULL); } -static void WIDGETGROUP_lamp_target_draw_prepare(const bContext *C, wmManipulatorGroup *mgroup) +static void WIDGETGROUP_lamp_target_draw_prepare(const bContext *C, wmGizmoGroup *mgroup) { - wmManipulatorWrapper *wwrapper = mgroup->customdata; + wmGizmoWrapper *wwrapper = mgroup->customdata; Object *ob = CTX_data_active_object(C); - wmManipulator *mpr = wwrapper->manipulator; + wmGizmo *mpr = wwrapper->gizmo; copy_m4_m4(mpr->matrix_basis, ob->obmat); unit_m4(mpr->matrix_offset); mpr->matrix_offset[3][2] = -2.4f / mpr->scale_basis; - WM_manipulator_set_flag(mpr, WM_MANIPULATOR_DRAW_OFFSET_SCALE, true); + WM_gizmo_set_flag(mpr, WM_GIZMO_DRAW_OFFSET_SCALE, true); } -void VIEW3D_WGT_lamp_target(wmManipulatorGroupType *wgt) +void VIEW3D_WGT_lamp_target(wmGizmoGroupType *wgt) { wgt->name = "Target Light Widgets"; wgt->idname = "VIEW3D_WGT_lamp_target"; - wgt->flag |= (WM_MANIPULATORGROUPTYPE_PERSISTENT | - WM_MANIPULATORGROUPTYPE_3D); + wgt->flag |= (WM_GIZMOGROUPTYPE_PERSISTENT | + WM_GIZMOGROUPTYPE_3D); wgt->poll = WIDGETGROUP_lamp_target_poll; wgt->setup = WIDGETGROUP_lamp_target_setup; diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c index db4eeef18f7..98669739745 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c @@ -47,17 +47,17 @@ #include "view3d_intern.h" /* own include */ /* -------------------------------------------------------------------- */ -/** \name View3D Navigation Manipulator Group +/** \name View3D Navigation Gizmo Group * \{ */ /* Offset from screen edge. */ -#define MANIPULATOR_OFFSET_FAC 1.5f +#define GIZMO_OFFSET_FAC 1.5f /* Size of main icon. */ -#define MANIPULATOR_SIZE 64 +#define GIZMO_SIZE 64 /* Factor for size of smaller button. */ -#define MANIPULATOR_MINI_FAC 0.35f +#define GIZMO_MINI_FAC 0.35f /* How much mini buttons offset from the primary. */ -#define MANIPULATOR_MINI_OFFSET_FAC 0.42f +#define GIZMO_MINI_OFFSET_FAC 0.42f enum { @@ -122,40 +122,40 @@ static const uchar shape_zoom[] = { }; -struct NavigateManipulatorInfo { +struct NavigateGizmoInfo { const char *opname; - const char *manipulator; + const char *gizmo; const unsigned char *shape; uint shape_size; }; #define SHAPE_VARS(shape_id) shape = shape_id, .shape_size = ARRAY_SIZE(shape_id) -struct NavigateManipulatorInfo g_navigate_params[MPR_TOTAL] = { +struct NavigateGizmoInfo g_navigate_params[MPR_TOTAL] = { { .opname = "VIEW3D_OT_move", - .manipulator = "MANIPULATOR_WT_button_2d", + .gizmo = "GIZMO_WT_button_2d", .SHAPE_VARS(shape_pan), }, { .opname = "VIEW3D_OT_rotate", - .manipulator = "VIEW3D_WT_navigate_rotate", + .gizmo = "VIEW3D_WT_navigate_rotate", .shape = NULL, .shape_size = 0, }, { .opname = "VIEW3D_OT_zoom", - .manipulator = "MANIPULATOR_WT_button_2d", + .gizmo = "GIZMO_WT_button_2d", .SHAPE_VARS(shape_zoom), }, { .opname = "VIEW3D_OT_view_persportho", - .manipulator = "MANIPULATOR_WT_button_2d", + .gizmo = "GIZMO_WT_button_2d", .SHAPE_VARS(shape_persp), }, { .opname = "VIEW3D_OT_view_persportho", - .manipulator = "MANIPULATOR_WT_button_2d", + .gizmo = "GIZMO_WT_button_2d", .SHAPE_VARS(shape_ortho), }, { .opname = "VIEW3D_OT_view_camera", - .manipulator = "MANIPULATOR_WT_button_2d", + .gizmo = "GIZMO_WT_button_2d", .SHAPE_VARS(shape_camera), }, }; @@ -163,7 +163,7 @@ struct NavigateManipulatorInfo g_navigate_params[MPR_TOTAL] = { #undef SHAPE_VARS struct NavigateWidgetGroup { - wmManipulator *mpr_array[MPR_TOTAL]; + wmGizmo *mpr_array[MPR_TOTAL]; /* Store the view state to check for changes. */ struct { rcti rect_visible; @@ -176,12 +176,12 @@ struct NavigateWidgetGroup { int region_size[2]; }; -static bool WIDGETGROUP_navigate_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt)) +static bool WIDGETGROUP_navigate_poll(const bContext *C, wmGizmoGroupType *UNUSED(wgt)) { View3D *v3d = CTX_wm_view3d(C); - if (((U.uiflag & USER_SHOW_MANIPULATOR_AXIS) == 0) || + if (((U.uiflag & USER_SHOW_GIZMO_AXIS) == 0) || (v3d->flag2 & V3D_RENDER_OVERRIDE) || - (v3d->mpr_flag & (V3D_MANIPULATOR_HIDE | V3D_MANIPULATOR_HIDE_NAVIGATE))) + (v3d->mpr_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_NAVIGATE))) { return false; } @@ -189,7 +189,7 @@ static bool WIDGETGROUP_navigate_poll(const bContext *C, wmManipulatorGroupType } -static void WIDGETGROUP_navigate_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup) +static void WIDGETGROUP_navigate_setup(const bContext *UNUSED(C), wmGizmoGroup *mgroup) { struct NavigateWidgetGroup *navgroup = MEM_callocN(sizeof(struct NavigateWidgetGroup), __func__); @@ -200,37 +200,37 @@ static void WIDGETGROUP_navigate_setup(const bContext *UNUSED(C), wmManipulatorG wmOperatorType *ot_view_camera = WM_operatortype_find("VIEW3D_OT_view_camera", true); for (int i = 0; i < MPR_TOTAL; i++) { - const struct NavigateManipulatorInfo *info = &g_navigate_params[i]; - navgroup->mpr_array[i] = WM_manipulator_new(info->manipulator, mgroup, NULL); - wmManipulator *mpr = navgroup->mpr_array[i]; - mpr->flag |= WM_MANIPULATOR_GRAB_CURSOR | WM_MANIPULATOR_DRAW_MODAL; + const struct NavigateGizmoInfo *info = &g_navigate_params[i]; + navgroup->mpr_array[i] = WM_gizmo_new(info->gizmo, mgroup, NULL); + wmGizmo *mpr = navgroup->mpr_array[i]; + mpr->flag |= WM_GIZMO_GRAB_CURSOR | WM_GIZMO_DRAW_MODAL; mpr->color[3] = 0.2f; mpr->color_hi[3] = 0.4f; /* may be overwritten later */ - mpr->scale_basis = (MANIPULATOR_SIZE * MANIPULATOR_MINI_FAC) / 2; + mpr->scale_basis = (GIZMO_SIZE * GIZMO_MINI_FAC) / 2; if (info->shape != NULL) { PropertyRNA *prop = RNA_struct_find_property(mpr->ptr, "shape"); RNA_property_string_set_bytes( mpr->ptr, prop, (const char *)info->shape, info->shape_size); - RNA_enum_set(mpr->ptr, "draw_options", ED_MANIPULATOR_BUTTON_SHOW_OUTLINE); + RNA_enum_set(mpr->ptr, "draw_options", ED_GIZMO_BUTTON_SHOW_OUTLINE); } wmOperatorType *ot = WM_operatortype_find(info->opname, true); - WM_manipulator_operator_set(mpr, 0, ot, NULL); + WM_gizmo_operator_set(mpr, 0, ot, NULL); } { - wmManipulator *mpr = navgroup->mpr_array[MPR_CAMERA]; - WM_manipulator_operator_set(mpr, 0, ot_view_camera, NULL); + wmGizmo *mpr = navgroup->mpr_array[MPR_CAMERA]; + WM_gizmo_operator_set(mpr, 0, ot_view_camera, NULL); } /* Click only buttons (not modal). */ { int mpr_ids[] = {MPR_PERSP, MPR_ORTHO, MPR_CAMERA}; for (int i = 0; i < ARRAY_SIZE(mpr_ids); i++) { - wmManipulator *mpr = navgroup->mpr_array[mpr_ids[i]]; + wmGizmo *mpr = navgroup->mpr_array[mpr_ids[i]]; RNA_boolean_set(mpr->ptr, "show_drag", false); } } @@ -239,15 +239,15 @@ static void WIDGETGROUP_navigate_setup(const bContext *UNUSED(C), wmManipulatorG { int mpr_ids[] = {MPR_MOVE, MPR_ROTATE, MPR_ZOOM}; for (int i = 0; i < ARRAY_SIZE(mpr_ids); i++) { - wmManipulator *mpr = navgroup->mpr_array[mpr_ids[i]]; - wmManipulatorOpElem *mpop = WM_manipulator_operator_get(mpr, 0); + wmGizmo *mpr = navgroup->mpr_array[mpr_ids[i]]; + wmGizmoOpElem *mpop = WM_gizmo_operator_get(mpr, 0); RNA_boolean_set(&mpop->ptr, "use_mouse_init", false); } } { - wmManipulator *mpr = navgroup->mpr_array[MPR_ROTATE]; - mpr->scale_basis = MANIPULATOR_SIZE / 2; + wmGizmo *mpr = navgroup->mpr_array[MPR_ROTATE]; + mpr->scale_basis = GIZMO_SIZE / 2; char mapping[6] = { RV3D_VIEW_LEFT, RV3D_VIEW_RIGHT, @@ -258,7 +258,7 @@ static void WIDGETGROUP_navigate_setup(const bContext *UNUSED(C), wmManipulatorG }; for (int part_index = 0; part_index < 6; part_index += 1) { - PointerRNA *ptr = WM_manipulator_operator_set(mpr, part_index + 1, ot_view_axis, NULL); + PointerRNA *ptr = WM_gizmo_operator_set(mpr, part_index + 1, ot_view_axis, NULL); RNA_enum_set(ptr, "type", mapping[part_index]); } @@ -269,7 +269,7 @@ static void WIDGETGROUP_navigate_setup(const bContext *UNUSED(C), wmManipulatorG mgroup->customdata = navgroup; } -static void WIDGETGROUP_navigate_draw_prepare(const bContext *C, wmManipulatorGroup *mgroup) +static void WIDGETGROUP_navigate_draw_prepare(const bContext *C, wmGizmoGroup *mgroup) { struct NavigateWidgetGroup *navgroup = mgroup->customdata; ARegion *ar = CTX_wm_region(C); @@ -300,9 +300,9 @@ static void WIDGETGROUP_navigate_draw_prepare(const bContext *C, wmManipulatorGr ((rv3d->viewlock & RV3D_LOCKED) == 0) && (navgroup->state.rv3d.is_camera == false)); const bool show_fixed_offset = navgroup->state.rv3d.is_camera; - const float icon_size = MANIPULATOR_SIZE; - const float icon_offset = (icon_size * 0.52f) * MANIPULATOR_OFFSET_FAC * UI_DPI_FAC; - const float icon_offset_mini = icon_size * MANIPULATOR_MINI_OFFSET_FAC * UI_DPI_FAC; + const float icon_size = GIZMO_SIZE; + const float icon_offset = (icon_size * 0.52f) * GIZMO_OFFSET_FAC * UI_DPI_FAC; + const float icon_offset_mini = icon_size * GIZMO_MINI_OFFSET_FAC * UI_DPI_FAC; const float co_rotate[2] = { rect_visible.xmax - icon_offset, rect_visible.ymax - icon_offset, @@ -312,11 +312,11 @@ static void WIDGETGROUP_navigate_draw_prepare(const bContext *C, wmManipulatorGr rect_visible.ymax - icon_offset_mini * 0.75f, }; - wmManipulator *mpr; + wmGizmo *mpr; for (uint i = 0; i < ARRAY_SIZE(navgroup->mpr_array); i++) { mpr = navgroup->mpr_array[i]; - WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, true); + WM_gizmo_set_flag(mpr, WM_GIZMO_HIDDEN, true); } /* RV3D_LOCKED or Camera: only show supported buttons. */ @@ -324,7 +324,7 @@ static void WIDGETGROUP_navigate_draw_prepare(const bContext *C, wmManipulatorGr mpr = navgroup->mpr_array[MPR_ROTATE]; mpr->matrix_basis[3][0] = co_rotate[0]; mpr->matrix_basis[3][1] = co_rotate[1]; - WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, false); + WM_gizmo_set_flag(mpr, WM_GIZMO_HIDDEN, false); } int icon_mini_slot = 0; @@ -332,36 +332,36 @@ static void WIDGETGROUP_navigate_draw_prepare(const bContext *C, wmManipulatorGr mpr = navgroup->mpr_array[MPR_ZOOM]; mpr->matrix_basis[3][0] = co[0] - (icon_offset_mini * icon_mini_slot++); mpr->matrix_basis[3][1] = co[1]; - WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, false); + WM_gizmo_set_flag(mpr, WM_GIZMO_HIDDEN, false); mpr = navgroup->mpr_array[MPR_MOVE]; mpr->matrix_basis[3][0] = co[0] - (icon_offset_mini * icon_mini_slot++); mpr->matrix_basis[3][1] = co[1]; - WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, false); + WM_gizmo_set_flag(mpr, WM_GIZMO_HIDDEN, false); if ((rv3d->viewlock & RV3D_LOCKED) == 0) { mpr = navgroup->mpr_array[MPR_CAMERA]; mpr->matrix_basis[3][0] = co[0] - (icon_offset_mini * icon_mini_slot++); mpr->matrix_basis[3][1] = co[1]; - WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, false); + WM_gizmo_set_flag(mpr, WM_GIZMO_HIDDEN, false); if (navgroup->state.rv3d.is_camera == false) { mpr = navgroup->mpr_array[rv3d->is_persp ? MPR_PERSP : MPR_ORTHO]; mpr->matrix_basis[3][0] = co[0] - (icon_offset_mini * icon_mini_slot++); mpr->matrix_basis[3][1] = co[1]; - WM_manipulator_set_flag(mpr, WM_MANIPULATOR_HIDDEN, false); + WM_gizmo_set_flag(mpr, WM_GIZMO_HIDDEN, false); } } } -void VIEW3D_WGT_navigate(wmManipulatorGroupType *wgt) +void VIEW3D_WGT_navigate(wmGizmoGroupType *wgt) { wgt->name = "View3D Navigate"; wgt->idname = "VIEW3D_WGT_navigate"; - wgt->flag |= (WM_MANIPULATORGROUPTYPE_PERSISTENT | - WM_MANIPULATORGROUPTYPE_SCALE | - WM_MANIPULATORGROUPTYPE_DRAW_MODAL_ALL); + wgt->flag |= (WM_GIZMOGROUPTYPE_PERSISTENT | + WM_GIZMOGROUPTYPE_SCALE | + WM_GIZMOGROUPTYPE_DRAW_MODAL_ALL); wgt->poll = WIDGETGROUP_navigate_poll; wgt->setup = WIDGETGROUP_navigate_setup; diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c index 072f2ee4583..0136b235cc0 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c @@ -21,9 +21,9 @@ /** \file view3d_gizmo_navigate_type.c * \ingroup wm * - * \name Custom Orientation/Navigation Manipulator for the 3D View + * \name Custom Orientation/Navigation Gizmo for the 3D View * - * \brief Simple manipulator to axis and translate. + * \brief Simple gizmo to axis and translate. * * - scale_basis: used for the size. * - matrix_basis: used for the location. @@ -63,7 +63,7 @@ #define HANDLE_SIZE 0.33 static void axis_geom_draw( - const wmManipulator *mpr, const float color[4], const bool UNUSED(select)) + const wmGizmo *mpr, const float color[4], const bool UNUSED(select)) { GPU_line_width(mpr->line_width); @@ -199,7 +199,7 @@ static void axis_geom_draw( } static void axis3d_draw_intern( - const bContext *UNUSED(C), wmManipulator *mpr, + const bContext *UNUSED(C), wmGizmo *mpr, const bool select, const bool highlight) { const float *color = highlight ? mpr->color_hi : mpr->color; @@ -208,9 +208,9 @@ static void axis3d_draw_intern( unit_m4(matrix_unit); - WM_manipulator_calc_matrix_final_params( + WM_gizmo_calc_matrix_final_params( mpr, - &((struct WM_ManipulatorMatrixParams) { + &((struct WM_GizmoMatrixParams) { .matrix_offset = matrix_unit, }), matrix_final); @@ -223,10 +223,10 @@ static void axis3d_draw_intern( gpuPopMatrix(); } -static void manipulator_axis_draw(const bContext *C, wmManipulator *mpr) +static void gizmo_axis_draw(const bContext *C, wmGizmo *mpr) { - const bool is_modal = mpr->state & WM_MANIPULATOR_STATE_MODAL; - const bool is_highlight = (mpr->state & WM_MANIPULATOR_STATE_HIGHLIGHT) != 0; + const bool is_modal = mpr->state & WM_GIZMO_STATE_MODAL; + const bool is_highlight = (mpr->state & WM_GIZMO_STATE_HIGHLIGHT) != 0; (void)is_modal; @@ -235,8 +235,8 @@ static void manipulator_axis_draw(const bContext *C, wmManipulator *mpr) GPU_blend(false); } -static int manipulator_axis_test_select( - bContext *UNUSED(C), wmManipulator *mpr, const wmEvent *event) +static int gizmo_axis_test_select( + bContext *UNUSED(C), wmGizmo *mpr, const wmEvent *event) { float point_local[2] = {UNPACK2(event->mval)}; sub_v2_v2(point_local, mpr->matrix_basis[3]); @@ -288,7 +288,7 @@ static int manipulator_axis_test_select( return -1; } -static int manipulator_axis_cursor_get(wmManipulator *mpr) +static int gizmo_axis_cursor_get(wmGizmo *mpr) { if (mpr->highlight_part > 0) { return CURSOR_EDIT; @@ -296,15 +296,15 @@ static int manipulator_axis_cursor_get(wmManipulator *mpr) return BC_NSEW_SCROLLCURSOR; } -void VIEW3D_WT_navigate_rotate(wmManipulatorType *wt) +void VIEW3D_WT_navigate_rotate(wmGizmoType *wt) { /* identifiers */ wt->idname = "VIEW3D_WT_navigate_rotate"; /* api callbacks */ - wt->draw = manipulator_axis_draw; - wt->test_select = manipulator_axis_test_select; - wt->cursor_get = manipulator_axis_cursor_get; + wt->draw = gizmo_axis_draw; + wt->test_select = gizmo_axis_test_select; + wt->cursor_get = gizmo_axis_cursor_get; - wt->struct_size = sizeof(wmManipulator); + wt->struct_size = sizeof(wmGizmo); } diff --git a/source/blender/editors/space_view3d/view3d_gizmo_ruler.c b/source/blender/editors/space_view3d/view3d_gizmo_ruler.c index c29b07e4147..ac6a984bea5 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_ruler.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_ruler.c @@ -93,7 +93,7 @@ enum { #define PART_LINE 0xff /* -------------------------------------------------------------------- */ -/* Ruler Info (wmManipulatorGroup customdata) */ +/* Ruler Info (wmGizmoGroup customdata) */ enum { RULER_STATE_NORMAL = 0, @@ -123,7 +123,7 @@ typedef struct RulerInfo { /* Ruler Item (two or three points) */ typedef struct RulerItem { - wmManipulator mpr; + wmGizmo mpr; /* worldspace coords, middle being optional */ float co[3][3]; @@ -143,18 +143,18 @@ typedef struct RulerInteraction { /** \name Internal Ruler Utilities * \{ */ -static RulerItem *ruler_item_add(wmManipulatorGroup *mgroup) +static RulerItem *ruler_item_add(wmGizmoGroup *mgroup) { /* could pass this as an arg */ - const wmManipulatorType *wt_ruler = WM_manipulatortype_find("VIEW3D_WT_ruler_item", true); - RulerItem *ruler_item = (RulerItem *)WM_manipulator_new_ptr(wt_ruler, mgroup, NULL); - WM_manipulator_set_flag(&ruler_item->mpr, WM_MANIPULATOR_DRAW_MODAL, true); + const wmGizmoType *wt_ruler = WM_gizmotype_find("VIEW3D_WT_ruler_item", true); + RulerItem *ruler_item = (RulerItem *)WM_gizmo_new_ptr(wt_ruler, mgroup, NULL); + WM_gizmo_set_flag(&ruler_item->mpr, WM_GIZMO_DRAW_MODAL, true); return ruler_item; } -static void ruler_item_remove(bContext *C, wmManipulatorGroup *mgroup, RulerItem *ruler_item) +static void ruler_item_remove(bContext *C, wmGizmoGroup *mgroup, RulerItem *ruler_item) { - WM_manipulator_unlink(&mgroup->manipulators, mgroup->parent_mmap, &ruler_item->mpr, C); + WM_gizmo_unlink(&mgroup->gizmos, mgroup->parent_mmap, &ruler_item->mpr, C); } static void ruler_item_as_string(RulerItem *ruler_item, UnitSettings *unit, @@ -192,7 +192,7 @@ static void ruler_item_as_string(RulerItem *ruler_item, UnitSettings *unit, } static bool view3d_ruler_pick( - wmManipulatorGroup *mgroup, RulerItem *ruler_item, const float mval[2], + wmGizmoGroup *mgroup, RulerItem *ruler_item, const float mval[2], int *r_co_index) { RulerInfo *ruler_info = mgroup->customdata; @@ -380,7 +380,7 @@ static bool view3d_ruler_item_mousemove( * \{ */ #define RULER_ID "RulerData3D" -static bool view3d_ruler_to_gpencil(bContext *C, wmManipulatorGroup *mgroup) +static bool view3d_ruler_to_gpencil(bContext *C, wmGizmoGroup *mgroup) { // RulerInfo *ruler_info = mgroup->customdata; Main *bmain = CTX_data_main(C); @@ -419,7 +419,7 @@ static bool view3d_ruler_to_gpencil(bContext *C, wmManipulatorGroup *mgroup) gpf = BKE_gpencil_layer_getframe(gpl, CFRA, true); BKE_gpencil_free_strokes(gpf); - for (ruler_item = mgroup->manipulators.first; ruler_item; ruler_item = (RulerItem *)ruler_item->mpr.next) { + for (ruler_item = mgroup->gizmos.first; ruler_item; ruler_item = (RulerItem *)ruler_item->mpr.next) { bGPDspoint *pt; int j; @@ -457,7 +457,7 @@ static bool view3d_ruler_to_gpencil(bContext *C, wmManipulatorGroup *mgroup) return changed; } -static bool view3d_ruler_from_gpencil(const bContext *C, wmManipulatorGroup *mgroup) +static bool view3d_ruler_from_gpencil(const bContext *C, wmGizmoGroup *mgroup) { Scene *scene = CTX_data_scene(C); bool changed = false; @@ -503,10 +503,10 @@ static bool view3d_ruler_from_gpencil(const bContext *C, wmManipulatorGroup *mgr /** \} */ /* -------------------------------------------------------------------- */ -/** \name Ruler Item Manipulator Type +/** \name Ruler Item Gizmo Type * \{ */ -static void manipulator_ruler_draw(const bContext *C, wmManipulator *mpr) +static void gizmo_ruler_draw(const bContext *C, wmGizmo *mpr) { Scene *scene = CTX_data_scene(C); UnitSettings *unit = &scene->unit; @@ -536,7 +536,7 @@ static void manipulator_ruler_draw(const bContext *C, wmManipulator *mpr) UI_GetThemeColor3ubv(TH_TEXT, color_text); UI_GetThemeColor3ubv(TH_WIRE, color_wire); - const bool is_act = (mpr->flag & WM_MANIPULATOR_DRAW_HOVER); + const bool is_act = (mpr->flag & WM_GIZMO_DRAW_HOVER); float dir_ruler[2]; float co_ss[3][2]; int j; @@ -804,8 +804,8 @@ static void manipulator_ruler_draw(const bContext *C, wmManipulator *mpr) } } -static int manipulator_ruler_test_select( - bContext *UNUSED(C), wmManipulator *mpr, const wmEvent *event) +static int gizmo_ruler_test_select( + bContext *UNUSED(C), wmGizmo *mpr, const wmEvent *event) { RulerItem *ruler_item_pick = (RulerItem *)mpr; float mval_fl[2] = {UNPACK2(event->mval)}; @@ -825,9 +825,9 @@ static int manipulator_ruler_test_select( return -1; } -static int manipulator_ruler_modal( - bContext *C, wmManipulator *mpr, const wmEvent *event, - eWM_ManipulatorTweak UNUSED(tweak_flag)) +static int gizmo_ruler_modal( + bContext *C, wmGizmo *mpr, const wmEvent *event, + eWM_GizmoFlagTweak UNUSED(tweak_flag)) { bool do_draw = false; int exit_code = OPERATOR_RUNNING_MODAL; @@ -859,10 +859,10 @@ static int manipulator_ruler_modal( return exit_code; } -static int manipulator_ruler_invoke( - bContext *C, wmManipulator *mpr, const wmEvent *event) +static int gizmo_ruler_invoke( + bContext *C, wmGizmo *mpr, const wmEvent *event) { - wmManipulatorGroup *mgroup = mpr->parent_mgroup; + wmGizmoGroup *mgroup = mpr->parent_mgroup; RulerInfo *ruler_info = mgroup->customdata; RulerItem *ruler_item_pick = (RulerItem *)mpr; RulerInteraction *inter = MEM_callocN(sizeof(RulerInteraction), __func__); @@ -913,9 +913,9 @@ static int manipulator_ruler_invoke( return OPERATOR_RUNNING_MODAL; } -static void manipulator_ruler_exit(bContext *C, wmManipulator *mpr, const bool cancel) +static void gizmo_ruler_exit(bContext *C, wmGizmo *mpr, const bool cancel) { - wmManipulatorGroup *mgroup = mpr->parent_mgroup; + wmGizmoGroup *mgroup = mpr->parent_mgroup; RulerInfo *ruler_info = mgroup->customdata; if (!cancel) { @@ -941,7 +941,7 @@ static void manipulator_ruler_exit(bContext *C, wmManipulator *mpr, const bool c } ruler_state_set(C, ruler_info, RULER_STATE_NORMAL); } - /* We could convert only the current manipulator, for now just re-generate. */ + /* We could convert only the current gizmo, for now just re-generate. */ view3d_ruler_to_gpencil(C, mgroup); } @@ -952,7 +952,7 @@ static void manipulator_ruler_exit(bContext *C, wmManipulator *mpr, const bool c ruler_state_set(C, ruler_info, RULER_STATE_NORMAL); } -static int manipulator_ruler_cursor_get(wmManipulator *mpr) +static int gizmo_ruler_cursor_get(wmGizmo *mpr) { if (mpr->highlight_part == PART_LINE) { return BC_CROSSCURSOR; @@ -960,18 +960,18 @@ static int manipulator_ruler_cursor_get(wmManipulator *mpr) return BC_NSEW_SCROLLCURSOR; } -void VIEW3D_WT_ruler_item(wmManipulatorType *wt) +void VIEW3D_WT_ruler_item(wmGizmoType *wt) { /* identifiers */ wt->idname = "VIEW3D_WT_ruler_item"; /* api callbacks */ - wt->draw = manipulator_ruler_draw; - wt->test_select = manipulator_ruler_test_select; - wt->modal = manipulator_ruler_modal; - wt->invoke = manipulator_ruler_invoke; - wt->exit = manipulator_ruler_exit; - wt->cursor_get = manipulator_ruler_cursor_get; + wt->draw = gizmo_ruler_draw; + wt->test_select = gizmo_ruler_test_select; + wt->modal = gizmo_ruler_modal; + wt->invoke = gizmo_ruler_invoke; + wt->exit = gizmo_ruler_exit; + wt->cursor_get = gizmo_ruler_cursor_get; wt->struct_size = sizeof(RulerItem); } @@ -979,22 +979,22 @@ void VIEW3D_WT_ruler_item(wmManipulatorType *wt) /** \} */ /* -------------------------------------------------------------------- */ -/** \name Ruler Manipulator Group +/** \name Ruler Gizmo Group * \{ */ -static bool WIDGETGROUP_ruler_poll(const bContext *C, wmManipulatorGroupType *wgt) +static bool WIDGETGROUP_ruler_poll(const bContext *C, wmGizmoGroupType *wgt) { bToolRef_Runtime *tref_rt = WM_toolsystem_runtime_from_context((bContext *)C); if ((tref_rt == NULL) || - !STREQ(wgt->idname, tref_rt->manipulator_group)) + !STREQ(wgt->idname, tref_rt->gizmo_group)) { - WM_manipulator_group_type_unlink_delayed_ptr(wgt); + WM_gizmo_group_type_unlink_delayed_ptr(wgt); return false; } return true; } -static void WIDGETGROUP_ruler_setup(const bContext *C, wmManipulatorGroup *mgroup) +static void WIDGETGROUP_ruler_setup(const bContext *C, wmGizmoGroup *mgroup) { RulerInfo *ruler_info = MEM_callocN(sizeof(RulerInfo), __func__); @@ -1012,12 +1012,12 @@ static void WIDGETGROUP_ruler_setup(const bContext *C, wmManipulatorGroup *mgrou mgroup->customdata = ruler_info; } -void VIEW3D_WGT_ruler(wmManipulatorGroupType *wgt) +void VIEW3D_WGT_ruler(wmGizmoGroupType *wgt) { wgt->name = "Ruler Widgets"; wgt->idname = view3d_wgt_ruler_id; - wgt->flag |= WM_MANIPULATORGROUPTYPE_SCALE | WM_MANIPULATORGROUPTYPE_DRAW_MODAL_ALL; + wgt->flag |= WM_GIZMOGROUPTYPE_SCALE | WM_GIZMOGROUPTYPE_DRAW_MODAL_ALL; wgt->mmap_params.spaceid = SPACE_VIEW3D; wgt->mmap_params.regionid = RGN_TYPE_WINDOW; @@ -1036,7 +1036,7 @@ static bool view3d_ruler_poll(bContext *C) { bToolRef_Runtime *tref_rt = WM_toolsystem_runtime_from_context((bContext *)C); if ((tref_rt == NULL) || - !STREQ(view3d_wgt_ruler_id, tref_rt->manipulator_group) || + !STREQ(view3d_wgt_ruler_id, tref_rt->gizmo_group) || CTX_wm_region_view3d(C) == NULL) { return false; @@ -1050,8 +1050,8 @@ static int view3d_ruler_add_invoke(bContext *C, wmOperator *UNUSED(op), const wm View3D *v3d = CTX_wm_view3d(C); RegionView3D *rv3d = ar->regiondata; - wmManipulatorMap *mmap = ar->manipulator_map; - wmManipulatorGroup *mgroup = WM_manipulatormap_group_find(mmap, view3d_wgt_ruler_id); + wmGizmoMap *mmap = ar->gizmo_map; + wmGizmoGroup *mgroup = WM_gizmomap_group_find(mmap, view3d_wgt_ruler_id); const bool use_depth = (v3d->drawtype >= OB_SOLID); /* Create new line */ @@ -1059,9 +1059,9 @@ static int view3d_ruler_add_invoke(bContext *C, wmOperator *UNUSED(op), const wm ruler_item = ruler_item_add(mgroup); /* This is a little weak, but there is no real good way to tweak directly. */ - WM_manipulator_highlight_set(mmap, &ruler_item->mpr); + WM_gizmo_highlight_set(mmap, &ruler_item->mpr); if (WM_operator_name_call( - C, "MANIPULATORGROUP_OT_manipulator_tweak", + C, "GIZMOGROUP_OT_gizmo_tweak", WM_OP_INVOKE_REGION_WIN, NULL) == OPERATOR_RUNNING_MODAL) { RulerInfo *ruler_info = mgroup->customdata; diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index a2dda8d6403..c9277235d50 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -308,7 +308,7 @@ static void uiTemplatePaintModeSelection(uiLayout *layout, struct bContext *C) ViewLayer *view_layer = CTX_data_view_layer(C); Object *ob = OBACT(view_layer); - /* Manipulators aren't used in paint modes */ + /* Gizmos aren't used in paint modes */ if (!ELEM(ob->mode, OB_MODE_SCULPT, OB_MODE_PARTICLE_EDIT)) { /* masks aren't used for sculpt and particle painting */ PointerRNA meshptr; @@ -391,9 +391,9 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C) else { /* Moved to popover and topbar. */ #if 0 - /* Transform widget / manipulators */ + /* Transform widget / gizmos */ row = uiLayoutRow(layout, true); - uiItemR(row, &v3dptr, "show_manipulator", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); + uiItemR(row, &v3dptr, "show_gizmo", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); uiItemR(row, &sceneptr, "transform_orientation", 0, "", ICON_NONE); #endif } diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index b74a40969a1..89dd254c130 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -51,8 +51,8 @@ struct Mesh; struct ViewLayer; struct wmOperatorType; struct wmKeyConfig; -struct wmManipulatorGroupType; -struct wmManipulatorType; +struct wmGizmoGroupType; +struct wmGizmoType; struct wmWindowManager; /* drawing flags: */ @@ -254,21 +254,21 @@ ARegion *view3d_has_tools_region(ScrArea *sa); extern const char *view3d_context_dir[]; /* doc access */ /* view3d_widgets.c */ -void VIEW3D_WGT_lamp_spot(struct wmManipulatorGroupType *wgt); -void VIEW3D_WGT_lamp_area(struct wmManipulatorGroupType *wgt); -void VIEW3D_WGT_lamp_target(struct wmManipulatorGroupType *wgt); -void VIEW3D_WGT_camera(struct wmManipulatorGroupType *wgt); -void VIEW3D_WGT_camera_view(struct wmManipulatorGroupType *wgt); -void VIEW3D_WGT_force_field(struct wmManipulatorGroupType *wgt); -void VIEW3D_WGT_empty_image(struct wmManipulatorGroupType *wgt); -void VIEW3D_WGT_armature_spline(struct wmManipulatorGroupType *wgt); -void VIEW3D_WGT_navigate(struct wmManipulatorGroupType *wgt); - -void VIEW3D_WGT_ruler(struct wmManipulatorGroupType *wgt); -void VIEW3D_WT_ruler_item(struct wmManipulatorType *wt); +void VIEW3D_WGT_lamp_spot(struct wmGizmoGroupType *wgt); +void VIEW3D_WGT_lamp_area(struct wmGizmoGroupType *wgt); +void VIEW3D_WGT_lamp_target(struct wmGizmoGroupType *wgt); +void VIEW3D_WGT_camera(struct wmGizmoGroupType *wgt); +void VIEW3D_WGT_camera_view(struct wmGizmoGroupType *wgt); +void VIEW3D_WGT_force_field(struct wmGizmoGroupType *wgt); +void VIEW3D_WGT_empty_image(struct wmGizmoGroupType *wgt); +void VIEW3D_WGT_armature_spline(struct wmGizmoGroupType *wgt); +void VIEW3D_WGT_navigate(struct wmGizmoGroupType *wgt); + +void VIEW3D_WGT_ruler(struct wmGizmoGroupType *wgt); +void VIEW3D_WT_ruler_item(struct wmGizmoType *wt); void VIEW3D_OT_ruler_add(struct wmOperatorType *ot); -void VIEW3D_WT_navigate_rotate(struct wmManipulatorType *wt); +void VIEW3D_WT_navigate_rotate(struct wmGizmoType *wt); /* draw_volume.c */ void draw_smoke_volume(struct SmokeDomainSettings *sds, struct Object *ob, diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index fb9cf917701..cf9b8afe8e5 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -541,7 +541,7 @@ void view3d_keymap(wmKeyConfig *keyconf) #else kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", ACCENTGRAVEKEY, KM_PRESS, KM_CTRL, 0); #endif - RNA_string_set(kmi->ptr, "data_path", "space_data.show_manipulator_tool"); + RNA_string_set(kmi->ptr, "data_path", "space_data.show_gizmo_tool"); transform_keymap_for_space(keyconf, keymap, SPACE_VIEW3D); |