blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

BLI_rect: add BLI_rctf_clamp 

Clamp one rect within another.

This is done inline in the UI code, which gets verbose.
This commit is contained in:
Campbell Barton 2015-10-17 00:03:29 +11:00
parent 99cf636e84
commit e6aa464757
2 changed files with 91 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,6 +66,8 @@ void BLI_rctf_interp(struct rctf *rect, const struct rctf *rect_a, const struct
//void BLI_rcti_interp(struct rctf *rect, struct rctf *rect_a, struct rctf *rect_b, float fac);
bool BLI_rctf_clamp_pt_v(const struct rctf *rect, float xy[2]);
bool BLI_rcti_clamp_pt_v(const struct rcti *rect, int xy[2]);
bool BLI_rctf_clamp(struct rctf *rect, const struct rctf *rect_bounds, float r_xy[2]);
bool BLI_rcti_clamp(struct rcti *rect, const struct rcti *rect_bounds, int r_xy[2]);
bool BLI_rctf_compare(const struct rctf *rect_a, const struct rctf *rect_b, const float limit);
bool BLI_rcti_compare(const struct rcti *rect_a, const struct rcti *rect_b);
bool BLI_rctf_isect(const struct rctf *src1, const struct rctf *src2, struct rctf *dest);

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

@ -494,6 +494,95 @@ bool BLI_rcti_clamp_pt_v(const rcti *rect, int xy[2])
return changed;
}
/**
* Clamp \a rect within \a rect_bounds, setting \a r_xy to the offset.
*
* \return true if a change is made.
*/
bool BLI_rctf_clamp(rctf *rect, const rctf *rect_bounds, float r_xy[2])
{
bool changed = false;
r_xy[0] = 0.0f;
r_xy[1] = 0.0f;
if (rect->xmin < rect_bounds->xmin) {
float ofs = rect_bounds->xmin - rect->xmin;
rect->xmin += r_xy[0];
rect->xmax += r_xy[0];
r_xy[0] += ofs;
changed = true;
}
if (rect->xmax > rect_bounds->xmax) {
float ofs = rect_bounds->xmax - rect->xmax;
rect->xmin += ofs;
rect->xmax += ofs;
r_xy[0] += ofs;
changed = true;
}
if (rect->ymin < rect_bounds->ymin) {
float ofs = rect_bounds->ymin - rect->ymin;
rect->ymin += r_xy[1];
rect->ymax += r_xy[1];
r_xy[1] += ofs;
changed = true;
}
if (rect->ymax > rect_bounds->ymax) {
float ofs = rect_bounds->ymax - rect->ymax;
rect->ymin += ofs;
rect->ymax += ofs;
r_xy[1] += ofs;
changed = true;
}
return changed;
}
bool BLI_rcti_clamp(rcti *rect, const rcti *rect_bounds, int r_xy[2])
{
bool changed = false;
r_xy[0] = 0;
r_xy[1] = 0;
if (rect->xmin < rect_bounds->xmin) {
int ofs = rect_bounds->xmin - rect->xmin;
rect->xmin += r_xy[0];
rect->xmax += r_xy[0];
r_xy[0] += ofs;
changed = true;
}
if (rect->xmax > rect_bounds->xmax) {
int ofs = rect_bounds->xmax - rect->xmax;
rect->xmin += ofs;
rect->xmax += ofs;
r_xy[0] += ofs;
changed = true;
}
if (rect->ymin < rect_bounds->ymin) {
int ofs = rect_bounds->ymin - rect->ymin;
rect->ymin += r_xy[1];
rect->ymax += r_xy[1];
r_xy[1] += ofs;
changed = true;
}
if (rect->ymax > rect_bounds->ymax) {
int ofs = rect_bounds->ymax - rect->ymax;
rect->ymin += ofs;
rect->ymax += ofs;
r_xy[1] += ofs;
changed = true;
}
return changed;
}
bool BLI_rctf_compare(const rctf *rect_a, const rctf *rect_b, const float limit)
{
if (fabsf(rect_a->xmin - rect_b->xmin) < limit)