[Bf-blender-cvs] [77d809c] wiggly-widgets: Bunch of minor cleanup
Julian Eisel
noreply at git.blender.org
Fri Sep 25 22:34:28 CEST 2015
Commit: 77d809cd6b6f306c7c355ee3cf27aa20d4816b9b
Author: Julian Eisel
Date: Fri Sep 25 22:09:41 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB77d809cd6b6f306c7c355ee3cf27aa20d4816b9b
Bunch of minor cleanup
===================================================================
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/WM_types.h
M source/blender/windowmanager/intern/wm_generic_widgets.c
M source/blender/windowmanager/intern/wm_widgets.c
M source/blender/windowmanager/wm.h
M source/blender/windowmanager/wm_event_system.h
===================================================================
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 1e5e09b..60aea03 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -504,12 +504,12 @@ struct wmWidget *WM_widget_new(void (*draw)(const struct bContext *, struct wmWi
int (*intersect)(struct bContext *, const struct wmEvent *, struct wmWidget *),
int (*handler)(struct bContext *, const struct wmEvent *, struct wmWidget *));
-void WM_widgets_update(const struct bContext *C, struct wmWidgetMap *wmap);
-void WM_widgets_draw(const struct bContext *C, const struct wmWidgetMap *wmap, const bool in_scene);
-void WM_event_add_area_widgetmap_handlers(struct ARegion *ar);
-void WM_modal_handler_attach_widgetgroup(struct bContext *C, struct wmEventHandler *handler,
- struct wmWidgetGroupType *wgrouptype, struct wmOperator *op);
-void WM_widgetgroup_customdata_set(struct wmWidgetGroup *wgroup, void *data);
+void WM_widgets_update(const struct bContext *C, struct wmWidgetMap *wmap);
+void WM_widgets_draw(const struct bContext *C, const struct wmWidgetMap *wmap, const bool in_scene);
+void WM_event_add_area_widgetmap_handlers(struct ARegion *ar);
+void WM_modal_handler_attach_widgetgroup(struct bContext *C, struct wmEventHandler *handler,
+ struct wmWidgetGroupType *wgrouptype, struct wmOperator *op);
+void WM_widgetgroup_customdata_set(struct wmWidgetGroup *wgroup, void *data);
void *WM_widgetgroup_customdata(const struct wmWidgetGroup *wgroup);
/* wmWidget->flag */
@@ -536,14 +536,14 @@ 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]);
-wmKeyMap *WM_widgetgroup_keymap_common(wmKeyConfig *config, struct wmWidgetGroupType *wgroup);
+wmKeyMap *WM_widgetgroup_keymap_common(wmKeyConfig *config, const char *wgroupname);
struct wmWidgetMapType *WM_widgetmaptype_find(const char *idname, const int spaceid, const int regionid,
const bool is_3d, const bool create);
struct wmWidgetGroupType *WM_widgetgrouptype_new(
int (*poll)(const struct bContext *, struct wmWidgetGroupType *),
void (*create)(const struct bContext *, struct wmWidgetGroup *),
- wmKeyMap *(*keymap_init)(wmKeyConfig *, struct wmWidgetGroupType *),
+ wmKeyMap *(*keymap_init)(wmKeyConfig *, const char *),
const struct Main *bmain, const char *mapidname, const char *name,
const short spaceid, const short regionid, const bool is_3d);
void WM_widgetgrouptype_unregister(struct bContext *C, struct Main *bmain, struct wmWidgetGroupType *wgroup);
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index a68e125..3e43047 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -674,12 +674,10 @@ typedef struct wmDropBox {
/* WidgetGroups store and manage groups of widgets.
- * They are responsible for drawing necessary widgets and updating their state and position.
- * Also they */
+ * They are responsible for drawing necessary widgets and updating their state and position. */
typedef struct wmWidget wmWidget;
typedef struct wmWidgetGroup wmWidgetGroup;
typedef struct wmWidgetMapType wmWidgetMapType;
-typedef struct wmWidgetGroupType wmWidgetGroupType;
/* factory class for a widgetgroup type, gets called every time a new area is spawned */
typedef struct wmWidgetGroupType {
@@ -695,7 +693,7 @@ typedef struct wmWidgetGroupType {
void (*create)(const struct bContext *C, struct wmWidgetGroup *wgroup);
/* keymap init callback for this widgetgroup */
- struct wmKeyMap *(*keymap_init)(struct wmKeyConfig *, struct wmWidgetGroupType *);
+ struct wmKeyMap *(*keymap_init)(struct wmKeyConfig *, const char *);
/* keymap created with callback from above */
struct wmKeyMap *keymap;
diff --git a/source/blender/windowmanager/intern/wm_generic_widgets.c b/source/blender/windowmanager/intern/wm_generic_widgets.c
index 65d6263..7e26c08 100644
--- a/source/blender/windowmanager/intern/wm_generic_widgets.c
+++ b/source/blender/windowmanager/intern/wm_generic_widgets.c
@@ -277,7 +277,7 @@ static void arrow_draw_geom(const ArrowWidget *arrow, const bool select)
GLUquadricObj *qobj = gluNewQuadric();
const float len = 0.25f;
const float width = 0.06f;
- const bool use_lighting = !select && ((U.tw_flag & V3D_SHADED_WIDGETS) != 0);
+ const bool use_lighting = select == false && ((U.tw_flag & V3D_SHADED_WIDGETS) != 0);
/* translate to line end */
glTranslatef(0.0f, 0.0f, arrow->len);
@@ -298,7 +298,6 @@ static void arrow_draw_geom(const ArrowWidget *arrow, const bool select)
}
glPopMatrix();
- (void)select;
#endif
}
@@ -337,7 +336,7 @@ static void arrow_draw_intern(ArrowWidget *arrow, const bool select, const bool
}
glEnable(GL_BLEND);
- glTranslatef(UNPACK3(arrow->widget.offset));
+ glTranslate3fv(arrow->widget.offset);
arrow_draw_geom(arrow, select);
glDisable(GL_BLEND);
@@ -355,7 +354,7 @@ static void arrow_draw_intern(ArrowWidget *arrow, const bool select, const bool
glEnable(GL_BLEND);
glColor4f(0.5f, 0.5f, 0.5f, 0.5f);
- glTranslatef(UNPACK3(arrow->widget.offset));
+ glTranslate3fv(arrow->widget.offset);
arrow_draw_geom(arrow, select);
glDisable(GL_BLEND);
@@ -396,6 +395,7 @@ static int widget_arrow_handler(bContext *C, const wmEvent *event, wmWidget *wid
float facdir = 1.0f;
bool use_vertical = false;
+
copy_v3_v3(orig_origin, data->orig_origin);
orig_origin[3] = 1.0f;
add_v3_v3v3(offset, orig_origin, arrow->direction);
@@ -766,7 +766,7 @@ static void dial_draw_geom(const DialWidget *dial, const bool select)
gluDisk(qobj, 0.0, width, resol, 1);
glLineWidth(1.0);
- (void)select;
+ UNUSED_VARS(select);
#endif
glDisable(GL_MULTISAMPLE_ARB);
@@ -791,7 +791,7 @@ static void dial_draw_intern(DialWidget *dial, const bool select, const bool hig
else
glColor4fv(dial->widget.col);
- glTranslatef(UNPACK3(dial->widget.offset));
+ glTranslate3fv(dial->widget.offset);
dial_draw_geom(dial, select);
glPopMatrix();
@@ -972,7 +972,7 @@ static void widget_plane_draw_intern(PlaneWidget *plane, const bool UNUSED(selec
col_inner[3] *= 0.5f;
glEnable(GL_BLEND);
- glTranslatef(UNPACK3(plane->widget.offset));
+ glTranslate3fv(plane->widget.offset);
widget_plane_draw_geom(col_inner, col_outer);
glDisable(GL_BLEND);
@@ -1105,7 +1105,7 @@ static void rect_transform_draw_interaction(
{
float verts[4][2];
unsigned short elems[4] = {0, 1, 3, 2};
-
+
switch (highlighted) {
case WIDGET_RECT_TRANSFORM_INTERSECT_SCALEX_LEFT:
verts[0][0] = -half_w + w;
@@ -1117,7 +1117,7 @@ static void rect_transform_draw_interaction(
verts[3][0] = -half_w + w;
verts[3][1] = half_h;
break;
-
+
case WIDGET_RECT_TRANSFORM_INTERSECT_SCALEX_RIGHT:
verts[0][0] = half_w - w;
verts[0][1] = -half_h;
@@ -1128,7 +1128,7 @@ static void rect_transform_draw_interaction(
verts[3][0] = half_w - w;
verts[3][1] = half_h;
break;
-
+
case WIDGET_RECT_TRANSFORM_INTERSECT_SCALEY_DOWN:
verts[0][0] = -half_w;
verts[0][1] = -half_h + h;
@@ -1139,7 +1139,7 @@ static void rect_transform_draw_interaction(
verts[3][0] = half_w;
verts[3][1] = -half_h + h;
break;
-
+
case WIDGET_RECT_TRANSFORM_INTERSECT_SCALEY_UP:
verts[0][0] = -half_w;
verts[0][1] = half_h - h;
@@ -1150,11 +1150,11 @@ static void rect_transform_draw_interaction(
verts[3][0] = half_w;
verts[3][1] = half_h - h;
break;
-
+
default:
return;
}
-
+
glEnableClientState(GL_VERTEX_ARRAY);
glVertexPointer(2, GL_FLOAT, 0, verts);
glLineWidth(line_width + 3.0);
@@ -1165,7 +1165,7 @@ static void rect_transform_draw_interaction(
glDrawArrays(GL_LINE_STRIP, 0, 3);
glLineWidth(1.0);
- (void)elems;
+ UNUSED_VARS(elems);
}
static void widget_rect_transform_draw(const bContext *UNUSED(C), wmWidget *widget)
@@ -1177,12 +1177,12 @@ static void widget_rect_transform_draw(const bContext *UNUSED(C), wmWidget *widg
float half_w = w / 2.0f;
float half_h = h / 2.0f;
float aspx = 1.0f, aspy = 1.0f;
-
+
r.xmin = -half_w;
r.ymin = -half_h;
r.xmax = half_w;
r.ymax = half_h;
-
+
glPushMatrix();
glTranslatef(widget->origin[0] + widget->offset[0], widget->origin[1] + widget->offset[1], 0.0f);
if (cage->style & WIDGET_RECT_TRANSFORM_STYLE_SCALE_UNIFORM)
@@ -1245,7 +1245,7 @@ static int widget_rect_transform_intersect(bContext *UNUSED(C), const wmEvent *e
bool isect;
rctf r;
float aspx = 1.0f, aspy = 1.0f;
-
+
/* rotate mouse in relation to the center and relocate it */
sub_v2_v2v2(point_local, mouse, widget->origin);
point_local[0] -= widget->offset[0];
@@ -1258,7 +1258,7 @@ static int widget_rect_transform_intersect(bContext *UNUSED(C), const wmEvent *e
point_local[0] /= cage->scale[0];
point_local[1] /= cage->scale[0];
}
-
+
if (cage->w > cage->h)
aspx = h / w;
else
@@ -1271,9 +1271,9 @@ static int widget_rect_transform_intersect(bContext *UNUSED(C), const wmEvent *e
r.ymin = -half_h + h;
r.xmax = half_w - w;
r.ymax = half_h - h;
-
+
isect = BLI_rctf_isect_pt_v(&r, point_local);
-
+
if (isect)
return WIDGET_RECT_TRANSFORM_INTERSECT_TRANSLATE;
@@ -1283,43 +1283,43 @@ static int widget_rect_transform_intersect(bContext *UNUSED(C), const wmEvent *e
r.ymin = -half_h;
r.xmax = -half_w + w;
r.ymax = half_h;
-
+
isect = BLI_rctf_isect_pt_v(&r, point_local);
-
+
if (isect)
return WIDGET_RECT_TRANSFORM_INTERSECT_SCALEX_LEFT;
-
+
r.xmin = half_w - w;
r.ymin = -half_h;
r.xmax = half_w;
r.ymax = half_h;
-
+
isect = BLI_rctf_isect_pt_v(&r, point_local);
-
+
if (isect)
return WIDGET_RECT_TRANSFORM_INTERSECT_SCALEX_RIGHT;
-
+
r.xmin = -half_w;
r.ymin = -half_h;
r.xmax = half_w;
r.ymax = -half_h + h;
-
+
isect = B
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list