Commit: 3e0a09f6045e7936e6a187c743e135df6a245147
Author: Campbell Barton
Date: Fri Jun 9 15:40:37 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB3e0a09f6045e7936e6a187c743e135df6a245147
Cleanup: shorten struct member names
For wmManipulatorMap the its clear from the context we're
operating on manipulators.
===================================================================
M source/blender/editors/manipulator_library/arrow3d_manipulator.c
M source/blender/editors/manipulator_library/cage2d_manipulator.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_init_exit.c
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/manipulator_library/arrow3d_manipulator.c
b/source/blender/editors/manipulator_library/arrow3d_manipulator.c
index 954941ebe34..541a81bd38a 100644
--- a/source/blender/editors/manipulator_library/arrow3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/arrow3d_manipulator.c
@@ -533,7 +533,6 @@ static void MANIPULATOR_WT_arrow_3d(wmManipulatorType *wt)
wt->draw = manipulator_arrow_draw;
wt->draw_select = manipulator_arrow_render_3d_intersect;
wt->position_get = manipulator_arrow_get_final_pos;
- wt->intersect = NULL;
wt->modal = manipulator_arrow_modal;
wt->invoke = manipulator_arrow_invoke;
wt->prop_data_update = manipulator_arrow_prop_data_update;
diff --git a/source/blender/editors/manipulator_library/cage2d_manipulator.c
b/source/blender/editors/manipulator_library/cage2d_manipulator.c
index 20eeab9d90d..8bd449c5b1f 100644
--- a/source/blender/editors/manipulator_library/cage2d_manipulator.c
+++ b/source/blender/editors/manipulator_library/cage2d_manipulator.c
@@ -62,7 +62,7 @@
//#include "wm_manipulator_intern.h"
-/* wmManipulator->highlighted_part */
+/* wmManipulator->highlight_part */
enum {
ED_MANIPULATOR_RECT_TRANSFORM_INTERSECT_TRANSLATE = 1,
ED_MANIPULATOR_RECT_TRANSFORM_INTERSECT_SCALEX_LEFT = 2,
@@ -243,8 +243,9 @@ static void manipulator_rect_transform_draw(const bContext
*UNUSED(C), wmManipul
glLineWidth(cage->manipulator.line_width);
rect_transform_draw_corners(&r, w, h, manipulator->col);
- rect_transform_draw_interaction(manipulator->col,
manipulator->highlighted_part, half_w, half_h,
- w, h, cage->manipulator.line_width);
+ rect_transform_draw_interaction(
+ manipulator->col, manipulator->highlight_part, half_w, half_h,
+ w, h, cage->manipulator.line_width);
glLineWidth(1.0);
gpuPopMatrix();
@@ -252,7 +253,7 @@ static void manipulator_rect_transform_draw(const bContext
*UNUSED(C), wmManipul
static int manipulator_rect_transform_get_cursor(wmManipulator *manipulator)
{
- switch (manipulator->highlighted_part) {
+ switch (manipulator->highlight_part) {
case ED_MANIPULATOR_RECT_TRANSFORM_INTERSECT_TRANSLATE:
return BC_HANDCURSOR;
case ED_MANIPULATOR_RECT_TRANSFORM_INTERSECT_SCALEX_LEFT:
@@ -427,19 +428,19 @@ static void manipulator_rect_transform_modal(
const float valuey = (event->mval[1] - data->orig_mouse[1]);
- if (manipulator->highlighted_part ==
ED_MANIPULATOR_RECT_TRANSFORM_INTERSECT_TRANSLATE) {
+ if (manipulator->highlight_part ==
ED_MANIPULATOR_RECT_TRANSFORM_INTERSECT_TRANSLATE) {
manipulator->offset[0] = data->orig_offset[0] + valuex;
manipulator->offset[1] = data->orig_offset[1] + valuey;
}
- else if (manipulator->highlighted_part ==
ED_MANIPULATOR_RECT_TRANSFORM_INTERSECT_SCALEX_LEFT) {
+ else if (manipulator->highlight_part ==
ED_MANIPULATOR_RECT_TRANSFORM_INTERSECT_SCALEX_LEFT) {
manipulator->offset[0] = data->orig_offset[0] + valuex / 2.0;
cage->scale[0] = (cage->w * data->orig_scale[0] - valuex) /
cage->w;
}
- else if (manipulator->highlighted_part ==
ED_MANIPULATOR_RECT_TRANSFORM_INTERSECT_SCALEX_RIGHT) {
+ else if (manipulator->highlight_part ==
ED_MANIPULATOR_RECT_TRANSFORM_INTERSECT_SCALEX_RIGHT) {
manipulator->offset[0] = data->orig_offset[0] + valuex / 2.0;
cage->scale[0] = (cage->w * data->orig_scale[0] + valuex) /
cage->w;
}
- else if (manipulator->highlighted_part ==
ED_MANIPULATOR_RECT_TRANSFORM_INTERSECT_SCALEY_DOWN) {
+ else if (manipulator->highlight_part ==
ED_MANIPULATOR_RECT_TRANSFORM_INTERSECT_SCALEY_DOWN) {
manipulator->offset[1] = data->orig_offset[1] + valuey / 2.0;
if (cage->style &
ED_MANIPULATOR_RECT_TRANSFORM_STYLE_SCALE_UNIFORM) {
@@ -449,7 +450,7 @@ static void manipulator_rect_transform_modal(
cage->scale[1] = (cage->h * data->orig_scale[1] -
valuey) / cage->h;
}
}
- else if (manipulator->highlighted_part ==
ED_MANIPULATOR_RECT_TRANSFORM_INTERSECT_SCALEY_UP) {
+ else if (manipulator->highlight_part ==
ED_MANIPULATOR_RECT_TRANSFORM_INTERSECT_SCALEY_UP) {
manipulator->offset[1] = data->orig_offset[1] + valuey / 2.0;
if (cage->style &
ED_MANIPULATOR_RECT_TRANSFORM_STYLE_SCALE_UNIFORM) {
diff --git a/source/blender/windowmanager/intern/wm_event_system.c
b/source/blender/windowmanager/intern/wm_event_system.c
index 003aa5a9e41..70c22b38170 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2165,16 +2165,16 @@ static int wm_handlers_do_intern(bContext *C, wmEvent
*event, ListBase *handlers
ScrArea *area = CTX_wm_area(C);
ARegion *region = CTX_wm_region(C);
wmManipulatorMap *mmap =
handler->manipulator_map;
- wmManipulator *manipulator =
wm_manipulatormap_get_highlighted_manipulator(mmap);
- unsigned char part;
+ wmManipulator *manipulator =
wm_manipulatormap_highlight_get(mmap);
wm_manipulatormap_handler_context(C, handler);
wm_region_mouse_co(C, event);
/* handle manipulator highlighting */
- if (event->type == MOUSEMOVE &&
!wm_manipulatormap_get_active_manipulator(mmap)) {
- manipulator =
wm_manipulatormap_find_highlighted_manipulator(mmap, C, event, &part);
-
wm_manipulatormap_set_highlighted_manipulator(mmap, C, manipulator, part);
+ if (event->type == MOUSEMOVE &&
!wm_manipulatormap_active_get(mmap)) {
+ int part;
+ manipulator =
wm_manipulatormap_highlight_find(mmap, C, event, &part);
+ wm_manipulatormap_highlight_set(mmap,
C, manipulator, part);
}
/* handle user configurable manipulator-map
keymap */
else if (manipulator) {
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c
b/source/blender/windowmanager/intern/wm_init_exit.c
index 6cf27094e67..7d729f22cfe 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -171,7 +171,7 @@ void WM_init(bContext *C, int argc, const char **argv)
BKE_library_callback_free_window_manager_set(wm_close_and_free); /*
library.c */
BKE_library_callback_free_notifier_reference_set(WM_main_remove_notifier_reference);
/* library.c */
- BKE_region_callback_free_manipulatormap_set(wm_manipulatormap_delete);
/* screen.c */
+ BKE_region_callback_free_manipulatormap_set(wm_manipulatormap_remove);
/* screen.c */
BKE_library_callback_remap_editor_id_reference_set(WM_main_remap_editor_id_reference);
/* library.c */
BKE_blender_callback_test_break_set(wm_window_testbreak); /* blender.c
*/
BKE_spacedata_callback_id_remap_set(ED_spacedata_id_remap); /* screen.c
*/
diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_types.h
b/source/blender/windowmanager/manipulators/WM_manipulator_types.h
index 30ce4353e14..235f068654e 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_types.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_types.h
@@ -68,7 +68,7 @@ struct wmManipulator {
int flag; /* flags that influence the behavior or how the manipulators
are drawn */
short state; /* state flags (active, highlighted, selected) */
- unsigned char highlighted_part;
+ int highlight_part;
/* center of manipulator in space, 2d or 3d */
float origin[3];
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
index a1a103febb0..fcd60c75f6a 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
@@ -287,10 +287,10 @@ void WM_manipulator_free(ListBase *manipulatorlist,
wmManipulatorMap *mmap, wmMa
#endif
if (manipulator->state & WM_MANIPULATOR_STATE_HIGHLIGHT) {
- wm_manipulatormap_set_highlighted_manipulator(mmap, C, NULL, 0);
+ wm_manipulatormap_highlight_set(mmap, C, NULL, 0);
}
if (manipulator->state & WM_MANIPULATOR_STATE_ACTIVE) {
- wm_manipulatormap_set_active_manipulator(mmap, C, NULL, NULL);
+ wm_manipulatormap_active_set(mmap, C, NULL, NULL);
}
if (manipulator->state & WM_MANIPULATOR_STATE_SELECT) {
wm_manipulator_deselect(mmap, manipulator);
@@ -480,20 +480,20 @@ void WM_manipulator_set_fn_select(wmManipulator *mpr,
wmManipulatorFnSelect fn)
*/
bool wm_manipulator_deselect(wmManipulatorMap *mmap, wmManipulator
*manipulator)
{
- if (!mmap->mmap_context.selected_manipulator)
+ if (!mmap->mmap_context.selected)
return false;
- wmManipulator ***sel = &mmap->mmap_context.selected_manipulator;
- int *tot_selected = &mmap->mmap_context.tot_selected;
+ wmManipulator ***sel = &mmap->mmap_context.selected;
+ int *selected_len = &mmap->mmap_context.selected_len;
bool changed = false;
/* caller should check! */
BLI_assert(manipulator->state & WM_MANIPULATOR_STATE_SELECT);
/* remove manipulator from selected_manipulators array */
- for (int i = 0; i < (*tot_selected); i++) {
+ for (int i = 0; i < (*selected_len); i++) {
if ((*sel)[i] == manipulator) {
- for (int j = i; j < ((*tot_selected) - 1); j++) {
+ for (int j = i; j < ((*selected_len) - 1); j++) {
(*sel)[j] = (*sel)[j + 1];
}
changed = true;
@@ -502,12 +502,12 @@ bool wm_manipulator_deselect(wmManipulatorMap *mmap,
wmManipulator *manipulator)
}
/* update array data */
- if ((*tot_selected) <= 1) {
- wm_manipulatormap_selected_delete(mmap);
+ if ((*selected_len) <= 1) {
+ wm_manipulatormap_selected_clear(mmap);
}
else {
- *sel = MEM_reallocN(*sel, sizeof(**sel) * (*tot_selected));
- (*tot_selected)--;
+ *sel = MEM_reallocN(*sel, sizeof(**sel) * (*selected_len));
+ (*selected_len)--;
}
manipulator->state &= ~WM_MANIPULATOR_STATE_SELECT;
@@ -522,22 +522,22 @@ bool wm_manipulator_deselect(wmManipulatorMap *mmap,
wmManipulator *manipulator)
*/
bool wm_manipulator_select(bContext *C, wmManipulatorMap *mmap, wmManipulator
*manipulator)
{
- wmManipulator ***sel = &mmap->mmap_context.selected_manipulator;
- int *tot_selected = &mmap->mmap_context.tot_selected;
+ wmManipulator ***sel = &mmap->mmap_context.selected;
+ int *selected_len = &mmap->mmap_context.selected_len;
if (!manipulator || (manipulator->state & WM_MANIPULATOR_STATE_SELECT))
return
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
