Commit: b464e9394744e303d483df8a57470079fc262fdf
Author: Julian Eisel
Date: Fri Sep 9 17:54:18 2016 +0200
Branches: temp_manipulators_core
https://developer.blender.org/rBb464e9394744e303d483df8a57470079fc262fdf
Rename types (wmWidget->wmManipulator)
===================================================================
M source/blender/makesdna/DNA_widget_types.h
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/WM_types.h
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/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
M source/blender/windowmanager/wm_event_system.h
===================================================================
diff --git a/source/blender/makesdna/DNA_widget_types.h
b/source/blender/makesdna/DNA_widget_types.h
index 9d77eab..2e957808 100644
--- a/source/blender/makesdna/DNA_widget_types.h
+++ b/source/blender/makesdna/DNA_widget_types.h
@@ -39,10 +39,10 @@ typedef enum WidgetType {
WT_CUSTOM = 3,
} WidgetType;
-typedef struct wmWidgetGroup {
- struct wmWidgetGroup *next, *prev;
+typedef struct wmManipulatorGroup {
+ struct wmManipulatorGroup *next, *prev;
- struct wmWidgetGroupType *type;
+ struct wmManipulatorGroupType *type;
ListBase widgets;
void *py_instance; /* python stores the class instance here
*/
@@ -52,6 +52,6 @@ typedef struct wmWidgetGroup {
void (*customdata_free)(void *); /* for freeing customdata from above */
int flag;
int pad;
-} wmWidgetGroup;
+} wmManipulatorGroup;
#endif /* __DNA_WIDGET_TYPES_H__ */
diff --git a/source/blender/windowmanager/WM_api.h
b/source/blender/windowmanager/WM_api.h
index 48c376e..e3f4b95 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -74,8 +74,8 @@ struct wmNDOFMotionData;
#endif
typedef struct wmJob wmJob;
-typedef struct wmWidget wmWidget;
-typedef struct wmWidgetMapType wmWidgetMapType;
+typedef struct wmManipulator wmManipulator;
+typedef struct wmManipulatorMapType wmManipulatorMapType;
/* general API */
void WM_init_state_size_set (int stax, int stay, int sizx,
int sizy);
diff --git a/source/blender/windowmanager/WM_types.h
b/source/blender/windowmanager/WM_types.h
index 6fd1d80..f080c59 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -568,7 +568,7 @@ typedef struct wmOperatorType {
struct wmKeyMap *modalkeymap;
/* widget group that is accessible while operator runs */
- wmWidgetGroupType *wgrouptype;
+ wmManipulatorGroupType *wgrouptype;
/* python needs the operator type as well */
int (*pyop_poll)(struct bContext *, struct wmOperatorType *ot)
ATTR_WARN_UNUSED_RESULT;
diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_api.h
b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
index 2ab1602..5af5bcd 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_api.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
@@ -27,7 +27,7 @@
* \ingroup wm
*
* \name Manipulator API
- * \brief API for external use of wmWidget types.
+ * \brief API for external use of wmManipulator types.
*
* Only included in WM_api.h
*/
@@ -42,77 +42,77 @@ struct wmEventHandler;
struct wmKeyConfig;
struct wmKeyMap;
struct wmOperator;
-struct wmWidgetGroup;
-struct wmWidgetGroupType;
-struct wmWidgetMap;
-struct wmWidgetMapType;
-struct wmWidgetMapType_Params;
+struct wmManipulatorGroup;
+struct wmManipulatorGroupType;
+struct wmManipulatorMap;
+struct wmManipulatorMapType;
+struct wmManipulatorMapType_Params;
/* -------------------------------------------------------------------- */
-/* wmWidget */
+/* wmManipulator */
-struct wmWidget *WM_widget_new(
- void (*draw)(const struct bContext *, struct wmWidget *),
- void (*render_3d_intersection)(const struct bContext *, struct
wmWidget *, int),
- int (*intersect)(struct bContext *, const struct wmEvent *, struct
wmWidget *),
- int (*handler)(struct bContext *, const struct wmEvent *, struct
wmWidget *, const int));
-void WM_widget_delete(ListBase *widgetlist, struct wmWidgetMap *wmap, struct
wmWidget *widget, struct bContext *C);
+struct wmManipulator *WM_widget_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_widget_set_property(struct wmWidget *, int slot, struct PointerRNA
*ptr, const char *propname);
-struct PointerRNA *WM_widget_set_operator(struct wmWidget *, const char
*opname);
+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(
- struct wmWidget *widget,
- void (*select)(struct bContext *, struct wmWidget *, const int
action)); /* wmWidgetSelectFunc */
-void WM_widget_set_origin(struct wmWidget *widget, const float origin[3]);
-void WM_widget_set_offset(struct wmWidget *widget, const float offset[3]);
-void WM_widget_set_flag(struct wmWidget *widget, const int flag, const bool
enable);
-void WM_widget_set_scale(struct wmWidget *widget, float scale);
-void WM_widget_set_line_width(struct wmWidget *widget, const float line_width);
-void WM_widget_set_colors(struct wmWidget *widget, const float col[4], const
float col_hi[4]);
+ 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]);
/* -------------------------------------------------------------------- */
-/* wmWidgetGroup */
-
-struct wmWidgetGroupType *WM_widgetgrouptype_append(
- struct wmWidgetMapType *wmaptype,
- void (*wgrouptype_func)(struct wmWidgetGroupType *));
-struct wmWidgetGroupType *WM_widgetgrouptype_append_runtime(
- const struct Main *main, struct wmWidgetMapType *wmaptype,
- void (*wgrouptype_func)(struct wmWidgetGroupType *));
+/* wmManipulatorGroup */
+
+struct wmManipulatorGroupType *WM_widgetgrouptype_append(
+ struct wmManipulatorMapType *wmaptype,
+ void (*wgrouptype_func)(struct wmManipulatorGroupType *));
+struct wmManipulatorGroupType *WM_widgetgrouptype_append_runtime(
+ const struct Main *main, struct wmManipulatorMapType *wmaptype,
+ void (*wgrouptype_func)(struct wmManipulatorGroupType *));
void WM_widgetgrouptype_init_runtime(
- const struct Main *bmain, struct wmWidgetMapType *wmaptype,
- struct wmWidgetGroupType *wgrouptype);
-void WM_widgetgrouptype_unregister(struct bContext *C, struct Main *bmain,
struct wmWidgetGroupType *wgroup);
+ const struct Main *bmain, struct wmManipulatorMapType *wmaptype,
+ struct wmManipulatorGroupType *wgrouptype);
+void WM_widgetgrouptype_unregister(struct bContext *C, struct Main *bmain,
struct wmManipulatorGroupType *wgroup);
struct wmKeyMap *WM_widgetgroup_keymap_common(
- const struct wmWidgetGroupType *wgrouptype, struct wmKeyConfig
*config);
+ const struct wmManipulatorGroupType *wgrouptype, struct wmKeyConfig
*config);
struct wmKeyMap *WM_widgetgroup_keymap_common_sel(
- const struct wmWidgetGroupType *wgrouptype, struct wmKeyConfig
*config);
+ const struct wmManipulatorGroupType *wgrouptype, struct wmKeyConfig
*config);
/* -------------------------------------------------------------------- */
-/* wmWidgetMap */
+/* wmManipulatorMap */
-struct wmWidgetMapType *WM_widgetmaptype_find(const struct
wmWidgetMapType_Params *wmap_params);
-struct wmWidgetMapType *WM_widgetmaptype_ensure(const struct
wmWidgetMapType_Params *wmap_params);
-struct wmWidgetMap *WM_widgetmap_from_type(const struct wmWidgetMapType_Params
*wmap_params);
-struct wmWidgetMap *WM_widgetmap_find(const struct ARegion *ar, const struct
wmWidgetMapType_Params *wmap_params);
+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 wmWidgetMap *wmap);
+void WM_widgetmap_delete(struct wmManipulatorMap *wmap);
void WM_widgetmaptypes_free(void);
-void WM_widgetmap_tag_refresh(struct wmWidgetMap *wmap);
-void WM_widgetmap_widgets_update(const struct bContext *C, struct wmWidgetMap
*wmap);
+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(
- const struct bContext *C, const struct wmWidgetMap *wmap,
+ const struct bContext *C, const struct wmManipulatorMap *wmap,
const bool in_scene, const bool free_drawwidgets);
void WM_widgetmaps_add_handlers(struct ARegion *ar);
-bool WM_widgetmap_select_all(struct bContext *C, struct wmWidgetMap *wmap,
const int action);
+bool WM_widgetmap_select_all(struct bContext *C, struct wmManipulatorMap
*wmap, const int action);
-bool WM_widgetmap_cursor_set(const struct wmWidgetMap *wmap, struct wmWindow
*win);
+bool WM_widgetmap_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 b2912bb..f170cc3 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_library.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_library.h
@@ -32,7 +32,7 @@
#ifndef __WM_MANIPULATOR_LIBRARY_H__
#define __WM_MANIPULATOR_LIBRARY_H__
-struct wmWidgetGroup;
+struct wmManipulatorGroup;
/* ---------------------------------------
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
