Commit: 32cd1732592be2271220b511184e265d7a685fa6
Author: Julian Eisel
Date: Sun Sep 11 14:34:19 2016 +0200
Branches: temp_manipulators_core
https://developer.blender.org/rB32cd1732592be2271220b511184e265d7a685fa6
Rename functions and defines (widget->manipulator)
===================================================================
M source/blender/windowmanager/manipulators/WM_manipulator_api.h
M source/blender/windowmanager/manipulators/WM_manipulator_library.h
M source/blender/windowmanager/manipulators/WM_manipulator_types.h
M
source/blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c
M
source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
M
source/blender/windowmanager/manipulators/intern/manipulator_library/cage_manipulator.c
M
source/blender/windowmanager/manipulators/intern/manipulator_library/dial_manipulator.c
M
source/blender/windowmanager/manipulators/intern/manipulator_library/geom_arrow_manipulator.c
M
source/blender/windowmanager/manipulators/intern/manipulator_library/geom_cube_manipulator.c
M
source/blender/windowmanager/manipulators/intern/manipulator_library/geom_dial_manipulator.c
M
source/blender/windowmanager/manipulators/intern/manipulator_library/manipulator_geometry.h
M
source/blender/windowmanager/manipulators/intern/manipulator_library/manipulator_library_intern.h
M
source/blender/windowmanager/manipulators/intern/manipulator_library/manipulator_library_utils.c
M
source/blender/windowmanager/manipulators/intern/manipulator_library/primitive_manipulator.c
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/windowmanager/manipulators/WM_manipulator_api.h
b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
index 5af5bcd..a5fa6f6 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_api.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
@@ -51,68 +51,72 @@ struct wmManipulatorMapType_Params;
/* -------------------------------------------------------------------- */
/* wmManipulator */
-struct wmManipulator *WM_widget_new(
+struct wmManipulator *WM_manipulator_new(
void (*draw)(const struct bContext *, struct wmManipulator *),
void (*render_3d_intersection)(const struct bContext *, struct
wmManipulator *, int),
int (*intersect)(struct bContext *, const struct wmEvent *, struct
wmManipulator *),
int (*handler)(struct bContext *, const struct wmEvent *, struct
wmManipulator *, const int));
-void WM_widget_delete(ListBase *widgetlist, struct wmManipulatorMap *wmap,
struct wmManipulator *widget, struct bContext *C);
+void WM_manipulator_delete(ListBase *widgetlist, struct wmManipulatorMap
*wmap, struct wmManipulator *widget, struct bContext *C);
-void WM_widget_set_property(struct wmManipulator *, int slot, struct
PointerRNA *ptr, const char *propname);
-struct PointerRNA *WM_widget_set_operator(struct wmManipulator *, const char
*opname);
-void WM_widget_set_func_select(
+void WM_manipulator_set_property(struct wmManipulator *, int slot, struct
PointerRNA *ptr, const char *propname);
+struct PointerRNA *WM_manipulator_set_operator(struct wmManipulator *, const
char *opname);
+void WM_manipulator_set_func_select(
struct wmManipulator *widget,
void (*select)(struct bContext *, struct wmManipulator *, const int
action)); /* wmManipulatorSelectFunc */
-void WM_widget_set_origin(struct wmManipulator *widget, const float origin[3]);
-void WM_widget_set_offset(struct wmManipulator *widget, const float offset[3]);
-void WM_widget_set_flag(struct wmManipulator *widget, const int flag, const
bool enable);
-void WM_widget_set_scale(struct wmManipulator *widget, float scale);
-void WM_widget_set_line_width(struct wmManipulator *widget, const float
line_width);
-void WM_widget_set_colors(struct wmManipulator *widget, const float col[4],
const float col_hi[4]);
+void WM_manipulator_set_origin(struct wmManipulator *widget, const float
origin[3]);
+void WM_manipulator_set_offset(struct wmManipulator *widget, const float
offset[3]);
+void WM_manipulator_set_flag(struct wmManipulator *widget, const int flag,
const bool enable);
+void WM_manipulator_set_scale(struct wmManipulator *widget, float scale);
+void WM_manipulator_set_line_width(struct wmManipulator *widget, const float
line_width);
+void WM_manipulator_set_colors(struct wmManipulator *widget, const float
col[4], const float col_hi[4]);
/* -------------------------------------------------------------------- */
/* wmManipulatorGroup */
-struct wmManipulatorGroupType *WM_widgetgrouptype_append(
+struct wmManipulatorGroupType *WM_manipulatorgrouptype_append(
struct wmManipulatorMapType *wmaptype,
void (*wgrouptype_func)(struct wmManipulatorGroupType *));
-struct wmManipulatorGroupType *WM_widgetgrouptype_append_runtime(
+struct wmManipulatorGroupType *WM_manipulatorgrouptype_append_runtime(
const struct Main *main, struct wmManipulatorMapType *wmaptype,
void (*wgrouptype_func)(struct wmManipulatorGroupType *));
-void WM_widgetgrouptype_init_runtime(
+void WM_manipulatorgrouptype_init_runtime(
const struct Main *bmain, struct wmManipulatorMapType *wmaptype,
struct wmManipulatorGroupType *wgrouptype);
-void WM_widgetgrouptype_unregister(struct bContext *C, struct Main *bmain,
struct wmManipulatorGroupType *wgroup);
+void WM_manipulatorgrouptype_unregister(struct bContext *C, struct Main
*bmain, struct wmManipulatorGroupType *wgroup);
-struct wmKeyMap *WM_widgetgroup_keymap_common(
+struct wmKeyMap *WM_manipulatorgroup_keymap_common(
const struct wmManipulatorGroupType *wgrouptype, struct wmKeyConfig
*config);
-struct wmKeyMap *WM_widgetgroup_keymap_common_sel(
+struct wmKeyMap *WM_manipulatorgroup_keymap_common_sel(
const struct wmManipulatorGroupType *wgrouptype, struct wmKeyConfig
*config);
/* -------------------------------------------------------------------- */
/* wmManipulatorMap */
-struct wmManipulatorMapType *WM_widgetmaptype_find(const struct
wmManipulatorMapType_Params *wmap_params);
-struct wmManipulatorMapType *WM_widgetmaptype_ensure(const struct
wmManipulatorMapType_Params *wmap_params);
-struct wmManipulatorMap *WM_widgetmap_from_type(const struct
wmManipulatorMapType_Params *wmap_params);
-struct wmManipulatorMap *WM_widgetmap_find(const struct ARegion *ar, const
struct wmManipulatorMapType_Params *wmap_params);
-
-void WM_widgetmap_delete(struct wmManipulatorMap *wmap);
-void WM_widgetmaptypes_free(void);
-
-void WM_widgetmap_tag_refresh(struct wmManipulatorMap *wmap);
-void WM_widgetmap_widgets_update(const struct bContext *C, struct
wmManipulatorMap *wmap);
-void WM_widgetmap_widgets_draw(
+struct wmManipulatorMapType *WM_manipulatormaptype_find(
+ const struct wmManipulatorMapType_Params *wmap_params);
+struct wmManipulatorMapType *WM_manipulatormaptype_ensure(
+ const struct wmManipulatorMapType_Params *wmap_params);
+struct wmManipulatorMap *WM_manipulatormap_from_type(
+ const struct wmManipulatorMapType_Params *wmap_params);
+struct wmManipulatorMap *WM_manipulatormap_find(
+ const struct ARegion *ar, const struct wmManipulatorMapType_Params
*wmap_params);
+
+void WM_manipulatormap_delete(struct wmManipulatorMap *wmap);
+void WM_manipulatormaptypes_free(void);
+
+void WM_manipulatormap_tag_refresh(struct wmManipulatorMap *wmap);
+void WM_manipulatormap_widgets_update(const struct bContext *C, struct
wmManipulatorMap *wmap);
+void WM_manipulatormap_widgets_draw(
const struct bContext *C, const struct wmManipulatorMap *wmap,
const bool in_scene, const bool free_drawwidgets);
-void WM_widgetmaps_add_handlers(struct ARegion *ar);
+void WM_manipulatormaps_add_handlers(struct ARegion *ar);
-bool WM_widgetmap_select_all(struct bContext *C, struct wmManipulatorMap
*wmap, const int action);
+bool WM_manipulatormap_select_all(struct bContext *C, struct wmManipulatorMap
*wmap, const int action);
-bool WM_widgetmap_cursor_set(const struct wmManipulatorMap *wmap, struct
wmWindow *win);
+bool WM_manipulatormap_cursor_set(const struct wmManipulatorMap *wmap, struct
wmWindow *win);
#endif /* __WM_MANIPULATOR_API_H__ */
diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_library.h
b/source/blender/windowmanager/manipulators/WM_manipulator_library.h
index f170cc3..d07f29d 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_library.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_library.h
@@ -36,16 +36,16 @@ struct wmManipulatorGroup;
/* -------------------------------------------------------------------- */
-/* 3D Arrow Widget */
+/* 3D Arrow Manipulator */
enum {
- WIDGET_ARROW_STYLE_NORMAL = 1,
- WIDGET_ARROW_STYLE_NO_AXIS = (1 << 1),
- WIDGET_ARROW_STYLE_CROSS = (1 << 2),
- WIDGET_ARROW_STYLE_INVERTED = (1 << 3), /* inverted offset during
interaction - if set it also sets constrained below */
- WIDGET_ARROW_STYLE_CONSTRAINED = (1 << 4), /* clamp arrow interaction
to property width */
- WIDGET_ARROW_STYLE_BOX = (1 << 5), /* use a box for the
arrowhead */
- WIDGET_ARROW_STYLE_CONE = (1 << 6),
+ MANIPULATOR_ARROW_STYLE_NORMAL = 1,
+ MANIPULATOR_ARROW_STYLE_NO_AXIS = (1 << 1),
+ MANIPULATOR_ARROW_STYLE_CROSS = (1 << 2),
+ MANIPULATOR_ARROW_STYLE_INVERTED = (1 << 3), /* inverted offset
during interaction - if set it also sets constrained below */
+ MANIPULATOR_ARROW_STYLE_CONSTRAINED = (1 << 4), /* clamp arrow
interaction to property width */
+ MANIPULATOR_ARROW_STYLE_BOX = (1 << 5), /* use a box for the
arrowhead */
+ MANIPULATOR_ARROW_STYLE_CONE = (1 << 6),
};
/* slots for properties */
@@ -53,31 +53,31 @@ enum {
ARROW_SLOT_OFFSET_WORLD_SPACE = 0
};
-struct wmManipulator *WIDGET_arrow_new(struct wmManipulatorGroup *wgroup,
const char *name, const int style);
-void WIDGET_arrow_set_direction(struct wmManipulator *widget, const float
direction[3]);
-void WIDGET_arrow_set_up_vector(struct wmManipulator *widget, const float
direction[3]);
-void WIDGET_arrow_set_line_len(struct wmManipulator *widget, const float len);
-void WIDGET_arrow_set_ui_range(struct wmManipulator *widget, const float min,
const float max);
-void WIDGET_arrow_set_range_fac(struct wmManipulator *widget, const float
range_fac);
-void WIDGET_arrow_cone_set_aspect(struct wmManipulator *widget, const float
aspect[2]);
+struct wmManipulator *MANIPULATOR_arrow_new(struct wmManipulatorGroup *wgroup,
const char *name, const int style);
+void MANIPULATOR_arrow_set_direction(struct wmManipulator *widget, const float
direction[3]);
+void MANIPULATOR_arrow_set_up_vector(struct wmManipulator *widget, const float
direction[3]);
+void MANIPULATOR_arrow_set_line_len(struct wmManipulator *widget, const float
len);
+void MANIPULATOR_arrow_set_ui_range(struct wmManipulator *widget, const float
min, const float max);
+void MANIPULATOR_arrow_set_range_fac(struct wmManipulator *widget, const float
range_fac);
+void MANIPULATOR_arrow_cone_set_aspect(struct wmManipulator *widget, const
float aspect[2]);
/* -------------------------------------------------------------------- */
-/* 2D Arrow Widget */
+/* 2D Arrow Manipulator */
-struct wmManipulator *WIDGET_arrow2d_new(struct wmManipulatorGroup *wgroup,
const char *name);
-void WIDGET_arrow2d_set_angle(struct wmManipulator *widget, const float
rot_fac);
-void WIDGET_arrow2d_set_line_len(struct wmManipulator *widget, const float
len);
+struct wmManipulator *MANIPULATOR_arrow2d_new(struct wmManipulatorGroup
*wgroup, const char *name);
+void MANIPULATOR_arrow2d_set_angle(struct wmManipulator *widget, const float
rot_fac);
+void MANIPULATOR_arrow2d_set_line_len(struct wmM
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
