Revision: 48932
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48932
Author: campbellbarton
Date: 2012-07-15 00:29:56 +0000 (Sun, 15 Jul 2012)
Log Message:
-----------
minor refactor for rect functions. more consistent naming.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
trunk/blender/source/blender/blenlib/BLI_rect.h
trunk/blender/source/blender/blenlib/intern/rct.c
trunk/blender/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
trunk/blender/source/blender/editors/gpencil/drawgpencil.c
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_file/file_ops.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_node/node_select.c
trunk/blender/source/blender/editors/space_node/node_state.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/render/intern/source/shadbuf.c
trunk/blender/source/blender/windowmanager/intern/wm_draw.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
2012-07-15 00:07:41 UTC (rev 48931)
+++ trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
2012-07-15 00:29:56 UTC (rev 48932)
@@ -403,9 +403,9 @@
* as optimal as it
could be, but checking pixels against faces they will never intersect
* with is likely the
greater slowdown here - so check if the cell intersects the face */
if
(layer_bucket_isect_test(layer, face_index,
-
xi, yi,
-
bucket_size_x, bucket_size_y,
-
bucket_max_rad_squared))
+
xi, yi,
+
bucket_size_x, bucket_size_y,
+
bucket_max_rad_squared))
{
BLI_linklist_prepend_arena(&bucketstore[bucket_index], face_index_void, arena);
bucketstore_tot[bucket_index]++;
@@ -805,7 +805,7 @@
{
MaskRasterLayer *layer =
&mr_handle->layers[masklay_index];
- if (BLI_isect_rctf(&default_bounds, &bounds,
&bounds)) {
+ if (BLI_rctf_isect(&default_bounds, &bounds,
&bounds)) {
layer->face_tot = sf_tri_tot +
tot_feather_quads;
layer->face_coords = face_coords;
layer->face_array = face_array;
@@ -813,7 +813,7 @@
layer_bucket_init(layer, pixel_size);
- BLI_union_rctf(&mr_handle->bounds,
&bounds);
+ BLI_rctf_union(&mr_handle->bounds,
&bounds);
}
else {
MEM_freeN(face_coords);
Modified: trunk/blender/source/blender/blenlib/BLI_rect.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_rect.h 2012-07-15 00:07:41 UTC
(rev 48931)
+++ trunk/blender/source/blender/blenlib/BLI_rect.h 2012-07-15 00:29:56 UTC
(rev 48932)
@@ -49,23 +49,23 @@
void BLI_rcti_do_minmax_v(struct rcti *rect, const int xy[2]);
void BLI_rctf_do_minmax_v(struct rctf *rect, const float xy[2]);
-void BLI_translate_rctf(struct rctf *rect, float x, float y);
-void BLI_translate_rcti(struct rcti *rect, int x, int y);
-void BLI_resize_rcti(struct rcti *rect, int x, int y);
-void BLI_resize_rctf(struct rctf *rect, float x, float y);
+void BLI_rctf_translate(struct rctf *rect, float x, float y);
+void BLI_rcti_translate(struct rcti *rect, int x, int y);
+void BLI_rcti_resize(struct rcti *rect, int x, int y);
+void BLI_rctf_resize(struct rctf *rect, float x, float y);
int BLI_in_rcti(const struct rcti *rect, const int x, const int y);
int BLI_in_rcti_v(const struct rcti *rect, const int xy[2]);
int BLI_in_rctf(const struct rctf *rect, const float x, const float y);
int BLI_in_rctf_v(const struct rctf *rect, const float xy[2]);
-int BLI_segment_in_rcti(const struct rcti *rect, const int s1[2], const int
s2[2]);
+int BLI_rcti_isect_segment(const struct rcti *rect, const int s1[2], const
int s2[2]);
#if 0 /* NOT NEEDED YET */
-int BLI_segment_in_rctf(struct rcti *rect, int s1[2], int s2[2]);
+int BLI_rctf_isect_segment(struct rcti *rect, int s1[2], int s2[2]);
#endif
-int BLI_isect_rctf(const struct rctf *src1, const struct rctf *src2, struct
rctf *dest);
-int BLI_isect_rcti(const struct rcti *src1, const struct rcti *src2, struct
rcti *dest);
-void BLI_union_rctf(struct rctf *rctf1, const struct rctf *rctf2);
-void BLI_union_rcti(struct rcti *rcti1, const struct rcti *rcti2);
-void BLI_copy_rcti_rctf(struct rcti *tar, const struct rctf *src);
+int BLI_rctf_isect(const struct rctf *src1, const struct rctf *src2, struct
rctf *dest);
+int BLI_rcti_isect(const struct rcti *src1, const struct rcti *src2, struct
rcti *dest);
+void BLI_rctf_union(struct rctf *rctf1, const struct rctf *rctf2);
+void BLI_rcti_union(struct rcti *rcti1, const struct rcti *rcti2);
+void BLI_rcti_rctf_copy(struct rcti *tar, const struct rctf *src);
void print_rctf(const char *str, const struct rctf *rect);
void print_rcti(const char *str, const struct rcti *rect);
Modified: trunk/blender/source/blender/blenlib/intern/rct.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/rct.c 2012-07-15 00:07:41 UTC
(rev 48931)
+++ trunk/blender/source/blender/blenlib/intern/rct.c 2012-07-15 00:29:56 UTC
(rev 48932)
@@ -115,7 +115,7 @@
}
}
-int BLI_segment_in_rcti(const rcti *rect, const int s1[2], const int s2[2])
+int BLI_rcti_isect_segment(const rcti *rect, const int s1[2], const int s2[2])
{
/* first do outside-bounds check for both points of the segment */
if (s1[0] < rect->xmin && s2[0] < rect->xmin) return 0;
@@ -150,7 +150,7 @@
}
}
-void BLI_union_rctf(rctf *rct1, const rctf *rct2)
+void BLI_rctf_union(rctf *rct1, const rctf *rct2)
{
if (rct1->xmin > rct2->xmin) rct1->xmin = rct2->xmin;
if (rct1->xmax < rct2->xmax) rct1->xmax = rct2->xmax;
@@ -158,7 +158,7 @@
if (rct1->ymax < rct2->ymax) rct1->ymax = rct2->ymax;
}
-void BLI_union_rcti(rcti *rct1, const rcti *rct2)
+void BLI_rcti_union(rcti *rct1, const rcti *rct2)
{
if (rct1->xmin > rct2->xmin) rct1->xmin = rct2->xmin;
if (rct1->xmax < rct2->xmax) rct1->xmax = rct2->xmax;
@@ -234,14 +234,14 @@
if (xy[1] > rect->ymax) rect->ymax = xy[1];
}
-void BLI_translate_rcti(rcti *rect, int x, int y)
+void BLI_rcti_translate(rcti *rect, int x, int y)
{
rect->xmin += x;
rect->ymin += y;
rect->xmax += x;
rect->ymax += y;
}
-void BLI_translate_rctf(rctf *rect, float x, float y)
+void BLI_rctf_translate(rctf *rect, float x, float y)
{
rect->xmin += x;
rect->ymin += y;
@@ -250,7 +250,7 @@
}
/* change width & height around the central location */
-void BLI_resize_rcti(rcti *rect, int x, int y)
+void BLI_rcti_resize(rcti *rect, int x, int y)
{
rect->xmin = rect->xmax = (rect->xmax + rect->xmin) / 2;
rect->ymin = rect->ymax = (rect->ymax + rect->ymin) / 2;
@@ -260,7 +260,7 @@
rect->ymax = rect->ymin + y;
}
-void BLI_resize_rctf(rctf *rect, float x, float y)
+void BLI_rctf_resize(rctf *rect, float x, float y)
{
rect->xmin = rect->xmax = (rect->xmax + rect->xmin) * 0.5f;
rect->ymin = rect->ymax = (rect->ymax + rect->ymin) * 0.5f;
@@ -270,7 +270,7 @@
rect->ymax = rect->ymin + y;
}
-int BLI_isect_rctf(const rctf *src1, const rctf *src2, rctf *dest)
+int BLI_rctf_isect(const rctf *src1, const rctf *src2, rctf *dest)
{
float xmin, xmax;
float ymin, ymax;
@@ -300,7 +300,7 @@
}
}
-int BLI_isect_rcti(const rcti *src1, const rcti *src2, rcti *dest)
+int BLI_rcti_isect(const rcti *src1, const rcti *src2, rcti *dest)
{
int xmin, xmax;
int ymin, ymax;
@@ -330,7 +330,7 @@
}
}
-void BLI_copy_rcti_rctf(rcti *tar, const rctf *src)
+void BLI_rcti_rctf_copy(rcti *tar, const rctf *src)
{
tar->xmin = floorf(src->xmin + 0.5f);
tar->xmax = floorf((src->xmax - src->xmin) + 0.5f);
Modified:
trunk/blender/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
2012-07-15 00:07:41 UTC (rev 48931)
+++
trunk/blender/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
2012-07-15 00:29:56 UTC (rev 48932)
@@ -247,7 +247,7 @@
tile_data = (TileData *) MEM_callocN(sizeof(TileData), "keying screen
tile data");
for (i = 0; i < triangulation->triangles_total; i++) {
- bool ok = BLI_isect_rctf(&rect_float,
&triangulation->triangles_AABB[i], NULL);
+ bool ok = BLI_rctf_isect(&rect_float,
&triangulation->triangles_AABB[i], NULL);
if (ok) {
tile_data->triangles_total++;
Modified: trunk/blender/source/blender/editors/gpencil/drawgpencil.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/drawgpencil.c 2012-07-15
00:07:41 UTC (rev 48931)
+++ trunk/blender/source/blender/editors/gpencil/drawgpencil.c 2012-07-15
00:29:56 UTC (rev 48932)
@@ -769,7 +769,7 @@
if ((rv3d->persp == RV3D_CAMOB) && !(G.f & G_RENDER_OGL)) {
rctf rectf;
ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &rectf,
TRUE); /* no shift */
- BLI_copy_rcti_rctf(&rect, &rectf);
+ BLI_rcti_rctf_copy(&rect, &rectf);
}
else {
rect.xmin = 0;
Modified: trunk/blender/source/blender/editors/interface/interface_draw.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_draw.c
2012-07-15 00:07:41 UTC (rev 48931)
+++ trunk/blender/source/blender/editors/interface/interface_draw.c
2012-07-15 00:29:56 UTC (rev 48932)
@@ -1353,7 +1353,7 @@
scissor_new.ymin = ar->winrct.ymin + rect->ymin;
scissor_new.xmax = ar->winrct.xmin + rect->xmax;
scissor_new.ymax = ar->winrct.ymin + rect->ymax;
- BLI_isect_rcti(&scissor_new, &ar->winrct, &scissor_new);
+ BLI_rcti_isect(&scissor_new, &ar->winrct, &scissor_new);
glScissor(scissor_new.xmin, scissor_new.ymin, scissor_new.xmax -
scissor_new.xmin, scissor_new.ymax - scissor_new.ymin);
/* calculate offset and zoom */
Modified: trunk/blender/source/blender/editors/screen/area.c
===================================================================
--- trunk/blender/source/blender/editors/screen/area.c 2012-07-15 00:07:41 UTC
(rev 48931)
+++ trunk/blender/source/blender/editors/screen/area.c 2012-07-15 00:29:56 UTC
(rev 48932)
@@ -403,7 +403,7 @@
while (ar->prev) {
ar = ar->prev;
- if (BLI_isect_rcti(winrct, &ar->winrct, NULL)) {
+ if (BLI_rcti_isect(winrct, &ar->winrct, NULL)) {
if (ar->flag & RGN_FLAG_HIDDEN) ;
else if (ar->alignment & RGN_SPLIT_PREV) ;
else if (ar->alignment == RGN_OVERLAP_LEFT) {
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2012-07-15
00:07:41 UTC (rev 48931)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2012-07-15
00:29:56 UTC (rev 48932)
@@ -827,7 +827,7 @@
/* adds window to WM */
rect = sa->totrct;
- BLI_translate_rcti(&rect, win->posx, win->posy);
+ BLI_rcti_translate(&rect, win->posx, win->posy);
newwin = WM_window_open(C, &rect);
/* allocs new screen and adds to newly created window, using window
size */
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
