[Bf-blender-cvs] [8e7e73a] temp_manipulators_core: Rename remaining structs (widget->manipulator)
Julian Eisel
noreply at git.blender.org
Sun Sep 11 14:56:50 CEST 2016
Commit: 8e7e73afa600e7f42b04c5f6cd0eba502eebcf98
Author: Julian Eisel
Date: Sun Sep 11 14:56:09 2016 +0200
Branches: temp_manipulators_core
https://developer.blender.org/rB8e7e73afa600e7f42b04c5f6cd0eba502eebcf98
Rename remaining structs (widget->manipulator)
And some other stuff ;)
===================================================================
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/wm_event_types.h
===================================================================
diff --git a/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c b/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c
index e181af4..9a7a2fa 100644
--- a/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c
+++ b/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c
@@ -28,8 +28,6 @@
*
* \name 2D Arrow Manipulator
*
- * 2D Widget
- *
* \brief Simple arrow widget which is dragged into a certain direction.
*/
@@ -60,15 +58,15 @@
#include "manipulator_library_intern.h"
-typedef struct ArrowWidget2D {
+typedef struct ArrowManipulator2D {
wmManipulator widget;
float angle;
float line_len;
-} ArrowWidget2D;
+} ArrowManipulator2D;
-static void arrow2d_draw_geom(ArrowWidget2D *arrow, const float origin[2])
+static void arrow2d_draw_geom(ArrowManipulator2D *arrow, const float origin[2])
{
const float size = 0.11f;
const float size_h = size / 2.0f;
@@ -98,7 +96,7 @@ static void arrow2d_draw_geom(ArrowWidget2D *arrow, const float origin[2])
static void manipulator_arrow2d_draw(const bContext *UNUSED(C), wmManipulator *widget)
{
- ArrowWidget2D *arrow = (ArrowWidget2D *)widget;
+ ArrowManipulator2D *arrow = (ArrowManipulator2D *)widget;
const float *col = manipulator_color_get(widget, widget->flag & WM_MANIPULATOR_HIGHLIGHT);
glColor4fv(col);
@@ -108,7 +106,7 @@ static void manipulator_arrow2d_draw(const bContext *UNUSED(C), wmManipulator *w
glDisable(GL_BLEND);
if (arrow->widget.interaction_data) {
- WidgetInteraction *inter = arrow->widget.interaction_data;
+ ManipulatorInteraction *inter = arrow->widget.interaction_data;
glColor4f(0.5f, 0.5f, 0.5f, 0.5f);
glEnable(GL_BLEND);
@@ -119,7 +117,7 @@ static void manipulator_arrow2d_draw(const bContext *UNUSED(C), wmManipulator *w
static int manipulator_arrow2d_invoke(bContext *UNUSED(C), const wmEvent *UNUSED(event), wmManipulator *widget)
{
- WidgetInteraction *inter = MEM_callocN(sizeof(WidgetInteraction), __func__);
+ ManipulatorInteraction *inter = MEM_callocN(sizeof(ManipulatorInteraction), __func__);
copy_v2_v2(inter->init_origin, widget->origin);
widget->interaction_data = inter;
@@ -129,7 +127,7 @@ static int manipulator_arrow2d_invoke(bContext *UNUSED(C), const wmEvent *UNUSED
static int manipulator_arrow2d_intersect(bContext *UNUSED(C), const wmEvent *event, wmManipulator *widget)
{
- ArrowWidget2D *arrow = (ArrowWidget2D *)widget;
+ ArrowManipulator2D *arrow = (ArrowManipulator2D *)widget;
const float mval[2] = {event->mval[0], event->mval[1]};
const float line_len = arrow->line_len * widget->scale;
float mval_local[2];
@@ -175,13 +173,13 @@ static int manipulator_arrow2d_intersect(bContext *UNUSED(C), const wmEvent *eve
}
/* -------------------------------------------------------------------- */
-/** \name 2D Arrow Widget API
+/** \name 2D Arrow Manipulator API
*
* \{ */
wmManipulator *MANIPULATOR_arrow2d_new(wmManipulatorGroup *wgroup, const char *name)
{
- ArrowWidget2D *arrow = MEM_callocN(sizeof(ArrowWidget2D), __func__);
+ ArrowManipulator2D *arrow = MEM_callocN(sizeof(ArrowManipulator2D), __func__);
arrow->widget.draw = manipulator_arrow2d_draw;
arrow->widget.invoke = manipulator_arrow2d_invoke;
@@ -200,17 +198,17 @@ wmManipulator *MANIPULATOR_arrow2d_new(wmManipulatorGroup *wgroup, const char *n
void MANIPULATOR_arrow2d_set_angle(wmManipulator *widget, const float angle)
{
- ArrowWidget2D *arrow = (ArrowWidget2D *)widget;
+ ArrowManipulator2D *arrow = (ArrowManipulator2D *)widget;
arrow->angle = angle;
}
void MANIPULATOR_arrow2d_set_line_len(wmManipulator *widget, const float len)
{
- ArrowWidget2D *arrow = (ArrowWidget2D *)widget;
+ ArrowManipulator2D *arrow = (ArrowManipulator2D *)widget;
arrow->line_len = len;
}
-/** \} */ /* Arrow Widget API */
+/** \} */ /* Arrow Manipulator API */
/* -------------------------------------------------------------------- */
diff --git a/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c b/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
index 47d6d24..3340ed2 100644
--- a/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
+++ b/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
@@ -28,7 +28,7 @@
*
* \name Arrow Manipulator
*
- * 3D Widget
+ * 3D Manipulator
*
* \brief Simple arrow widget which is dragged into a certain direction.
* The arrow head can have varying shapes, e.g. cone, box, etc.
@@ -65,20 +65,20 @@
//#define WIDGET_USE_CUSTOM_ARROWS
#ifdef WIDGET_USE_CUSTOM_ARROWS
-WidgetDrawInfo arrow_head_draw_info = {0};
+ManipulatorDrawInfo arrow_head_draw_info = {0};
#endif
-WidgetDrawInfo cube_draw_info = {0};
+ManipulatorDrawInfo cube_draw_info = {0};
-/* ArrowWidget->flag */
+/* ArrowManipulator->flag */
enum {
ARROW_UP_VECTOR_SET = (1 << 0),
ARROW_CUSTOM_RANGE_SET = (1 << 1),
};
-typedef struct ArrowWidget {
+typedef struct ArrowManipulator {
wmManipulator widget;
- WidgetCommonData data;
+ ManipulatorCommonData data;
int style;
int flag;
@@ -87,20 +87,20 @@ typedef struct ArrowWidget {
float direction[3];
float up[3];
float aspect[2]; /* cone style only */
-} ArrowWidget;
+} ArrowManipulator;
/* -------------------------------------------------------------------- */
static void manipulator_arrow_get_final_pos(wmManipulator *widget, float r_pos[3])
{
- ArrowWidget *arrow = (ArrowWidget *)widget;
+ ArrowManipulator *arrow = (ArrowManipulator *)widget;
mul_v3_v3fl(r_pos, arrow->direction, arrow->data.offset);
add_v3_v3(r_pos, arrow->widget.origin);
}
-static void arrow_draw_geom(const ArrowWidget *arrow, const bool select)
+static void arrow_draw_geom(const ArrowManipulator *arrow, const bool select)
{
if (arrow->style & MANIPULATOR_ARROW_STYLE_CROSS) {
glPushAttrib(GL_ENABLE_BIT);
@@ -193,7 +193,7 @@ static void arrow_draw_geom(const ArrowWidget *arrow, const bool select)
}
}
-static void arrow_draw_intern(ArrowWidget *arrow, const bool select, const bool highlight)
+static void arrow_draw_intern(ArrowManipulator *arrow, const bool select, const bool highlight)
{
const float up[3] = {0.0f, 0.0f, 1.0f};
float rot[3][3];
@@ -232,7 +232,7 @@ static void arrow_draw_intern(ArrowWidget *arrow, const bool select, const bool
glPopMatrix();
if (arrow->widget.interaction_data) {
- WidgetInteraction *inter = arrow->widget.interaction_data;
+ ManipulatorInteraction *inter = arrow->widget.interaction_data;
copy_m4_m3(mat, rot);
copy_v3_v3(mat[3], inter->init_origin);
@@ -254,12 +254,12 @@ static void arrow_draw_intern(ArrowWidget *arrow, const bool select, const bool
static void manipulator_arrow_render_3d_intersect(const bContext *UNUSED(C), wmManipulator *widget, int selectionbase)
{
GPU_select_load_id(selectionbase);
- arrow_draw_intern((ArrowWidget *)widget, true, false);
+ arrow_draw_intern((ArrowManipulator *)widget, true, false);
}
static void manipulator_arrow_draw(const bContext *UNUSED(C), wmManipulator *widget)
{
- arrow_draw_intern((ArrowWidget *)widget, false, (widget->flag & WM_MANIPULATOR_HIGHLIGHT) != 0);
+ arrow_draw_intern((ArrowManipulator *)widget, false, (widget->flag & WM_MANIPULATOR_HIGHLIGHT) != 0);
}
/**
@@ -270,8 +270,8 @@ static void manipulator_arrow_draw(const bContext *UNUSED(C), wmManipulator *wid
static int manipulator_arrow_handler(bContext *C, const wmEvent *event, wmManipulator *widget, const int flag)
{
- ArrowWidget *arrow = (ArrowWidget *)widget;
- WidgetInteraction *inter = widget->interaction_data;
+ ArrowManipulator *arrow = (ArrowManipulator *)widget;
+ ManipulatorInteraction *inter = widget->interaction_data;
ARegion *ar = CTX_wm_region(C);
RegionView3D *rv3d = ar->regiondata;
@@ -354,7 +354,7 @@ static int manipulator_arrow_handler(bContext *C, const wmEvent *event, wmManipu
}
- WidgetCommonData *data = &arrow->data;
+ ManipulatorCommonData *data = &arrow->data;
const float ofs_new = facdir * len_v3(offset);
const int slot = ARROW_SLOT_OFFSET_WORLD_SPACE;
@@ -385,8 +385,8 @@ static int manipulator_arrow_handler(bContext *C, const wmEvent *event, wmManipu
static int manipulator_arrow_invoke(bContext *UNUSED(C), const wmEvent *event, wmManipulator *widget)
{
- ArrowWidget *arrow = (ArrowWidget *)widget;
- WidgetInteraction *inter = MEM_callocN(sizeof(WidgetInteraction), __func__);
+ ArrowManipulator *arrow = (ArrowManipulator *)widget;
+ ManipulatorInteraction *inter = MEM_callocN(sizeof(ManipulatorInteraction), __func__);
PointerRNA ptr = widget->ptr[ARROW_SLOT_OFFSET_WORLD_SPACE];
PropertyRNA *prop = widget->props[ARROW_SLOT_OFFSET_WORLD_SPACE];
@@ -410,7 +410,7 @@ static int manipulator_arrow_invoke(bContext *UNUSED(C), const wmEvent *event, w
static void manipulator_arrow_prop_data_update(wmManipulator *widget, const int slot)
{
- ArrowWidget *arrow = (ArrowWidget *)widget;
+ ArrowManipulator *arrow = (ArrowManipulator *)widget;
manipulator_property_data_update(
widget, &arrow->data, slot,
arrow->style & MANIPULATOR_ARROW_STYLE_CONSTRAINED,
@@ -422,9 +422,9 @@ static void manipulator_arrow_exit(bContext *C, wmManipulator *widget, const boo
if (!cancel)
return;
- ArrowWidget *arrow = (ArrowWidget *)widget;
- WidgetCommonData *data = &arrow->data;
- WidgetInteraction *inter = widget->interaction_data;
+ ArrowManipulator *arrow = (ArrowManipulator *)widget;
+ ManipulatorCommonData *data = &arrow->data;
+ ManipulatorInteraction *inter = widget->interaction_data;
manipulator_property_value_reset(C, widget, inter, ARROW_SLOT_OFFSET_WORLD_SPACE);
data->offset = inter->init_offset;
@@ -432,7 +432,7 @@ static void manipulator_arrow_exit(bContext *C, wmManipulator *widget, const boo
/* -------------------------------------------------------------------- */
-/** \name Arrow Widget API
+/** \name Arrow Manipulator API
*
* \{ */
@@ -465,7 +465,7 @@ wmManipulator *MANIPULATOR_arrow_new(wmManipulatorGroup *wgroup, c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list