griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rect/point clamping function: BLI_rct*_clamp_pt_v

Browse Source
This commit is contained in:
Campbell Barton
2012-09-22 12:23:17 +00:00
parent 76850d80b1
commit 3ff23b753e
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenlib/BLI_rect.h
View File

@@ -55,6 +55,8 @@ void BLI_rcti_resize(struct rcti *rect, int x, int y);
void BLI_rctf_resize(struct rctf *rect, float x, float y);
void BLI_rctf_interp(struct rctf *rect, const struct rctf *rect_a, const struct rctf *rect_b, const float fac);
//void BLI_rcti_interp(struct rctf *rect, struct rctf *rect_a, struct rctf *rect_b, float fac);
int BLI_rctf_clamp_pt_v(const struct rctf *rect, float xy[2]);
int BLI_rcti_clamp_pt_v(const struct rcti *rect, int xy[2]);
int BLI_rctf_compare(const struct rctf *rect_a, const struct rctf *rect_b, const float limit);
int BLI_rcti_compare(const struct rcti *rect_a, const struct rcti *rect_b);
int BLI_rctf_isect(const struct rctf *src1, const struct rctf *src2, struct rctf *dest);

21
source/blender/blenlib/intern/rct.c
View File

@@ -281,6 +281,27 @@ void BLI_rctf_interp(rctf *rect, const rctf *rect_a, const rctf *rect_b, const f
/* BLI_rcti_interp() not needed yet */
int BLI_rctf_clamp_pt_v(const struct rctf *rect, float xy[2])
{
int change = 0;
if (xy[0] < rect->xmin) { xy[0] = rect->xmin; change = 1; }
if (xy[0] > rect->xmax) { xy[0] = rect->xmax; change = 1; }
if (xy[1] < rect->ymin) { xy[1] = rect->ymin; change = 1; }
if (xy[1] > rect->ymax) { xy[1] = rect->ymax; change = 1; }
return change;
}
int BLI_rcti_clamp_pt_v(const struct rcti *rect, int xy[2])
{
int change = 0;
if (xy[0] < rect->xmin) { xy[0] = rect->xmin; change = 1; }
if (xy[0] > rect->xmax) { xy[0] = rect->xmax; change = 1; }
if (xy[1] < rect->ymin) { xy[1] = rect->ymin; change = 1; }
if (xy[1] > rect->ymax) { xy[1] = rect->ymax; change = 1; }
return change;
}
int BLI_rctf_compare(const struct rctf *rect_a, const struct rctf *rect_b, const float limit)
{
if (fabsf(rect_a->xmin - rect_b->xmin) < limit)