From a5127dba57490e0c0215e9cabfac1749585c53d1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 11 Jul 2012 18:17:48 +0000 Subject: vector versions of BLI_in_rctf / BLI_in_rcti, (BLI_in_rctf_v, BLI_in_rcti_v) use where possible. --- source/blender/blenlib/BLI_rect.h | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'source/blender/blenlib/BLI_rect.h') diff --git a/source/blender/blenlib/BLI_rect.h b/source/blender/blenlib/BLI_rect.h index 0cf32eeb276..4d0e54e344c 100644 --- a/source/blender/blenlib/BLI_rect.h +++ b/source/blender/blenlib/BLI_rect.h @@ -48,26 +48,30 @@ extern "C" { * * \return True if \a rect is empty. */ -int BLI_rcti_is_empty(struct rcti *rect); -int BLI_rctf_is_empty(struct rctf *rect); +int BLI_rcti_is_empty(const struct rcti *rect); +int BLI_rctf_is_empty(const struct rctf *rect); void BLI_init_rctf(struct rctf *rect, float xmin, float xmax, float ymin, float ymax); void BLI_init_rcti(struct rcti *rect, int xmin, int xmax, int ymin, int ymax); 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); -int BLI_in_rcti(struct rcti *rect, int x, int y); -int BLI_in_rctf(struct rctf *rect, float x, float y); -int BLI_segment_in_rcti(struct rcti *rect, int s1[2], int s2[2]); -// int BLI_segment_in_rctf(struct rcti *rect, int s1[2], int s2[2]); // NOT NEEDED YET -int BLI_isect_rctf(struct rctf *src1, struct rctf *src2, struct rctf *dest); -int BLI_isect_rcti(struct rcti *src1, struct rcti *src2, struct rcti *dest); -void BLI_union_rctf(struct rctf *rcta, struct rctf *rctb); -void BLI_union_rcti(struct rcti *rcti1, struct rcti *rcti2); +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]); +#if 0 /* NOT NEEDED YET */ +int BLI_segment_in_rctf(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); -void print_rctf(const char *str, struct rctf *rect); -void print_rcti(const char *str, struct rcti *rect); +void print_rctf(const char *str, const struct rctf *rect); +void print_rcti(const char *str, const struct rcti *rect); #ifdef __cplusplus } -- cgit v1.2.3