Revision: 50100
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50100
Author: campbellbarton
Date: 2012-08-21 20:34:05 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
code cleanup: use rect size macros
Modified Paths:
--------------
trunk/blender/source/blender/blenfont/intern/blf_font.c
trunk/blender/source/blender/blenkernel/intern/colortools.c
trunk/blender/source/blender/blenlib/intern/rct.c
trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/interface/view2d.c
trunk/blender/source/blender/editors/interface/view2d_ops.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/screen/glutil.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/screen/screendump.c
trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c
trunk/blender/source/blender/editors/space_buttons/buttons_header.c
trunk/blender/source/blender/editors/space_graph/graph_edit.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_image/image_edit.c
trunk/blender/source/blender/editors/space_node/node_draw.c
trunk/blender/source/blender/editors/space_node/node_view.c
trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_text/text_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/transform/transform_snap.c
trunk/blender/source/blender/nodes/composite/node_composite_util.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/imagetexture.c
trunk/blender/source/blender/render/intern/source/initrender.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/rendercore.c
trunk/blender/source/blender/render/intern/source/shadbuf.c
trunk/blender/source/blender/windowmanager/intern/wm_subwindow.c
Modified: trunk/blender/source/blender/blenfont/intern/blf_font.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_font.c 2012-08-21
19:35:06 UTC (rev 50099)
+++ trunk/blender/source/blender/blenfont/intern/blf_font.c 2012-08-21
20:34:05 UTC (rev 50100)
@@ -456,7 +456,7 @@
ya = 1.0f;
blf_font_boundbox(font, str, &box);
- return (box.ymax - box.ymin) * ya;
+ return BLI_RCT_SIZE_Y(&box) * ya;
}
float blf_font_fixed_width(FontBLF *font)
Modified: trunk/blender/source/blender/blenkernel/intern/colortools.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/colortools.c 2012-08-21
19:35:06 UTC (rev 50099)
+++ trunk/blender/source/blender/blenkernel/intern/colortools.c 2012-08-21
20:34:05 UTC (rev 50100)
@@ -668,7 +668,7 @@
CurveMap *cuma = cumap->cm + cumap->cur;
CurveMapPoint *cmp = cuma->curve;
rctf *clipr = &cumap->clipr;
- float thresh = 0.01f * (clipr->xmax - clipr->xmin);
+ float thresh = 0.01f * BLI_RCT_SIZE_X(clipr);
float dx = 0.0f, dy = 0.0f;
int a;
Modified: trunk/blender/source/blender/blenlib/intern/rct.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/rct.c 2012-08-21 19:35:06 UTC
(rev 50099)
+++ trunk/blender/source/blender/blenlib/intern/rct.c 2012-08-21 20:34:05 UTC
(rev 50100)
@@ -366,9 +366,9 @@
void BLI_rcti_rctf_copy(rcti *dst, const rctf *src)
{
dst->xmin = floorf(src->xmin + 0.5f);
- dst->xmax = dst->xmin + floorf((src->xmax - src->xmin) + 0.5f);
+ dst->xmax = dst->xmin + floorf(BLI_RCT_SIZE_X(src) + 0.5f);
dst->ymin = floorf(src->ymin + 0.5f);
- dst->ymax = dst->ymin + floorf((src->ymax - src->ymin) + 0.5f);
+ dst->ymax = dst->ymin + floorf(BLI_RCT_SIZE_Y(src) + 0.5f);
}
void BLI_rctf_rcti_copy(rctf *dst, const rcti *src)
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
2012-08-21 19:35:06 UTC (rev 50099)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
2012-08-21 20:34:05 UTC (rev 50100)
@@ -819,8 +819,8 @@
y0 = (int)(gps->points->y / 100 * p->ar->winy);
}
else { /* camera view, use subrect */
- x0 = (int)((gps->points->x / 100) *
(p->subrect->xmax - p->subrect->xmin)) + p->subrect->xmin;
- y0 = (int)((gps->points->y / 100) *
(p->subrect->ymax - p->subrect->ymin)) + p->subrect->ymin;
+ x0 = (int)((gps->points->x / 100) *
BLI_RCT_SIZE_X(p->subrect)) + p->subrect->xmin;
+ y0 = (int)((gps->points->y / 100) *
BLI_RCT_SIZE_Y(p->subrect)) + p->subrect->ymin;
}
}
@@ -866,10 +866,10 @@
y1 = (int)(pt2->y / 100 * p->ar->winy);
}
else { /* camera view, use subrect */
- x0 = (int)((pt1->x / 100) *
(p->subrect->xmax - p->subrect->xmin)) + p->subrect->xmin;
- y0 = (int)((pt1->y / 100) *
(p->subrect->ymax - p->subrect->ymin)) + p->subrect->ymin;
- x1 = (int)((pt2->x / 100) *
(p->subrect->xmax - p->subrect->xmin)) + p->subrect->xmin;
- y1 = (int)((pt2->y / 100) *
(p->subrect->ymax - p->subrect->ymin)) + p->subrect->ymin;
+ x0 = (int)((pt1->x / 100) *
BLI_RCT_SIZE_X(p->subrect)) + p->subrect->xmin;
+ y0 = (int)((pt1->y / 100) *
BLI_RCT_SIZE_Y(p->subrect)) + p->subrect->ymin;
+ x1 = (int)((pt2->x / 100) *
BLI_RCT_SIZE_X(p->subrect)) + p->subrect->xmin;
+ y1 = (int)((pt2->y / 100) *
BLI_RCT_SIZE_Y(p->subrect)) + p->subrect->ymin;
}
}
Modified: trunk/blender/source/blender/editors/interface/interface_draw.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_draw.c
2012-08-21 19:35:06 UTC (rev 50099)
+++ trunk/blender/source/blender/editors/interface/interface_draw.c
2012-08-21 20:34:05 UTC (rev 50100)
@@ -1733,8 +1733,8 @@
glEnable(GL_BLEND);
- if (radius > (rct->ymax - rct->ymin - 10.0f) / 2.0f)
- rad = (rct->ymax - rct->ymin - 10.0f) / 2.0f;
+ if (radius > (BLI_RCT_SIZE_Y(rct) - 10.0f) / 2.0f)
+ rad = (BLI_RCT_SIZE_Y(rct) - 10.0f) / 2.0f;
else
rad = radius;
Modified: trunk/blender/source/blender/editors/interface/view2d.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d.c 2012-08-21
19:35:06 UTC (rev 50099)
+++ trunk/blender/source/blender/editors/interface/view2d.c 2012-08-21
20:34:05 UTC (rev 50100)
@@ -1458,7 +1458,7 @@
if (scroll & V2D_SCROLL_HORIZONTAL) {
/* scroller 'button' extents */
totsize = BLI_RCT_SIZE_X(&v2d->tot);
- scrollsize = (float)(hor.xmax - hor.xmin);
+ scrollsize = (float)BLI_RCT_SIZE_X(&hor);
if (totsize == 0.0f) totsize = 1.0f; /* avoid divide by zero */
fac1 = (v2d->cur.xmin - v2d->tot.xmin) / totsize;
@@ -1498,8 +1498,8 @@
/* vertical scrollers */
if (scroll & V2D_SCROLL_VERTICAL) {
/* scroller 'button' extents */
- totsize = BLI_RCT_SIZE_Y(&v2d->tot);
- scrollsize = (float)(vert.ymax - vert.ymin);
+ totsize = BLI_RCT_SIZE_Y(&v2d->tot);
+ scrollsize = (float)BLI_RCT_SIZE_Y(&vert);
if (totsize == 0.0f) totsize = 1.0f; /* avoid divide by zero */
fac1 = (v2d->cur.ymin - v2d->tot.ymin) / totsize;
@@ -1545,7 +1545,9 @@
scrollers->yclamp = yclamp;
scrollers->yunits = yunits;
- scrollers->grid = UI_view2d_grid_calc(CTX_data_scene(C), v2d,
xunits, xclamp, yunits, yclamp, (hor.xmax - hor.xmin), (vert.ymax - vert.ymin));
+ scrollers->grid = UI_view2d_grid_calc(CTX_data_scene(C), v2d,
+ xunits, xclamp, yunits,
yclamp,
+ BLI_RCT_SIZE_X(&hor),
BLI_RCT_SIZE_Y(&vert));
}
/* return scrollers */
@@ -1629,7 +1631,7 @@
*/
if ((v2d->keepzoom & V2D_LOCKZOOM_X) == 0 &&
(v2d->scroll & V2D_SCROLL_SCALE_HORIZONTAL) &&
- (slider.xmax - slider.xmin >
V2D_SCROLLER_HANDLE_SIZE))
+ (BLI_RCT_SIZE_X(&slider) >
V2D_SCROLLER_HANDLE_SIZE))
{
state |= UI_SCROLL_ARROWS;
}
@@ -1650,10 +1652,10 @@
* - dfac is gap between scale markings
*/
fac = (grid->startx - v2d->cur.xmin) /
BLI_RCT_SIZE_X(&v2d->cur);
- fac = (float)hor.xmin + fac * (hor.xmax - hor.xmin);
+ fac = (float)hor.xmin + fac * BLI_RCT_SIZE_X(&hor);
dfac = grid->dx / BLI_RCT_SIZE_X(&v2d->cur);
- dfac = dfac * (hor.xmax - hor.xmin);
+ dfac = dfac * BLI_RCT_SIZE_X(&hor);
/* set starting value, and text color */
UI_ThemeColor(TH_TEXT);
@@ -1740,7 +1742,7 @@
*/
if ((v2d->keepzoom & V2D_LOCKZOOM_Y) == 0 &&
(v2d->scroll & V2D_SCROLL_SCALE_VERTICAL) &&
- (slider.ymax - slider.ymin >
V2D_SCROLLER_HANDLE_SIZE))
+ (BLI_RCT_SIZE_Y(&slider) >
V2D_SCROLLER_HANDLE_SIZE))
{
state |= UI_SCROLL_ARROWS;
}
@@ -1764,10 +1766,10 @@
* NOTE: it's assumed that that scrollbar is
there if this is involved!
*/
fac = (grid->starty - v2d->cur.ymin) /
BLI_RCT_SIZE_Y(&v2d->cur);
- fac = vert.ymin + fac * (vert.ymax - vert.ymin);
+ fac = vert.ymin + fac * BLI_RCT_SIZE_Y(&vert);
dfac = grid->dy / BLI_RCT_SIZE_Y(&v2d->cur);
- dfac = dfac * (vert.ymax - vert.ymin);
+ dfac = dfac * BLI_RCT_SIZE_Y(&vert);
/* set starting value, and text color */
UI_ThemeColor(TH_TEXT);
@@ -2140,7 +2142,7 @@
const char *str = (const char *)(v2s + 1);
int xofs = 0, yofs;
- yofs = ceil(0.5f * (v2s->rect.ymax - v2s->rect.ymin -
default_height));
+ yofs = ceil(0.5f * (BLI_RCT_SIZE_Y(&v2s->rect) -
default_height));
if (yofs < 1) yofs = 1;
if (col_pack_prev != v2s->col.pack) {
Modified: trunk/blender/source/blender/editors/interface/view2d_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d_ops.c 2012-08-21
19:35:06 UTC (rev 50099)
+++ trunk/blender/source/blender/editors/interface/view2d_ops.c 2012-08-21
20:34:05 UTC (rev 50100)
@@ -471,7 +471,7 @@
if (RNA_boolean_get(op->ptr, "page")) {
ARegion *ar = CTX_wm_region(C);
- RNA_int_set(op->ptr, "deltay", ar->v2d.mask.ymax -
ar->v2d.mask.ymin);
+ RNA_int_set(op->ptr, "deltay", BLI_RCT_SIZE_Y(&ar->v2d.mask));
}
/* apply movement, then we're done */
@@ -1137,7 +1137,7 @@
/* TODO: is this zoom factor calculation valid? It seems to
produce same results everytime... */
if ((v2d->keepzoom & V2D_LOCKZOOM_X) == 0) {
- size = (cur_new.xmax - cur_new.xmin);
+ size = BLI_RCT_SIZE_X(&cur_new);
zoom = size / BLI_RCT_SIZE_X(&rect);
center = BLI_RCT_CENTER_X(&cur_new);
@@ -1145,7 +1145,7 @@
cur_new.xmax = center + (size * zoom);
}
if ((v2d->keepzoom & V2D_LOCKZOOM_Y) == 0) {
- size = (cur_new.ymax - cur_new.ymin);
+ size = BLI_RCT_SIZE_Y(&cur_new);
zoom = size / BLI_RCT_SIZE_Y(&rect);
center = BLI_RCT_CENTER_Y(&cur_new);
@@ -1197,10 +1197,10 @@
*/
static float smooth_view_rect_to_fac(const rctf *rect_a, const rctf *rect_b)
{
- float size_a[2] = {rect_a->xmax - rect_a->xmin,
- rect_a->ymax - rect_a->ymin};
- float size_b[2] = {rect_b->xmax - rect_b->xmin,
- rect_b->ymax - rect_b->ymin};
+ float size_a[2] = {BLI_RCT_SIZE_X(rect_a),
+ BLI_RCT_SIZE_Y(rect_a)};
+ float size_b[2] = {BLI_RCT_SIZE_X(rect_b),
+ BLI_RCT_SIZE_Y(rect_b)};
float cent_a[2] = {BLI_RCT_CENTER_X(rect_a),
BLI_RCT_CENTER_Y(rect_a)};
float cent_b[2] = {BLI_RCT_CENTER_X(rect_b),
@@ -1477,7 +1477,7 @@
if (in_scroller == 'h') {
/* horizontal scroller - calculate adjustment factor first */
- mask_size = (float)(v2d->hor.xmax - v2d->hor.xmin);
+ mask_size = (float)BLI_RCT_SIZE_X(&v2d->hor);
vsm->fac = BLI_RCT_SIZE_X(&v2d->tot) / mask_size;
/* get 'zone' (i.e. which part of scroller is activated) */
@@ -1493,7 +1493,7 @@
}
else {
/* vertical scroller - calculate adjustment factor first */
- mask_size = (float)(v2d->vert.ymax - v2d->vert.ymin);
+ mask_size = (float)BLI_RCT_SIZE_Y(&v2d->vert);
vsm->fac = BLI_RCT_SIZE_Y(&v2d->tot) / mask_size;
/* get 'zone' (i.e. which part of scroller is activated) */
Modified: trunk/blender/source/blender/editors/screen/area.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
