[Bf-blender-cvs] [fa1145d4751] custom-manipulators: Cleanup: consistent naming
Campbell Barton
noreply at git.blender.org
Sat Jun 10 02:19:36 CEST 2017
Commit: fa1145d47518152596eb2af5cc0f35a4b4b839ed
Author: Campbell Barton
Date: Sat Jun 10 10:20:54 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rBfa1145d47518152596eb2af5cc0f35a4b4b839ed
Cleanup: consistent naming
Use shorter names for manipulator
===================================================================
M source/blender/editors/include/ED_manipulator_library.h
M source/blender/editors/include/ED_transform.h
M source/blender/editors/manipulator_library/arrow2d_manipulator.c
M source/blender/editors/manipulator_library/arrow3d_manipulator.c
M source/blender/editors/manipulator_library/cage2d_manipulator.c
M source/blender/editors/manipulator_library/dial3d_manipulator.c
M source/blender/editors/manipulator_library/facemap3d_manipulator.c
M source/blender/editors/manipulator_library/manipulator_library_intern.h
M source/blender/editors/manipulator_library/manipulator_library_utils.c
M source/blender/editors/manipulator_library/primitive3d_manipulator.c
M source/blender/editors/space_node/node_widgets.c
M source/blender/editors/space_view3d/view3d_manipulators.c
M source/blender/editors/transform/transform_manipulator.c
M source/blender/editors/transform/transform_manipulator2d.c
M source/blender/makesrna/intern/rna_wm_manipulator.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/manipulators/WM_manipulator_api.h
M source/blender/windowmanager/manipulators/WM_manipulator_types.h
M source/blender/windowmanager/manipulators/intern/wm_manipulator.c
M source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h
M source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
M source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c
M source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h
===================================================================
diff --git a/source/blender/editors/include/ED_manipulator_library.h b/source/blender/editors/include/ED_manipulator_library.h
index cb89551d052..1c3cbcf3294 100644
--- a/source/blender/editors/include/ED_manipulator_library.h
+++ b/source/blender/editors/include/ED_manipulator_library.h
@@ -50,11 +50,11 @@ struct wmManipulatorGroup;
/* manipulator_library_presets.c */
void ED_manipulator_draw_preset_box(
- const struct wmManipulator *manipulator, float mat[4][4], int select_id);
+ const struct wmManipulator *mpr, float mat[4][4], int select_id);
void ED_manipulator_draw_preset_arrow(
- const struct wmManipulator *manipulator, float mat[4][4], int axis, int select_id);
+ const struct wmManipulator *mpr, float mat[4][4], int axis, int select_id);
void ED_manipulator_draw_preset_circle(
- const struct wmManipulator *manipulator, float mat[4][4], int axis, int select_id);
+ const struct wmManipulator *mpr, float mat[4][4], int axis, int select_id);
void ED_manipulator_draw_preset_facemap(
const struct wmManipulator *mpr, struct Scene *scene, struct Object *ob, const int facemap, int select_id);
@@ -77,20 +77,20 @@ enum {
struct wmManipulator *ED_manipulator_arrow3d_new(
struct wmManipulatorGroup *mgroup, const char *name, const int style);
-void ED_manipulator_arrow3d_set_direction(struct wmManipulator *manipulator, const float direction[3]);
-void ED_manipulator_arrow3d_set_up_vector(struct wmManipulator *manipulator, const float direction[3]);
-void ED_manipulator_arrow3d_set_line_len(struct wmManipulator *manipulator, const float len);
-void ED_manipulator_arrow3d_set_ui_range(struct wmManipulator *manipulator, const float min, const float max);
-void ED_manipulator_arrow3d_set_range_fac(struct wmManipulator *manipulator, const float range_fac);
-void ED_manipulator_arrow3d_cone_set_aspect(struct wmManipulator *manipulator, const float aspect[2]);
+void ED_manipulator_arrow3d_set_direction(struct wmManipulator *mpr, const float direction[3]);
+void ED_manipulator_arrow3d_set_up_vector(struct wmManipulator *mpr, const float direction[3]);
+void ED_manipulator_arrow3d_set_line_len(struct wmManipulator *mpr, const float len);
+void ED_manipulator_arrow3d_set_ui_range(struct wmManipulator *mpr, const float min, const float max);
+void ED_manipulator_arrow3d_set_range_fac(struct wmManipulator *mpr, const float range_fac);
+void ED_manipulator_arrow3d_cone_set_aspect(struct wmManipulator *mpr, const float aspect[2]);
/* -------------------------------------------------------------------- */
/* 2D Arrow Manipulator */
struct wmManipulator *ED_manipulator_arrow2d_new(struct wmManipulatorGroup *mgroup, const char *name);
-void ED_manipulator_arrow2d_set_angle(struct wmManipulator *manipulator, const float rot_fac);
-void ED_manipulator_arrow2d_set_line_len(struct wmManipulator *manipulator, const float len);
+void ED_manipulator_arrow2d_set_angle(struct wmManipulator *mpr, const float rot_fac);
+void ED_manipulator_arrow2d_set_line_len(struct wmManipulator *mpr, const float len);
/* -------------------------------------------------------------------- */
@@ -106,7 +106,7 @@ enum {
struct wmManipulator *ED_manipulator_rect_transform_new(
struct wmManipulatorGroup *mgroup, const char *name, const int style);
void ED_manipulator_rect_transform_set_dimensions(
- struct wmManipulator *manipulator, const float width, const float height);
+ struct wmManipulator *mpr, const float width, const float height);
/* -------------------------------------------------------------------- */
@@ -121,7 +121,7 @@ enum {
struct wmManipulator *ED_manipulator_dial3d_new(
struct wmManipulatorGroup *mgroup, const char *name, const int style);
void ED_manipulator_dial3d_set_up_vector(
- struct wmManipulator *manipulator, const float direction[3]);
+ struct wmManipulator *mpr, const float direction[3]);
/* -------------------------------------------------------------------- */
@@ -130,7 +130,7 @@ void ED_manipulator_dial3d_set_up_vector(
struct wmManipulator *ED_manipulator_facemap_new(
struct wmManipulatorGroup *mgroup, const char *name, const int style,
struct Object *ob, const int facemap);
-struct bFaceMap *ED_manipulator_facemap_get_fmap(struct wmManipulator *manipulator);
+struct bFaceMap *ED_manipulator_facemap_get_fmap(struct wmManipulator *mpr);
/* -------------------------------------------------------------------- */
@@ -142,7 +142,7 @@ enum {
struct wmManipulator *ED_manipulator_primitive3d_new(
struct wmManipulatorGroup *mgroup, const char *name, const int style);
-void ED_manipulator_primitive3d_set_direction(struct wmManipulator *manipulator, const float direction[3]);
-void ED_manipulator_primitive3d_set_up_vector(struct wmManipulator *manipulator, const float direction[3]);
+void ED_manipulator_primitive3d_set_direction(struct wmManipulator *mpr, const float direction[3]);
+void ED_manipulator_primitive3d_set_up_vector(struct wmManipulator *mpr, const float direction[3]);
#endif /* __ED_MANIPULATOR_LIBRARY_H__ */
diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h
index a027f99eed1..da5a0cdcf2b 100644
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@ -162,9 +162,9 @@ void TRANSFORM_WGT_manipulator(struct wmManipulatorGroupType *wgt);
void TRANSFORM_WGT_object(struct wmManipulatorGroupType *wgt);
bool ED_widgetgroup_manipulator2d_poll(const struct bContext *C, struct wmManipulatorGroupType *wgt);
-void ED_widgetgroup_manipulator2d_setup(const struct bContext *C, struct wmManipulatorGroup *wgroup);
-void ED_widgetgroup_manipulator2d_refresh(const struct bContext *C, struct wmManipulatorGroup *wgroup);
-void ED_widgetgroup_manipulator2d_draw_prepare(const struct bContext *C, struct wmManipulatorGroup *wgroup);
+void ED_widgetgroup_manipulator2d_setup(const struct bContext *C, struct wmManipulatorGroup *mgroup);
+void ED_widgetgroup_manipulator2d_refresh(const struct bContext *C, struct wmManipulatorGroup *mgroup);
+void ED_widgetgroup_manipulator2d_draw_prepare(const struct bContext *C, struct wmManipulatorGroup *mgroup);
/* Snapping */
diff --git a/source/blender/editors/manipulator_library/arrow2d_manipulator.c b/source/blender/editors/manipulator_library/arrow2d_manipulator.c
index 14b0fa06a1a..1273710ff69 100644
--- a/source/blender/editors/manipulator_library/arrow2d_manipulator.c
+++ b/source/blender/editors/manipulator_library/arrow2d_manipulator.c
@@ -105,19 +105,19 @@ static void arrow2d_draw_geom(ArrowManipulator2D *arrow, const float origin[2],
gpuPopMatrix();
}
-static void manipulator_arrow2d_draw(const bContext *UNUSED(C), struct wmManipulator *manipulator)
+static void manipulator_arrow2d_draw(const bContext *UNUSED(C), struct wmManipulator *mpr)
{
- ArrowManipulator2D *arrow = (ArrowManipulator2D *)manipulator;
+ ArrowManipulator2D *arrow = (ArrowManipulator2D *)mpr;
float col[4];
- manipulator_color_get(manipulator, manipulator->state & WM_MANIPULATOR_STATE_HIGHLIGHT, col);
+ manipulator_color_get(mpr, mpr->state & WM_MANIPULATOR_STATE_HIGHLIGHT, col);
- glLineWidth(manipulator->line_width);
+ glLineWidth(mpr->line_width);
glEnable(GL_BLEND);
- arrow2d_draw_geom(arrow, manipulator->origin, col);
+ arrow2d_draw_geom(arrow, mpr->origin, col);
glDisable(GL_BLEND);
- if (arrow->manipulator.interaction_data) {
+ if (mpr->interaction_data) {
ManipulatorInteraction *inter = arrow->manipulator.interaction_data;
glEnable(GL_BLEND);
@@ -127,24 +127,24 @@ static void manipulator_arrow2d_draw(const bContext *UNUSED(C), struct wmManipul
}
static void manipulator_arrow2d_invoke(
- bContext *UNUSED(C), struct wmManipulator *manipulator, const wmEvent *UNUSED(event))
+ bContext *UNUSED(C), struct wmManipulator *mpr, const wmEvent *UNUSED(event))
{
ManipulatorInteraction *inter = MEM_callocN(sizeof(ManipulatorInteraction), __func__);
- copy_v2_v2(inter->init_origin, manipulator->origin);
- manipulator->interaction_data = inter;
+ copy_v2_v2(inter->init_origin, mpr->origin);
+ mpr->interaction_data = inter;
}
static int manipulator_arrow2d_test_select(
- bContext *UNUSED(C), struct wmManipulator *manipulator, const wmEvent *event)
+ bContext *UNUSED(C), struct wmManipulator *mpr, const wmEvent *event)
{
- ArrowManipulator2D *arrow = (ArrowManipulator2D *)manipulator;
+ ArrowManipulator2D *arrow = (ArrowManipulator2D *)mpr;
const float mval[2] = {event->mval[0], event->mval[1]};
- const float line_len = arrow->line_len * manipulator->scale;
+ const float line_len = arrow->line_len * mpr->scale;
float mval_local[2];
copy_v2_v2(mval_local, mval);
- sub_v2_v2(mval_local, manipulator->origin);
+ sub_v2_v2(mval_local, mpr->origin);
float line[2][2];
line[0][0] = line[0][1] = line[1][0] = 0.0f;
@@ -160,7 +160,7 @@ static int manipulator_arrow2d_test_select(
/* arrow line intersection check */
float isect_1[2], isect_2[2];
const int isect = isect_line_sphere_v2(
- line[0], line[1], mval_local, MANIPULATOR_HOTSPOT + manipulator->line_width * 0.5f,
+ line[0], line[1], mval_local, MANIPULATOR_HOTSPOT + mpr->line_width * 0.5f,
isect_1, isect_2);
if (isect > 0) {
@@ -200,15 +200,15 @@ struct wmManipulator *ED_manipulator_arrow2d_new(wmManipulatorGroup *mgroup, con
return &arrow->manipulator;
}
-void ED_manipulator_arrow2d_set_angle(struct wmManipulator *manipulator, const float angle)
+void ED_manipulator_arrow2d_set_angle(struct wmManipulator *mpr, const float angle)
{
- ArrowManipulator2D *arrow = (ArrowManipulator2D *)manipulator;
+ ArrowManipulator2D *arrow = (ArrowManipulator2D *)mpr;
arrow->angle = angle;
}
-void ED_manipulator_arrow2d_set_line_len(struct wmManipulator *manipulator, const float len)
+void ED_manipulator_arrow2d_set_line_len(struct wmManipulator *mpr, const float len)
{
- ArrowManipulator2D *arrow = (ArrowManipulator2D *)manipulator;
+ ArrowManipulator2D *arrow = (ArrowManipulator2D *)mpr;
arrow->line_len = len;
}
diff --git
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list