blender
/
blender
136
408
Fork 591
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

UI: Gizmo Button for Lock Camera to View #111076

Merged
Harley Acheson merged 3 commits from Harley/blender:LockCameraView into main 2024-02-01 21:47:59 +01:00
Conversation 27 Commits 3 Files Changed 1 +66 -6
1 changed files with 66 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
source/blender/editors/space_view3d/view3d_gizmo_navigate.cc
View File

@ -53,47 +53,82 @@ enum {
/* overlaps GZ_INDEX_ORTHO (switch between) */
GZ_INDEX_PERSP = 3,
GZ_INDEX_ORTHO = 4,
GZ_INDEX_CAMERA = 5,
GZ_INDEX_TOTAL = 6,
GZ_INDEX_CAMERA_OFF = 5,
GZ_INDEX_CAMERA_ON = 6,
GZ_INDEX_CAMERA_LOCK = 7,
GZ_INDEX_CAMERA_UNLOCK = 8,
GZ_INDEX_TOTAL = 9,
};
struct NavigateGizmoInfo {
const char *opname;
const char *gizmo;
uint icon;
void (*op_prop_fn)(PointerRNA *ptr);
};
static void navigate_context_toggle_camera_lock_init(PointerRNA *ptr)
{
RNA_string_set(ptr, "data_path", "space_data.lock_camera");
}
static NavigateGizmoInfo g_navigate_params[GZ_INDEX_TOTAL] = {
{
"VIEW3D_OT_move",
"GIZMO_GT_button_2d",
ICON_VIEW_PAN,
nullptr,
},
{
"VIEW3D_OT_rotate",
"VIEW3D_GT_navigate_rotate",
ICON_NONE,
nullptr,
},
{
"VIEW3D_OT_zoom",
"GIZMO_GT_button_2d",
ICON_VIEW_ZOOM,
nullptr,
},
{
"VIEW3D_OT_view_persportho",
"GIZMO_GT_button_2d",
ICON_VIEW_PERSPECTIVE,
nullptr,
},
{
"VIEW3D_OT_view_persportho",
"GIZMO_GT_button_2d",
ICON_VIEW_ORTHO,
nullptr,
},
{
"VIEW3D_OT_view_camera",
"GIZMO_GT_button_2d",
ICON_VIEW_CAMERA_UNSELECTED,
nullptr,
},
{
"VIEW3D_OT_view_camera",
"GIZMO_GT_button_2d",
ICON_VIEW_CAMERA,
nullptr,
},
{
"WM_OT_context_toggle",
"GIZMO_GT_button_2d",
ICON_VIEW_LOCKED,
navigate_context_toggle_camera_lock_init,
},
{
"WM_OT_context_toggle",
"GIZMO_GT_button_2d",
ICON_VIEW_UNLOCKED,
navigate_context_toggle_camera_lock_init,
},
};
@ -106,6 +141,7 @@ struct NavigateWidgetGroup {
char is_persp;
bool is_camera;
char viewlock;
char cameralock;
} rv3d;
} state;
};
@ -171,17 +207,29 @@ static void WIDGETGROUP_navigate_setup(const bContext *C, wmGizmoGroup *gzgroup)
}
wmOperatorType *ot = WM_operatortype_find(info->opname, true);
WM_gizmo_operator_set(gz, 0, ot, nullptr);
PointerRNA *ptr = WM_gizmo_operator_set(gz, 0, ot, NULL);
if (info->op_prop_fn != NULL) {
info->op_prop_fn(ptr);
}
}
{
wmGizmo *gz = navgroup->gz_array[GZ_INDEX_CAMERA];
wmGizmo *gz = navgroup->gz_array[GZ_INDEX_CAMERA_OFF];
WM_gizmo_operator_set(gz, 0, ot_view_camera, nullptr);
}
{
wmGizmo *gz = navgroup->gz_array[GZ_INDEX_CAMERA_ON];
WM_gizmo_operator_set(gz, 0, ot_view_camera, nullptr);
}
/* Click only buttons (not modal). */
{
int gz_ids[] = {GZ_INDEX_PERSP, GZ_INDEX_ORTHO, GZ_INDEX_CAMERA};
int gz_ids[] = {GZ_INDEX_PERSP,
GZ_INDEX_ORTHO,
GZ_INDEX_CAMERA_OFF,
GZ_INDEX_CAMERA_ON,
GZ_INDEX_CAMERA_LOCK,
GZ_INDEX_CAMERA_UNLOCK};
for (int i = 0; i < ARRAY_SIZE(gz_ids); i++) {
wmGizmo *gz = navgroup->gz_array[gz_ids[i]];
RNA_boolean_set(gz->ptr, "show_drag", false);
@ -229,6 +277,7 @@ static void WIDGETGROUP_navigate_draw_prepare(const bContext *C, wmGizmoGroup *g
NavigateWidgetGroup *navgroup = static_cast<NavigateWidgetGroup *>(gzgroup->customdata);
ARegion *region = CTX_wm_region(C);
const RegionView3D *rv3d = static_cast<const RegionView3D *>(region->regiondata);
const View3D *v3d = CTX_wm_view3d(C);
for (int i = 0; i < 3; i++) {
copy_v3_v3(navgroup->gz_array[GZ_INDEX_ROTATE]->matrix_offset[i], rv3d->viewmat[i]);
@ -243,6 +292,7 @@ static void WIDGETGROUP_navigate_draw_prepare(const bContext *C, wmGizmoGroup *g
(navgroup->state.rect_visible.ymax == rect_visible->ymax) &&
(navgroup->state.rv3d.is_persp == rv3d->is_persp) &&
(navgroup->state.rv3d.is_camera == (rv3d->persp == RV3D_CAMOB)) &&
(navgroup->state.rv3d.cameralock == (v3d->flag2 & V3D_LOCK_CAMERA)) &&
(navgroup->state.rv3d.viewlock == RV3D_LOCK_FLAGS(rv3d)))
{
return;
@ -252,6 +302,7 @@ static void WIDGETGROUP_navigate_draw_prepare(const bContext *C, wmGizmoGroup *g
navgroup->state.rv3d.is_persp = rv3d->is_persp;
navgroup->state.rv3d.is_camera = (rv3d->persp == RV3D_CAMOB);
navgroup->state.rv3d.viewlock = RV3D_LOCK_FLAGS(rv3d);
navgroup->state.rv3d.cameralock = v3d->flag2 & V3D_LOCK_CAMERA;
const bool show_navigate = (U.uiflag & USER_SHOW_GIZMO_NAVIGATE) != 0;
const bool show_rotate_gizmo = (U.mini_axis_type == USER_MINI_AXIS_TYPE_GIZMO);
@ -311,7 +362,8 @@ static void WIDGETGROUP_navigate_draw_prepare(const bContext *C, wmGizmoGroup *g
}
if ((RV3D_LOCK_FLAGS(rv3d) & RV3D_LOCK_ROTATION) == 0) {
gz = navgroup->gz_array[GZ_INDEX_CAMERA];
gz = navgroup
->gz_array[(rv3d->persp == RV3D_CAMOB) ? GZ_INDEX_CAMERA_ON : GZ_INDEX_CAMERA_OFF];
gz->matrix_basis[3][0] = roundf(co[0]);
gz->matrix_basis[3][1] = roundf(co[1] - (icon_offset_mini * icon_mini_slot++));
WM_gizmo_set_flag(gz, WM_GIZMO_HIDDEN, false);
@ -323,6 +375,14 @@ static void WIDGETGROUP_navigate_draw_prepare(const bContext *C, wmGizmoGroup *g
WM_gizmo_set_flag(gz, WM_GIZMO_HIDDEN, false);
}
}
if (navgroup->state.rv3d.is_camera == true) {
gz = navgroup->gz_array[(v3d->flag2 & V3D_LOCK_CAMERA) ? GZ_INDEX_CAMERA_LOCK :
GZ_INDEX_CAMERA_UNLOCK];
gz->matrix_basis[3][0] = roundf(co[0]);
gz->matrix_basis[3][1] = roundf(co[1] - (icon_offset_mini * icon_mini_slot++));
WM_gizmo_set_flag(gz, WM_GIZMO_HIDDEN, false);
}
}
}