Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source/blender/editors/gizmo_library/gizmo_types/grab3d_gizmo.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/gizmo_library/gizmo_types/grab3d_gizmo.c')
-rw-r--r--source/blender/editors/gizmo_library/gizmo_types/grab3d_gizmo.c146
1 files changed, 73 insertions, 73 deletions
diff --git a/source/blender/editors/gizmo_library/gizmo_types/grab3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/grab3d_gizmo.c
index 2a89c8cc4ab..fcbd333078d 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/grab3d_gizmo.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/grab3d_gizmo.c
@@ -68,16 +68,16 @@ typedef struct GrabGizmo3D {
float prop_co[3];
} GrabGizmo3D;
-static void gizmo_grab_matrix_basis_get(const wmGizmo *mpr, float r_matrix[4][4])
+static void gizmo_grab_matrix_basis_get(const wmGizmo *gz, float r_matrix[4][4])
{
- GrabGizmo3D *grab = (GrabGizmo3D *)mpr;
+ GrabGizmo3D *grab = (GrabGizmo3D *)gz;
copy_m4_m4(r_matrix, grab->gizmo.matrix_basis);
add_v3_v3(r_matrix[3], grab->prop_co);
}
static int gizmo_grab_modal(
- bContext *C, wmGizmo *mpr, const wmEvent *event,
+ bContext *C, wmGizmo *gz, const wmEvent *event,
eWM_GizmoFlagTweak tweak_flag);
typedef struct GrabInteraction {
@@ -94,19 +94,19 @@ typedef struct GrabInteraction {
/* -------------------------------------------------------------------- */
static void grab_geom_draw(
- const wmGizmo *mpr, const float color[4], const bool select, const int draw_options)
+ const wmGizmo *gz, const float color[4], const bool select, const int draw_options)
{
#ifdef USE_GIZMO_CUSTOM_DIAL
UNUSED_VARS(grab3d, col, axis_modal_mat);
wm_gizmo_geometryinfo_draw(&wm_gizmo_geom_data_grab3d, select);
#else
- const int draw_style = RNA_enum_get(mpr->ptr, "draw_style");
+ const int draw_style = RNA_enum_get(gz->ptr, "draw_style");
const bool filled = (draw_options & ED_GIZMO_GRAB_DRAW_FLAG_FILL) != 0;
- GPU_line_width(mpr->line_width);
+ GPU_line_width(gz->line_width);
- Gwn_VertFormat *format = immVertexFormat();
- uint pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+ GPUVertFormat *format = immVertexFormat();
+ uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
@@ -121,7 +121,7 @@ static void grab_geom_draw(
}
}
else if (draw_style == ED_GIZMO_GRAB_STYLE_CROSS_2D) {
- immBegin(GWN_PRIM_LINES, 4);
+ immBegin(GPU_PRIM_LINES, 4);
immVertex2f(pos, 1.0f, 1.0f);
immVertex2f(pos, -1.0f, -1.0f);
@@ -140,10 +140,10 @@ static void grab_geom_draw(
}
static void grab3d_get_translate(
- const wmGizmo *mpr, const wmEvent *event, const ARegion *ar,
+ const wmGizmo *gz, const wmEvent *event, const ARegion *ar,
float co_delta[3])
{
- GrabInteraction *inter = mpr->interaction_data;
+ GrabInteraction *inter = gz->interaction_data;
const float mval_delta[2] = {
event->mval[0] - inter->init_mval[0],
event->mval[1] - inter->init_mval[1],
@@ -151,33 +151,33 @@ static void grab3d_get_translate(
RegionView3D *rv3d = ar->regiondata;
float co_ref[3];
- mul_v3_mat3_m4v3(co_ref, mpr->matrix_space, inter->init_prop_co);
+ mul_v3_mat3_m4v3(co_ref, gz->matrix_space, inter->init_prop_co);
const float zfac = ED_view3d_calc_zfac(rv3d, co_ref, NULL);
ED_view3d_win_to_delta(ar, mval_delta, co_delta, zfac);
float matrix_space_inv[3][3];
- copy_m3_m4(matrix_space_inv, mpr->matrix_space);
+ copy_m3_m4(matrix_space_inv, gz->matrix_space);
invert_m3(matrix_space_inv);
mul_m3_v3(matrix_space_inv, co_delta);
}
static void grab3d_draw_intern(
- const bContext *C, wmGizmo *mpr,
+ const bContext *C, wmGizmo *gz,
const bool select, const bool highlight)
{
- GrabInteraction *inter = mpr->interaction_data;
- const int draw_options = RNA_enum_get(mpr->ptr, "draw_options");
+ GrabInteraction *inter = gz->interaction_data;
+ const int draw_options = RNA_enum_get(gz->ptr, "draw_options");
const bool align_view = (draw_options & ED_GIZMO_GRAB_DRAW_FLAG_ALIGN_VIEW) != 0;
float color[4];
float matrix_final[4][4];
float matrix_align[4][4];
- gizmo_color_get(mpr, highlight, color);
- WM_gizmo_calc_matrix_final(mpr, matrix_final);
+ gizmo_color_get(gz, highlight, color);
+ WM_gizmo_calc_matrix_final(gz, matrix_final);
- gpuPushMatrix();
- gpuMultMatrix(matrix_final);
+ GPU_matrix_push();
+ GPU_matrix_mul(matrix_final);
if (align_view) {
float matrix_final_unit[4][4];
@@ -186,65 +186,65 @@ static void grab3d_draw_intern(
mul_m4_m4m4(matrix_align, rv3d->viewmat, matrix_final_unit);
zero_v3(matrix_align[3]);
transpose_m4(matrix_align);
- gpuMultMatrix(matrix_align);
+ GPU_matrix_mul(matrix_align);
}
GPU_blend(true);
- grab_geom_draw(mpr, color, select, draw_options);
+ grab_geom_draw(gz, color, select, draw_options);
GPU_blend(false);
- gpuPopMatrix();
+ GPU_matrix_pop();
- if (mpr->interaction_data) {
- gpuPushMatrix();
- gpuMultMatrix(inter->init_matrix_final);
+ if (gz->interaction_data) {
+ GPU_matrix_push();
+ GPU_matrix_mul(inter->init_matrix_final);
if (align_view) {
- gpuMultMatrix(matrix_align);
+ GPU_matrix_mul(matrix_align);
}
GPU_blend(true);
- grab_geom_draw(mpr, (const float[4]){0.5f, 0.5f, 0.5f, 0.5f}, select, draw_options);
+ grab_geom_draw(gz, (const float[4]){0.5f, 0.5f, 0.5f, 0.5f}, select, draw_options);
GPU_blend(false);
- gpuPopMatrix();
+ GPU_matrix_pop();
}
}
-static void gizmo_grab_draw_select(const bContext *C, wmGizmo *mpr, int select_id)
+static void gizmo_grab_draw_select(const bContext *C, wmGizmo *gz, int select_id)
{
GPU_select_load_id(select_id);
- grab3d_draw_intern(C, mpr, true, false);
+ grab3d_draw_intern(C, gz, true, false);
}
-static void gizmo_grab_draw(const bContext *C, wmGizmo *mpr)
+static void gizmo_grab_draw(const bContext *C, wmGizmo *gz)
{
- const bool is_modal = mpr->state & WM_GIZMO_STATE_MODAL;
- const bool is_highlight = (mpr->state & WM_GIZMO_STATE_HIGHLIGHT) != 0;
+ const bool is_modal = gz->state & WM_GIZMO_STATE_MODAL;
+ const bool is_highlight = (gz->state & WM_GIZMO_STATE_HIGHLIGHT) != 0;
(void)is_modal;
GPU_blend(true);
- grab3d_draw_intern(C, mpr, false, is_highlight);
+ grab3d_draw_intern(C, gz, false, is_highlight);
GPU_blend(false);
}
static int gizmo_grab_modal(
- bContext *C, wmGizmo *mpr, const wmEvent *event,
+ bContext *C, wmGizmo *gz, const wmEvent *event,
eWM_GizmoFlagTweak UNUSED(tweak_flag))
{
- GrabGizmo3D *grab = (GrabGizmo3D *)mpr;
- GrabInteraction *inter = mpr->interaction_data;
+ GrabGizmo3D *grab = (GrabGizmo3D *)gz;
+ GrabInteraction *inter = gz->interaction_data;
ARegion *ar = CTX_wm_region(C);
float prop_delta[3];
if (CTX_wm_area(C)->spacetype == SPACE_VIEW3D) {
- grab3d_get_translate(mpr, event, ar, prop_delta);
+ grab3d_get_translate(gz, event, ar, prop_delta);
}
else {
float mval_proj_init[2], mval_proj_curr[2];
if ((gizmo_window_project_2d(
- C, mpr, inter->init_mval, 2, false, mval_proj_init) == false) ||
+ C, gz, inter->init_mval, 2, false, mval_proj_init) == false) ||
(gizmo_window_project_2d(
- C, mpr, (const float[2]){UNPACK2(event->mval)}, 2, false, mval_proj_curr) == false))
+ C, gz, (const float[2]){UNPACK2(event->mval)}, 2, false, mval_proj_curr) == false))
{
return OPERATOR_RUNNING_MODAL;
}
@@ -254,9 +254,9 @@ static int gizmo_grab_modal(
add_v3_v3v3(grab->prop_co, inter->init_prop_co, prop_delta);
/* set the property for the operator and call its modal function */
- wmGizmoProperty *mpr_prop = WM_gizmo_target_property_find(mpr, "offset");
- if (WM_gizmo_target_property_is_valid(mpr_prop)) {
- WM_gizmo_target_property_value_set_array(C, mpr, mpr_prop, grab->prop_co);
+ wmGizmoProperty *gz_prop = WM_gizmo_target_property_find(gz, "offset");
+ if (WM_gizmo_target_property_is_valid(gz_prop)) {
+ WM_gizmo_target_property_value_set_array(C, gz, gz_prop, grab->prop_co);
}
else {
zero_v3(grab->prop_co);
@@ -268,7 +268,7 @@ static int gizmo_grab_modal(
}
static int gizmo_grab_invoke(
- bContext *UNUSED(C), wmGizmo *mpr, const wmEvent *event)
+ bContext *UNUSED(C), wmGizmo *gz, const wmEvent *event)
{
GrabInteraction *inter = MEM_callocN(sizeof(GrabInteraction), __func__);
@@ -278,32 +278,32 @@ static int gizmo_grab_invoke(
#if 0
copy_v3_v3(inter->init_prop_co, grab->prop_co);
#else
- wmGizmoProperty *mpr_prop = WM_gizmo_target_property_find(mpr, "offset");
- if (WM_gizmo_target_property_is_valid(mpr_prop)) {
- WM_gizmo_target_property_value_get_array(mpr, mpr_prop, inter->init_prop_co);
+ wmGizmoProperty *gz_prop = WM_gizmo_target_property_find(gz, "offset");
+ if (WM_gizmo_target_property_is_valid(gz_prop)) {
+ WM_gizmo_target_property_value_get_array(gz, gz_prop, inter->init_prop_co);
}
#endif
- WM_gizmo_calc_matrix_final(mpr, inter->init_matrix_final);
+ WM_gizmo_calc_matrix_final(gz, inter->init_matrix_final);
- mpr->interaction_data = inter;
+ gz->interaction_data = inter;
return OPERATOR_RUNNING_MODAL;
}
static int gizmo_grab_test_select(
- bContext *C, wmGizmo *mpr, const wmEvent *event)
+ bContext *C, wmGizmo *gz, const int mval[2])
{
float point_local[2];
if (gizmo_window_project_2d(
- C, mpr, (const float[2]){UNPACK2(event->mval)}, 2, true, point_local) == false)
+ C, gz, (const float[2]){UNPACK2(mval)}, 2, true, point_local) == false)
{
return -1;
}
- /* The 'mpr->scale_final' is already applied when projecting. */
+ /* The 'gz->scale_final' is already applied when projecting. */
if (len_squared_v2(point_local) < 1.0f) {
return 0;
}
@@ -311,18 +311,18 @@ static int gizmo_grab_test_select(
return -1;
}
-static void gizmo_grab_property_update(wmGizmo *mpr, wmGizmoProperty *mpr_prop)
+static void gizmo_grab_property_update(wmGizmo *gz, wmGizmoProperty *gz_prop)
{
- GrabGizmo3D *grab = (GrabGizmo3D *)mpr;
- if (WM_gizmo_target_property_is_valid(mpr_prop)) {
- WM_gizmo_target_property_value_get_array(mpr, mpr_prop, grab->prop_co);
+ GrabGizmo3D *grab = (GrabGizmo3D *)gz;
+ if (WM_gizmo_target_property_is_valid(gz_prop)) {
+ WM_gizmo_target_property_value_get_array(gz, gz_prop, grab->prop_co);
}
else {
zero_v3(grab->prop_co);
}
}
-static int gizmo_grab_cursor_get(wmGizmo *UNUSED(mpr))
+static int gizmo_grab_cursor_get(wmGizmo *UNUSED(gz))
{
return BC_NSEW_SCROLLCURSOR;
}
@@ -332,22 +332,22 @@ static int gizmo_grab_cursor_get(wmGizmo *UNUSED(mpr))
*
* \{ */
-static void GIZMO_WT_grab_3d(wmGizmoType *wt)
+static void GIZMO_GT_grab_3d(wmGizmoType *gzt)
{
/* identifiers */
- wt->idname = "GIZMO_WT_grab_3d";
+ gzt->idname = "GIZMO_GT_grab_3d";
/* api callbacks */
- wt->draw = gizmo_grab_draw;
- wt->draw_select = gizmo_grab_draw_select;
- wt->test_select = gizmo_grab_test_select;
- wt->matrix_basis_get = gizmo_grab_matrix_basis_get;
- wt->invoke = gizmo_grab_invoke;
- wt->property_update = gizmo_grab_property_update;
- wt->modal = gizmo_grab_modal;
- wt->cursor_get = gizmo_grab_cursor_get;
+ gzt->draw = gizmo_grab_draw;
+ gzt->draw_select = gizmo_grab_draw_select;
+ gzt->test_select = gizmo_grab_test_select;
+ gzt->matrix_basis_get = gizmo_grab_matrix_basis_get;
+ gzt->invoke = gizmo_grab_invoke;
+ gzt->property_update = gizmo_grab_property_update;
+ gzt->modal = gizmo_grab_modal;
+ gzt->cursor_get = gizmo_grab_cursor_get;
- wt->struct_size = sizeof(GrabGizmo3D);
+ gzt->struct_size = sizeof(GrabGizmo3D);
/* rna */
static EnumPropertyItem rna_enum_draw_style[] = {
@@ -361,15 +361,15 @@ static void GIZMO_WT_grab_3d(wmGizmoType *wt)
{0, NULL, 0, NULL, NULL}
};
- RNA_def_enum(wt->srna, "draw_style", rna_enum_draw_style, ED_GIZMO_GRAB_STYLE_RING_2D, "Draw Style", "");
- RNA_def_enum_flag(wt->srna, "draw_options", rna_enum_draw_options, 0, "Draw Options", "");
+ RNA_def_enum(gzt->srna, "draw_style", rna_enum_draw_style, ED_GIZMO_GRAB_STYLE_RING_2D, "Draw Style", "");
+ RNA_def_enum_flag(gzt->srna, "draw_options", rna_enum_draw_options, 0, "Draw Options", "");
- WM_gizmotype_target_property_def(wt, "offset", PROP_FLOAT, 3);
+ WM_gizmotype_target_property_def(gzt, "offset", PROP_FLOAT, 3);
}
void ED_gizmotypes_grab_3d(void)
{
- WM_gizmotype_append(GIZMO_WT_grab_3d);
+ WM_gizmotype_append(GIZMO_GT_grab_3d);
}
/** \} */ // Grab Gizmo API
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 08:35:49 +0300