diff options
Diffstat (limited to 'source/blender/editors/transform/transform_gizmo_3d.c')
-rw-r--r-- | source/blender/editors/transform/transform_gizmo_3d.c | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c index 6cfac524ce4..fbd104290fb 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.c +++ b/source/blender/editors/transform/transform_gizmo_3d.c @@ -185,16 +185,16 @@ typedef struct GizmoGroup { wmGizmo *axis; \ int axis_idx; \ for (axis_idx = 0; axis_idx < MAN_AXIS_LAST; axis_idx++) { \ - axis = gizmo_get_axis_from_index(man, axis_idx); + axis = gizmo_get_axis_from_index(ggd, axis_idx); #define MAN_ITER_AXES_END \ } \ } ((void)0) -static wmGizmo *gizmo_get_axis_from_index(const GizmoGroup *man, const short axis_idx) +static wmGizmo *gizmo_get_axis_from_index(const GizmoGroup *ggd, const short axis_idx) { BLI_assert(IN_RANGE_INCL(axis_idx, (float)MAN_AXIS_TRANS_X, (float)MAN_AXIS_LAST)); - return man->gizmos[axis_idx]; + return ggd->gizmos[axis_idx]; } static short gizmo_get_axis_type(const int axis_idx, const int axis_type_default) @@ -1245,9 +1245,9 @@ static void gizmo_xform_message_subscribe( static GizmoGroup *gizmogroup_init(wmGizmoGroup *gzgroup) { - GizmoGroup *man; + GizmoGroup *ggd; - man = MEM_callocN(sizeof(GizmoGroup), "gizmo_data"); + ggd = MEM_callocN(sizeof(GizmoGroup), "gizmo_data"); const wmGizmoType *gzt_arrow = WM_gizmotype_find("GIZMO_GT_arrow_3d", true); const wmGizmoType *gzt_dial = WM_gizmotype_find("GIZMO_GT_dial_3d", true); @@ -1256,20 +1256,20 @@ static GizmoGroup *gizmogroup_init(wmGizmoGroup *gzgroup) /* Fallback action. */ { const wmGizmoType *gzt_mask = WM_gizmotype_find("GIZMO_GT_blank_3d", true); - man->gizmos[MAN_AXIS_APRON_C] = WM_gizmo_new_ptr(gzt_mask, gzgroup, NULL); + ggd->gizmos[MAN_AXIS_APRON_C] = WM_gizmo_new_ptr(gzt_mask, gzgroup, NULL); } #define GIZMO_NEW_ARROW(v, draw_style) { \ - man->gizmos[v] = WM_gizmo_new_ptr(gzt_arrow, gzgroup, NULL); \ - RNA_enum_set(man->gizmos[v]->ptr, "draw_style", draw_style); \ + ggd->gizmos[v] = WM_gizmo_new_ptr(gzt_arrow, gzgroup, NULL); \ + RNA_enum_set(ggd->gizmos[v]->ptr, "draw_style", draw_style); \ } ((void)0) #define GIZMO_NEW_DIAL(v, draw_options) { \ - man->gizmos[v] = WM_gizmo_new_ptr(gzt_dial, gzgroup, NULL); \ - RNA_enum_set(man->gizmos[v]->ptr, "draw_options", draw_options); \ + ggd->gizmos[v] = WM_gizmo_new_ptr(gzt_dial, gzgroup, NULL); \ + RNA_enum_set(ggd->gizmos[v]->ptr, "draw_options", draw_options); \ } ((void)0) #define GIZMO_NEW_PRIM(v, draw_style) { \ - man->gizmos[v] = WM_gizmo_new_ptr(gzt_prim, gzgroup, NULL); \ - RNA_enum_set(man->gizmos[v]->ptr, "draw_style", draw_style); \ + ggd->gizmos[v] = WM_gizmo_new_ptr(gzt_prim, gzgroup, NULL); \ + RNA_enum_set(ggd->gizmos[v]->ptr, "draw_style", draw_style); \ } ((void)0) /* add/init widgets - order matters! */ @@ -1302,9 +1302,9 @@ static GizmoGroup *gizmogroup_init(wmGizmoGroup *gzgroup) GIZMO_NEW_PRIM(MAN_AXIS_TRANS_YZ, ED_GIZMO_PRIMITIVE_STYLE_PLANE); GIZMO_NEW_PRIM(MAN_AXIS_TRANS_ZX, ED_GIZMO_PRIMITIVE_STYLE_PLANE); - man->gizmos[MAN_AXIS_ROT_T]->flag |= WM_GIZMO_SELECT_BACKGROUND; + ggd->gizmos[MAN_AXIS_ROT_T]->flag |= WM_GIZMO_SELECT_BACKGROUND; - return man; + return ggd; } /** @@ -1345,24 +1345,24 @@ static void gizmogroup_init_properties_from_twtype(wmGizmoGroup *gzgroup) struct { wmOperatorType *translate, *rotate, *trackball, *resize; } ot_store = {NULL}; - GizmoGroup *man = gzgroup->customdata; + GizmoGroup *ggd = gzgroup->customdata; - if (man->twtype & SCE_MANIP_TRANSLATE) { - man->axis_type_default = MAN_AXES_TRANSLATE; + if (ggd->twtype & SCE_MANIP_TRANSLATE) { + ggd->axis_type_default = MAN_AXES_TRANSLATE; } - else if (man->twtype & SCE_MANIP_ROTATE) { - man->axis_type_default = MAN_AXES_ROTATE; + else if (ggd->twtype & SCE_MANIP_ROTATE) { + ggd->axis_type_default = MAN_AXES_ROTATE; } - else if (man->twtype & SCE_MANIP_SCALE) { - man->axis_type_default = MAN_AXES_SCALE; + else if (ggd->twtype & SCE_MANIP_SCALE) { + ggd->axis_type_default = MAN_AXES_SCALE; } else { - man->axis_type_default = 0; + ggd->axis_type_default = 0; } MAN_ITER_AXES_BEGIN(axis, axis_idx) { - const short axis_type = gizmo_get_axis_type(axis_idx, man->axis_type_default); + const short axis_type = gizmo_get_axis_type(axis_idx, ggd->axis_type_default); bool constraint_axis[3] = {1, 0, 0}; PointerRNA *ptr = NULL; @@ -1380,7 +1380,7 @@ static void gizmogroup_init_properties_from_twtype(wmGizmoGroup *gzgroup) case MAN_AXIS_SCALE_Z: if (axis_idx >= MAN_AXIS_RANGE_TRANS_START && axis_idx < MAN_AXIS_RANGE_TRANS_END) { int draw_options = 0; - if ((man->twtype & (SCE_MANIP_ROTATE | SCE_MANIP_SCALE)) == 0) { + if ((ggd->twtype & (SCE_MANIP_ROTATE | SCE_MANIP_SCALE)) == 0) { draw_options |= ED_GIZMO_ARROW_DRAW_FLAG_STEM; } RNA_enum_set(axis->ptr, "draw_options", draw_options); @@ -1481,31 +1481,31 @@ static void gizmogroup_init_properties_from_twtype(wmGizmoGroup *gzgroup) static void WIDGETGROUP_gizmo_setup(const bContext *C, wmGizmoGroup *gzgroup) { - GizmoGroup *man = gizmogroup_init(gzgroup); + GizmoGroup *ggd = gizmogroup_init(gzgroup); - gzgroup->customdata = man; + gzgroup->customdata = ggd; { - man->twtype = 0; + ggd->twtype = 0; ScrArea *sa = CTX_wm_area(C); const bToolRef *tref = sa->runtime.tool; if (tref == NULL || STREQ(tref->idname, "Transform")) { /* Setup all gizmos, they can be toggled via 'ToolSettings.gizmo_flag' */ - man->twtype = SCE_MANIP_TRANSLATE | SCE_MANIP_ROTATE | SCE_MANIP_SCALE; - man->use_twtype_refresh = true; + ggd->twtype = SCE_MANIP_TRANSLATE | SCE_MANIP_ROTATE | SCE_MANIP_SCALE; + ggd->use_twtype_refresh = true; } else if (STREQ(tref->idname, "Move")) { - man->twtype |= SCE_MANIP_TRANSLATE; + ggd->twtype |= SCE_MANIP_TRANSLATE; } else if (STREQ(tref->idname, "Rotate")) { - man->twtype |= SCE_MANIP_ROTATE; + ggd->twtype |= SCE_MANIP_ROTATE; } else if (STREQ(tref->idname, "Scale")) { - man->twtype |= SCE_MANIP_SCALE; + ggd->twtype |= SCE_MANIP_SCALE; } - BLI_assert(man->twtype != 0); - man->twtype_init = man->twtype; + BLI_assert(ggd->twtype != 0); + ggd->twtype_init = ggd->twtype; } /* *** set properties for axes *** */ @@ -1514,24 +1514,24 @@ static void WIDGETGROUP_gizmo_setup(const bContext *C, wmGizmoGroup *gzgroup) static void WIDGETGROUP_gizmo_refresh(const bContext *C, wmGizmoGroup *gzgroup) { - GizmoGroup *man = gzgroup->customdata; + GizmoGroup *ggd = gzgroup->customdata; ScrArea *sa = CTX_wm_area(C); ARegion *ar = CTX_wm_region(C); View3D *v3d = sa->spacedata.first; RegionView3D *rv3d = ar->regiondata; struct TransformBounds tbounds; - if (man->use_twtype_refresh) { + if (ggd->use_twtype_refresh) { Scene *scene = CTX_data_scene(C); - man->twtype = scene->toolsettings->gizmo_flag & man->twtype_init; - if (man->twtype != man->twtype_prev) { - man->twtype_prev = man->twtype; + ggd->twtype = scene->toolsettings->gizmo_flag & ggd->twtype_init; + if (ggd->twtype != ggd->twtype_prev) { + ggd->twtype_prev = ggd->twtype; gizmogroup_init_properties_from_twtype(gzgroup); } } /* skip, we don't draw anything anyway */ - if ((man->all_hidden = + if ((ggd->all_hidden = (ED_transform_calc_gizmo_stats( C, &(struct TransformCalcParams){ .use_only_center = true, @@ -1546,7 +1546,7 @@ static void WIDGETGROUP_gizmo_refresh(const bContext *C, wmGizmoGroup *gzgroup) MAN_ITER_AXES_BEGIN(axis, axis_idx) { - const short axis_type = gizmo_get_axis_type(axis_idx, man->axis_type_default); + const short axis_type = gizmo_get_axis_type(axis_idx, ggd->axis_type_default); const int aidx_norm = gizmo_orientation_axis(axis_idx, NULL); WM_gizmo_set_matrix_location(axis, rv3d->twmat[3]); @@ -1562,13 +1562,13 @@ static void WIDGETGROUP_gizmo_refresh(const bContext *C, wmGizmoGroup *gzgroup) float start_co[3] = {0.0f, 0.0f, 0.0f}; float len; - gizmo_line_range(man->twtype, axis_type, &start_co[2], &len); + gizmo_line_range(ggd->twtype, axis_type, &start_co[2], &len); WM_gizmo_set_matrix_rotation_from_z_axis(axis, rv3d->twmat[aidx_norm]); RNA_float_set(axis->ptr, "length", len); if (axis_idx >= MAN_AXIS_RANGE_TRANS_START && axis_idx < MAN_AXIS_RANGE_TRANS_END) { - if (man->twtype & SCE_MANIP_ROTATE) { + if (ggd->twtype & SCE_MANIP_ROTATE) { /* Avoid rotate and translate arrows overlap. */ start_co[2] += 0.215f; } @@ -1612,7 +1612,7 @@ static void WIDGETGROUP_gizmo_message_subscribe( static void WIDGETGROUP_gizmo_draw_prepare(const bContext *C, wmGizmoGroup *gzgroup) { const Scene *scene = CTX_data_scene(C); - GizmoGroup *man = gzgroup->customdata; + GizmoGroup *ggd = gzgroup->customdata; // ScrArea *sa = CTX_wm_area(C); ARegion *ar = CTX_wm_region(C); // View3D *v3d = sa->spacedata.first; @@ -1621,7 +1621,7 @@ static void WIDGETGROUP_gizmo_draw_prepare(const bContext *C, wmGizmoGroup *gzgr /* when looking through a selected camera, the gizmo can be at the * exact same position as the view, skip so we don't break selection */ - if (man->all_hidden || fabsf(ED_view3d_pixel_size(rv3d, rv3d->twmat[3])) < 1e-6f) { + if (ggd->all_hidden || fabsf(ED_view3d_pixel_size(rv3d, rv3d->twmat[3])) < 1e-6f) { MAN_ITER_AXES_BEGIN(axis, axis_idx) { WM_gizmo_set_flag(axis, WM_GIZMO_HIDDEN, true); @@ -1635,13 +1635,13 @@ static void WIDGETGROUP_gizmo_draw_prepare(const bContext *C, wmGizmoGroup *gzgr MAN_ITER_AXES_BEGIN(axis, axis_idx) { - const short axis_type = gizmo_get_axis_type(axis_idx, man->axis_type_default); + const short axis_type = gizmo_get_axis_type(axis_idx, ggd->axis_type_default); /* XXX maybe unset _HIDDEN flag on redraw? */ if (axis_idx == MAN_AXIS_APRON_C) { WM_gizmo_set_flag(axis, WM_GIZMO_HIDDEN, (scene->toolsettings->gizmo_flag & SCE_MANIP_DISABLE_APRON) != 0); } - else if (gizmo_is_axis_visible(rv3d, man->twtype, idot, axis_type, axis_idx)) { + else if (gizmo_is_axis_visible(rv3d, ggd->twtype, idot, axis_type, axis_idx)) { WM_gizmo_set_flag(axis, WM_GIZMO_HIDDEN, false); } else { |