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/cage3d_gizmo.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c')
-rw-r--r--source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c206
1 files changed, 103 insertions, 103 deletions
diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c
index e266514855b..0f1d309c927 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c
@@ -67,7 +67,7 @@
#define GIZMO_MARGIN_OFFSET_SCALE 1.5f
static void gizmo_calc_matrix_final_no_offset(
- const wmGizmo *mpr, float orig_matrix_final_no_offset[4][4], bool use_space)
+ const wmGizmo *gz, float orig_matrix_final_no_offset[4][4], bool use_space)
{
float mat_identity[4][4];
struct WM_GizmoMatrixParams params = {NULL};
@@ -76,11 +76,11 @@ static void gizmo_calc_matrix_final_no_offset(
params.matrix_basis = mat_identity;
}
params.matrix_offset = mat_identity;
- WM_gizmo_calc_matrix_final_params(mpr, &params, orig_matrix_final_no_offset);
+ WM_gizmo_calc_matrix_final_params(gz, &params, orig_matrix_final_no_offset);
}
static void gizmo_calc_rect_view_scale(
- const wmGizmo *mpr, const float dims[3], float scale[3])
+ const wmGizmo *gz, const float dims[3], float scale[3])
{
UNUSED_VARS(dims);
@@ -88,10 +88,10 @@ static void gizmo_calc_rect_view_scale(
float matrix_final_no_offset[4][4];
float x_axis[3], y_axis[3], z_axis[3];
- gizmo_calc_matrix_final_no_offset(mpr, matrix_final_no_offset, false);
- mul_v3_mat3_m4v3(x_axis, matrix_final_no_offset, mpr->matrix_offset[0]);
- mul_v3_mat3_m4v3(y_axis, matrix_final_no_offset, mpr->matrix_offset[1]);
- mul_v3_mat3_m4v3(z_axis, matrix_final_no_offset, mpr->matrix_offset[2]);
+ gizmo_calc_matrix_final_no_offset(gz, matrix_final_no_offset, false);
+ mul_v3_mat3_m4v3(x_axis, matrix_final_no_offset, gz->matrix_offset[0]);
+ mul_v3_mat3_m4v3(y_axis, matrix_final_no_offset, gz->matrix_offset[1]);
+ mul_v3_mat3_m4v3(z_axis, matrix_final_no_offset, gz->matrix_offset[2]);
scale[0] = 1.0f / len_v3(x_axis);
scale[1] = 1.0f / len_v3(y_axis);
@@ -99,20 +99,20 @@ static void gizmo_calc_rect_view_scale(
}
static void gizmo_calc_rect_view_margin(
- const wmGizmo *mpr, const float dims[3], float margin[3])
+ const wmGizmo *gz, const float dims[3], float margin[3])
{
float handle_size;
- if (mpr->parent_mgroup->type->flag & WM_GIZMOGROUPTYPE_3D) {
+ if (gz->parent_gzgroup->type->flag & WM_GIZMOGROUPTYPE_3D) {
handle_size = 0.15f;
}
else {
handle_size = GIZMO_RESIZER_SIZE;
}
// XXX, the scale isn't taking offset into account, we need to calculate scale per handle!
- // handle_size *= mpr->scale_final;
+ // handle_size *= gz->scale_final;
float scale_xyz[3];
- gizmo_calc_rect_view_scale(mpr, dims, scale_xyz);
+ gizmo_calc_rect_view_scale(gz, dims, scale_xyz);
margin[0] = ((handle_size * scale_xyz[0]));
margin[1] = ((handle_size * scale_xyz[1]));
margin[2] = ((handle_size * scale_xyz[2]));
@@ -150,7 +150,7 @@ static void gizmo_rect_pivot_from_scale_part(int part, float r_pt[3], bool r_con
static void cage3d_draw_box_corners(
const float r[3], const float margin[3], const float color[3])
{
- uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+ uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT);
UNUSED_VARS(margin);
immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
@@ -185,7 +185,7 @@ static void cage3d_draw_box_interaction(
const float rad[3] = {margin[0] / 3, margin[1] / 3, margin[2] / 3};
{
- uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+ uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT);
immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
immUniformColor3fv(color);
imm_draw_cube_fill_3d(pos, co, rad);
@@ -217,7 +217,7 @@ static void cage3d_draw_circle_wire(
const float r[3], const float margin[3], const float color[3],
const int transform_flag, const int draw_options)
{
- uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+ uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT);
immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
immUniformColor3fv(color);
@@ -230,7 +230,7 @@ static void cage3d_draw_circle_wire(
const float rad[2] = {margin[0] / 2, margin[1] / 2};
const float center[2] = {0.0f, 0.0f};
- immBegin(GWN_PRIM_LINES, 4);
+ immBegin(GPU_PRIM_LINES, 4);
immVertex2f(pos, center[0] - rad[0], center[1] - rad[1]);
immVertex2f(pos, center[0] + rad[0], center[1] + rad[1]);
immVertex2f(pos, center[0] + rad[0], center[1] - rad[1]);
@@ -251,7 +251,7 @@ static void cage3d_draw_circle_handles(
const float r[3], const float margin[3], const float color[3],
bool solid, float scale)
{
- uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+ uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT);
const float rad[3] = {margin[0] / 3, margin[1] / 3, margin[2] / 3};
immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
@@ -281,31 +281,31 @@ static void cage3d_draw_circle_handles(
static void gizmo_cage3d_draw_intern(
RegionView3D *rv3d,
- wmGizmo *mpr, const bool select, const bool highlight, const int select_id)
+ wmGizmo *gz, const bool select, const bool highlight, const int select_id)
{
- // const bool use_clamp = (mpr->parent_mgroup->type->flag & WM_GIZMOGROUPTYPE_3D) == 0;
+ // const bool use_clamp = (gz->parent_gzgroup->type->flag & WM_GIZMOGROUPTYPE_3D) == 0;
float dims[3];
- RNA_float_get_array(mpr->ptr, "dimensions", dims);
+ RNA_float_get_array(gz->ptr, "dimensions", dims);
float matrix_final[4][4];
- const int transform_flag = RNA_enum_get(mpr->ptr, "transform");
- const int draw_style = RNA_enum_get(mpr->ptr, "draw_style");
- const int draw_options = RNA_enum_get(mpr->ptr, "draw_options");
+ const int transform_flag = RNA_enum_get(gz->ptr, "transform");
+ const int draw_style = RNA_enum_get(gz->ptr, "draw_style");
+ const int draw_options = RNA_enum_get(gz->ptr, "draw_options");
const float size_real[3] = {dims[0] / 2.0f, dims[1] / 2.0f, dims[2] / 2.0f};
- WM_gizmo_calc_matrix_final(mpr, matrix_final);
+ WM_gizmo_calc_matrix_final(gz, matrix_final);
- gpuPushMatrix();
- gpuMultMatrix(matrix_final);
+ GPU_matrix_push();
+ GPU_matrix_mul(matrix_final);
float margin[3];
- gizmo_calc_rect_view_margin(mpr, dims, margin);
+ gizmo_calc_rect_view_margin(gz, dims, margin);
/* Handy for quick testing draw (if it's outside bounds). */
if (false) {
GPU_blend(true);
- uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT);
+ uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT);
immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
immUniformColor4fv((const float[4]){1, 1, 1, 0.5f});
float s = 0.5f;
@@ -338,14 +338,14 @@ static void gizmo_cage3d_draw_intern(
}
GPU_select_load_id(select_id | i);
cage3d_draw_box_interaction(
- mpr->color, i, size, margin);
+ gz->color, i, size, margin);
}
}
if (transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE) {
const int transform_part = ED_GIZMO_CAGE3D_PART_TRANSLATE;
GPU_select_load_id(select_id | transform_part);
cage3d_draw_box_interaction(
- mpr->color, transform_part, size, margin);
+ gz->color, transform_part, size, margin);
}
}
else {
@@ -359,17 +359,17 @@ static void gizmo_cage3d_draw_intern(
#endif
if (draw_style == ED_GIZMO_CAGE2D_STYLE_BOX) {
/* corner gizmos */
- GPU_line_width(mpr->line_width + 3.0f);
+ GPU_line_width(gz->line_width + 3.0f);
cage3d_draw_box_corners(size_real, margin, (const float[3]){0, 0, 0});
/* corner gizmos */
float color[4];
- gizmo_color_get(mpr, highlight, color);
- GPU_line_width(mpr->line_width);
+ gizmo_color_get(gz, highlight, color);
+ GPU_line_width(gz->line_width);
cage3d_draw_box_corners(size_real, margin, color);
bool show = false;
- if (mpr->highlight_part == ED_GIZMO_CAGE3D_PART_TRANSLATE) {
+ if (gz->highlight_part == ED_GIZMO_CAGE3D_PART_TRANSLATE) {
/* Only show if we're drawing the center handle
* otherwise the entire rectangle is the hotspot. */
if (draw_options & ED_GIZMO_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE) {
@@ -382,20 +382,20 @@ static void gizmo_cage3d_draw_intern(
if (show) {
cage3d_draw_box_interaction(
- mpr->color, mpr->highlight_part, size_real, margin);
+ gz->color, gz->highlight_part, size_real, margin);
}
}
else if (draw_style == ED_GIZMO_CAGE2D_STYLE_CIRCLE) {
float color[4];
- gizmo_color_get(mpr, highlight, color);
+ gizmo_color_get(gz, highlight, color);
GPU_line_smooth(true);
GPU_polygon_smooth(true);
GPU_blend(true);
- GPU_line_width(mpr->line_width + 3.0f);
+ GPU_line_width(gz->line_width + 3.0f);
cage3d_draw_circle_wire(size_real, margin, (const float[3]){0, 0, 0}, transform_flag, draw_options);
- GPU_line_width(mpr->line_width);
+ GPU_line_width(gz->line_width);
cage3d_draw_circle_wire(size_real, margin, color, transform_flag, draw_options);
/* corner gizmos */
@@ -412,30 +412,30 @@ static void gizmo_cage3d_draw_intern(
}
GPU_line_width(1.0);
- gpuPopMatrix();
+ GPU_matrix_pop();
}
/**
* For when we want to draw 3d cage in 3d views.
*/
-static void gizmo_cage3d_draw_select(const bContext *C, wmGizmo *mpr, int select_id)
+static void gizmo_cage3d_draw_select(const bContext *C, wmGizmo *gz, int select_id)
{
ARegion *ar = CTX_wm_region(C);
RegionView3D *rv3d = ar->regiondata;
- gizmo_cage3d_draw_intern(rv3d, mpr, true, false, select_id);
+ gizmo_cage3d_draw_intern(rv3d, gz, true, false, select_id);
}
-static void gizmo_cage3d_draw(const bContext *C, wmGizmo *mpr)
+static void gizmo_cage3d_draw(const bContext *C, wmGizmo *gz)
{
ARegion *ar = CTX_wm_region(C);
RegionView3D *rv3d = ar->regiondata;
- const bool is_highlight = (mpr->state & WM_GIZMO_STATE_HIGHLIGHT) != 0;
- gizmo_cage3d_draw_intern(rv3d, mpr, false, is_highlight, -1);
+ const bool is_highlight = (gz->state & WM_GIZMO_STATE_HIGHLIGHT) != 0;
+ gizmo_cage3d_draw_intern(rv3d, gz, false, is_highlight, -1);
}
-static int gizmo_cage3d_get_cursor(wmGizmo *mpr)
+static int gizmo_cage3d_get_cursor(wmGizmo *gz)
{
- if (mpr->parent_mgroup->type->flag & WM_GIZMOGROUPTYPE_3D) {
+ if (gz->parent_gzgroup->type->flag & WM_GIZMOGROUPTYPE_3D) {
return BC_NSEW_SCROLLCURSOR;
}
@@ -448,33 +448,33 @@ typedef struct RectTransformInteraction {
float orig_matrix_final_no_offset[4][4];
} RectTransformInteraction;
-static void gizmo_cage3d_setup(wmGizmo *mpr)
+static void gizmo_cage3d_setup(wmGizmo *gz)
{
- mpr->flag |= /* WM_GIZMO_DRAW_MODAL | */ /* TODO */
+ gz->flag |= /* WM_GIZMO_DRAW_MODAL | */ /* TODO */
WM_GIZMO_DRAW_NO_SCALE;
}
static int gizmo_cage3d_invoke(
- bContext *C, wmGizmo *mpr, const wmEvent *event)
+ bContext *C, wmGizmo *gz, const wmEvent *event)
{
RectTransformInteraction *data = MEM_callocN(sizeof(RectTransformInteraction), "cage_interaction");
- copy_m4_m4(data->orig_matrix_offset, mpr->matrix_offset);
- gizmo_calc_matrix_final_no_offset(mpr, data->orig_matrix_final_no_offset, true);
+ copy_m4_m4(data->orig_matrix_offset, gz->matrix_offset);
+ gizmo_calc_matrix_final_no_offset(gz, data->orig_matrix_final_no_offset, true);
if (gizmo_window_project_3d(
- C, mpr, (const float[2]){UNPACK2(event->mval)}, false, data->orig_mouse) == 0)
+ C, gz, (const float[2]){UNPACK2(event->mval)}, false, data->orig_mouse) == 0)
{
zero_v3(data->orig_mouse);
}
- mpr->interaction_data = data;
+ gz->interaction_data = data;
return OPERATOR_RUNNING_MODAL;
}
static int gizmo_cage3d_modal(
- bContext *C, wmGizmo *mpr, const wmEvent *event,
+ bContext *C, wmGizmo *gz, const wmEvent *event,
eWM_GizmoFlagTweak UNUSED(tweak_flag))
{
/* For transform logic to be managable we operate in -0.5..0.5 2D space,
@@ -484,51 +484,51 @@ static int gizmo_cage3d_modal(
* - The cursor offset are multiplied by 'dims'.
* - Matrix translation is also multiplied by 'dims'.
*/
- RectTransformInteraction *data = mpr->interaction_data;
+ RectTransformInteraction *data = gz->interaction_data;
float point_local[3];
float dims[3];
- RNA_float_get_array(mpr->ptr, "dimensions", dims);
+ RNA_float_get_array(gz->ptr, "dimensions", dims);
{
float matrix_back[4][4];
- copy_m4_m4(matrix_back, mpr->matrix_offset);
- copy_m4_m4(mpr->matrix_offset, data->orig_matrix_offset);
+ copy_m4_m4(matrix_back, gz->matrix_offset);
+ copy_m4_m4(gz->matrix_offset, data->orig_matrix_offset);
bool ok = gizmo_window_project_3d(
- C, mpr, (const float[2]){UNPACK2(event->mval)}, false, point_local);
- copy_m4_m4(mpr->matrix_offset, matrix_back);
+ C, gz, (const float[2]){UNPACK2(event->mval)}, false, point_local);
+ copy_m4_m4(gz->matrix_offset, matrix_back);
if (!ok) {
return OPERATOR_RUNNING_MODAL;
}
}
- const int transform_flag = RNA_enum_get(mpr->ptr, "transform");
- wmGizmoProperty *mpr_prop;
+ const int transform_flag = RNA_enum_get(gz->ptr, "transform");
+ wmGizmoProperty *gz_prop;
- mpr_prop = WM_gizmo_target_property_find(mpr, "matrix");
- if (mpr_prop->type != NULL) {
- WM_gizmo_target_property_value_get_array(mpr, mpr_prop, &mpr->matrix_offset[0][0]);
+ gz_prop = WM_gizmo_target_property_find(gz, "matrix");
+ if (gz_prop->type != NULL) {
+ WM_gizmo_target_property_value_get_array(gz, gz_prop, &gz->matrix_offset[0][0]);
}
- if (mpr->highlight_part == ED_GIZMO_CAGE3D_PART_TRANSLATE) {
+ if (gz->highlight_part == ED_GIZMO_CAGE3D_PART_TRANSLATE) {
/* do this to prevent clamping from changing size */
- copy_m4_m4(mpr->matrix_offset, data->orig_matrix_offset);
- mpr->matrix_offset[3][0] = data->orig_matrix_offset[3][0] + (point_local[0] - data->orig_mouse[0]);
- mpr->matrix_offset[3][1] = data->orig_matrix_offset[3][1] + (point_local[1] - data->orig_mouse[1]);
- mpr->matrix_offset[3][2] = data->orig_matrix_offset[3][2] + (point_local[2] - data->orig_mouse[2]);
+ copy_m4_m4(gz->matrix_offset, data->orig_matrix_offset);
+ gz->matrix_offset[3][0] = data->orig_matrix_offset[3][0] + (point_local[0] - data->orig_mouse[0]);
+ gz->matrix_offset[3][1] = data->orig_matrix_offset[3][1] + (point_local[1] - data->orig_mouse[1]);
+ gz->matrix_offset[3][2] = data->orig_matrix_offset[3][2] + (point_local[2] - data->orig_mouse[2]);
}
- else if (mpr->highlight_part == ED_GIZMO_CAGE3D_PART_ROTATE) {
+ else if (gz->highlight_part == ED_GIZMO_CAGE3D_PART_ROTATE) {
/* TODO (if needed) */
}
else {
/* scale */
- copy_m4_m4(mpr->matrix_offset, data->orig_matrix_offset);
+ copy_m4_m4(gz->matrix_offset, data->orig_matrix_offset);
float pivot[3];
bool constrain_axis[3] = {false};
if (transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE) {
- gizmo_rect_pivot_from_scale_part(mpr->highlight_part, pivot, constrain_axis);
+ gizmo_rect_pivot_from_scale_part(gz->highlight_part, pivot, constrain_axis);
}
else {
zero_v3(pivot);
@@ -587,11 +587,11 @@ static int gizmo_cage3d_modal(
transform_pivot_set_m4(
matrix_scale,
(const float[3]){pivot[0] * dims[0], pivot[1] * dims[1], pivot[2] * dims[2]});
- mul_m4_m4m4(mpr->matrix_offset, data->orig_matrix_offset, matrix_scale);
+ mul_m4_m4m4(gz->matrix_offset, data->orig_matrix_offset, matrix_scale);
}
- if (mpr_prop->type != NULL) {
- WM_gizmo_target_property_value_set_array(C, mpr, mpr_prop, &mpr->matrix_offset[0][0]);
+ if (gz_prop->type != NULL) {
+ WM_gizmo_target_property_value_set_array(C, gz, gz_prop, &gz->matrix_offset[0][0]);
}
/* tag the region for redraw */
@@ -601,11 +601,11 @@ static int gizmo_cage3d_modal(
return OPERATOR_RUNNING_MODAL;
}
-static void gizmo_cage3d_property_update(wmGizmo *mpr, wmGizmoProperty *mpr_prop)
+static void gizmo_cage3d_property_update(wmGizmo *gz, wmGizmoProperty *gz_prop)
{
- if (STREQ(mpr_prop->type->idname, "matrix")) {
- if (WM_gizmo_target_property_array_length(mpr, mpr_prop) == 16) {
- WM_gizmo_target_property_value_get_array(mpr, mpr_prop, &mpr->matrix_offset[0][0]);
+ if (STREQ(gz_prop->type->idname, "matrix")) {
+ if (WM_gizmo_target_property_array_length(gz, gz_prop) == 16) {
+ WM_gizmo_target_property_value_get_array(gz, gz_prop, &gz->matrix_offset[0][0]);
}
else {
BLI_assert(0);
@@ -616,22 +616,22 @@ static void gizmo_cage3d_property_update(wmGizmo *mpr, wmGizmoProperty *mpr_prop
}
}
-static void gizmo_cage3d_exit(bContext *C, wmGizmo *mpr, const bool cancel)
+static void gizmo_cage3d_exit(bContext *C, wmGizmo *gz, const bool cancel)
{
- RectTransformInteraction *data = mpr->interaction_data;
+ RectTransformInteraction *data = gz->interaction_data;
if (!cancel)
return;
- wmGizmoProperty *mpr_prop;
+ wmGizmoProperty *gz_prop;
/* reset properties */
- mpr_prop = WM_gizmo_target_property_find(mpr, "matrix");
- if (mpr_prop->type != NULL) {
- WM_gizmo_target_property_value_set_array(C, mpr, mpr_prop, &data->orig_matrix_offset[0][0]);
+ gz_prop = WM_gizmo_target_property_find(gz, "matrix");
+ if (gz_prop->type != NULL) {
+ WM_gizmo_target_property_value_set_array(C, gz, gz_prop, &data->orig_matrix_offset[0][0]);
}
- copy_m4_m4(mpr->matrix_offset, data->orig_matrix_offset);
+ copy_m4_m4(gz->matrix_offset, data->orig_matrix_offset);
}
@@ -640,22 +640,22 @@ static void gizmo_cage3d_exit(bContext *C, wmGizmo *mpr, const bool cancel)
*
* \{ */
-static void GIZMO_WT_cage_3d(wmGizmoType *wt)
+static void GIZMO_GT_cage_3d(wmGizmoType *gzt)
{
/* identifiers */
- wt->idname = "GIZMO_WT_cage_3d";
+ gzt->idname = "GIZMO_GT_cage_3d";
/* api callbacks */
- wt->draw = gizmo_cage3d_draw;
- wt->draw_select = gizmo_cage3d_draw_select;
- wt->setup = gizmo_cage3d_setup;
- wt->invoke = gizmo_cage3d_invoke;
- wt->property_update = gizmo_cage3d_property_update;
- wt->modal = gizmo_cage3d_modal;
- wt->exit = gizmo_cage3d_exit;
- wt->cursor_get = gizmo_cage3d_get_cursor;
+ gzt->draw = gizmo_cage3d_draw;
+ gzt->draw_select = gizmo_cage3d_draw_select;
+ gzt->setup = gizmo_cage3d_setup;
+ gzt->invoke = gizmo_cage3d_invoke;
+ gzt->property_update = gizmo_cage3d_property_update;
+ gzt->modal = gizmo_cage3d_modal;
+ gzt->exit = gizmo_cage3d_exit;
+ gzt->cursor_get = gizmo_cage3d_get_cursor;
- wt->struct_size = sizeof(wmGizmo);
+ gzt->struct_size = sizeof(wmGizmo);
/* rna */
static EnumPropertyItem rna_enum_draw_style[] = {
@@ -674,19 +674,19 @@ static void GIZMO_WT_cage_3d(wmGizmoType *wt)
{0, NULL, 0, NULL, NULL}
};
static float unit_v3[3] = {1.0f, 1.0f, 1.0f};
- RNA_def_float_vector(wt->srna, "dimensions", 3, unit_v3, 0, FLT_MAX, "Dimensions", "", 0.0f, FLT_MAX);
- RNA_def_enum_flag(wt->srna, "transform", rna_enum_transform, 0, "Transform Options", "");
- RNA_def_enum(wt->srna, "draw_style", rna_enum_draw_style, ED_GIZMO_CAGE2D_STYLE_CIRCLE, "Draw Style", "");
+ RNA_def_float_vector(gzt->srna, "dimensions", 3, unit_v3, 0, FLT_MAX, "Dimensions", "", 0.0f, FLT_MAX);
+ RNA_def_enum_flag(gzt->srna, "transform", rna_enum_transform, 0, "Transform Options", "");
+ RNA_def_enum(gzt->srna, "draw_style", rna_enum_draw_style, ED_GIZMO_CAGE2D_STYLE_CIRCLE, "Draw Style", "");
RNA_def_enum_flag(
- wt->srna, "draw_options", rna_enum_draw_options,
+ gzt->srna, "draw_options", rna_enum_draw_options,
ED_GIZMO_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE, "Draw Options", "");
- WM_gizmotype_target_property_def(wt, "matrix", PROP_FLOAT, 16);
+ WM_gizmotype_target_property_def(gzt, "matrix", PROP_FLOAT, 16);
}
void ED_gizmotypes_cage_3d(void)
{
- WM_gizmotype_append(GIZMO_WT_cage_3d);
+ WM_gizmotype_append(GIZMO_GT_cage_3d);
}
/** \} */
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 20:23:30 +0300