diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-13 05:55:25 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-13 05:55:25 +0400 |
commit | a97825dfd71994dde7748ed38f5ce91e16df06ae (patch) | |
tree | 676ecae351ee5d13b8e6d9edc5a4684cd3a1088a /source/blender/blenlib/intern/rct.c | |
parent | 8646bb446419592f8acc8ed0cdf8337bfc4a07eb (diff) |
stule cleanup for rct.c and fix for error in last commit.
Diffstat (limited to 'source/blender/blenlib/intern/rct.c')
-rw-r--r-- | source/blender/blenlib/intern/rct.c | 140 |
1 files changed, 65 insertions, 75 deletions
diff --git a/source/blender/blenlib/intern/rct.c b/source/blender/blenlib/intern/rct.c index 3b9fd2e07f6..d3bb5a1b17f 100644 --- a/source/blender/blenlib/intern/rct.c +++ b/source/blender/blenlib/intern/rct.c @@ -1,12 +1,4 @@ /* - * - * rct.c - * - * april 95 - * - * - * A minimalist lib for functions doing stuff with rectangle structs. - * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or @@ -36,6 +28,8 @@ /** \file blender/blenlib/intern/rct.c * \ingroup bli + * + * A minimalist lib for functions doing stuff with rectangle structs. */ #include <stdio.h> @@ -46,91 +40,85 @@ int BLI_rcti_is_empty(rcti * rect) { - return ((rect->xmax<=rect->xmin) || - (rect->ymax<=rect->ymin)); + return ((rect->xmax <= rect->xmin) || (rect->ymax <= rect->ymin)); } int BLI_rctf_is_empty(rctf * rect) { - return ((rect->xmax<=rect->xmin) || - (rect->ymax<=rect->ymin)); + return ((rect->xmax <= rect->xmin) || (rect->ymax <= rect->ymin)); } int BLI_in_rcti(rcti * rect, int x, int y) { - - if(x<rect->xmin) return 0; - if(x>rect->xmax) return 0; - if(y<rect->ymin) return 0; - if(y>rect->ymax) return 0; + if (x < rect->xmin) return 0; + if (x > rect->xmax) return 0; + if (y < rect->ymin) return 0; + if (y > rect->ymax) return 0; return 1; } int BLI_in_rctf(rctf *rect, float x, float y) { - - if(x<rect->xmin) return 0; - if(x>rect->xmax) return 0; - if(y<rect->ymin) return 0; - if(y>rect->ymax) return 0; + if (x < rect->xmin) return 0; + if (x > rect->xmax) return 0; + if (y < rect->ymin) return 0; + if (y > rect->ymax) return 0; return 1; } void BLI_union_rctf(rctf *rct1, rctf *rct2) { - - if(rct1->xmin>rct2->xmin) rct1->xmin= rct2->xmin; - if(rct1->xmax<rct2->xmax) rct1->xmax= rct2->xmax; - if(rct1->ymin>rct2->ymin) rct1->ymin= rct2->ymin; - if(rct1->ymax<rct2->ymax) rct1->ymax= rct2->ymax; + if (rct1->xmin > rct2->xmin) rct1->xmin = rct2->xmin; + if (rct1->xmax < rct2->xmax) rct1->xmax = rct2->xmax; + if (rct1->ymin > rct2->ymin) rct1->ymin = rct2->ymin; + if (rct1->ymax < rct2->ymax) rct1->ymax = rct2->ymax; } void BLI_union_rcti(rcti *rct1, rcti *rct2) { - - if(rct1->xmin>rct2->xmin) rct1->xmin= rct2->xmin; - if(rct1->xmax<rct2->xmax) rct1->xmax= rct2->xmax; - if(rct1->ymin>rct2->ymin) rct1->ymin= rct2->ymin; - if(rct1->ymax<rct2->ymax) rct1->ymax= rct2->ymax; + if (rct1->xmin > rct2->xmin) rct1->xmin = rct2->xmin; + if (rct1->xmax < rct2->xmax) rct1->xmax = rct2->xmax; + if (rct1->ymin > rct2->ymin) rct1->ymin = rct2->ymin; + if (rct1->ymax < rct2->ymax) rct1->ymax = rct2->ymax; } void BLI_init_rctf(rctf *rect, float xmin, float xmax, float ymin, float ymax) { - if(xmin <= xmax) { - rect->xmin= xmin; - rect->xmax= xmax; + if (xmin <= xmax) { + rect->xmin = xmin; + rect->xmax = xmax; } else { - rect->xmax= xmin; - rect->xmin= xmax; + rect->xmax = xmin; + rect->xmin = xmax; } - if(ymin <= ymax) { - rect->ymin= ymin; - rect->ymax= ymax; + if (ymin <= ymax) { + rect->ymin = ymin; + rect->ymax = ymax; } else { - rect->ymax= ymin; - rect->ymin= ymax; + rect->ymax = ymin; + rect->ymin = ymax; } } void BLI_init_rcti(rcti *rect, int xmin, int xmax, int ymin, int ymax) { - if(xmin <= xmax) { - rect->xmin= xmin; - rect->xmax= xmax; + if (xmin <= xmax) { + rect->xmin = xmin; + rect->xmax = xmax; } else { - rect->xmax= xmin; - rect->xmin= xmax; + rect->xmax = xmin; + rect->xmin = xmax; } - if(ymin <= ymax) { - rect->ymin= ymin; - rect->ymax= ymax; + if (ymin <= ymax) { + rect->ymin = ymin; + rect->ymax = ymax; } else { - rect->ymax= ymin; - rect->ymin= ymax; + rect->ymax = ymin; + rect->ymin = ymax; } } @@ -152,22 +140,22 @@ void BLI_translate_rctf(rctf *rect, float x, float y) /* change width & height around the central location */ void BLI_resize_rcti(rcti *rect, int x, int y) { - rect->xmin= rect->xmax= (rect->xmax + rect->xmin) / 2; - rect->ymin= rect->ymax= (rect->ymax + rect->ymin) / 2; + rect->xmin = rect->xmax = (rect->xmax + rect->xmin) / 2; + rect->ymin = rect->ymax = (rect->ymax + rect->ymin) / 2; rect->xmin -= x / 2; rect->ymin -= y / 2; - rect->xmax= rect->xmin + x; - rect->ymax= rect->ymin + y; + rect->xmax = rect->xmin + x; + rect->ymax = rect->ymin + y; } void BLI_resize_rctf(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; + rect->xmin = rect->xmax = (rect->xmax + rect->xmin) * 0.5f; + rect->ymin = rect->ymax = (rect->ymax + rect->ymin) * 0.5f; rect->xmin -= x * 0.5f; rect->ymin -= y * 0.5f; - rect->xmax= rect->xmin + x; - rect->ymax= rect->ymin + y; + rect->xmax = rect->xmin + x; + rect->ymax = rect->ymin + y; } int BLI_isect_rctf(rctf *src1, rctf *src2, rctf *dest) @@ -179,9 +167,9 @@ int BLI_isect_rctf(rctf *src1, rctf *src2, rctf *dest) xmax = (src1->xmax) < (src2->xmax) ? (src1->xmax) : (src2->xmax); ymin = (src1->ymin) > (src2->ymin) ? (src1->ymin) : (src2->ymin); ymax = (src1->ymax) < (src2->ymax) ? (src1->ymax) : (src2->ymax); - - if(xmax>=xmin && ymax>=ymin) { - if(dest) { + + if (xmax >= xmin && ymax >= ymin) { + if (dest) { dest->xmin = xmin; dest->xmax = xmax; dest->ymin = ymin; @@ -190,7 +178,7 @@ int BLI_isect_rctf(rctf *src1, rctf *src2, rctf *dest) return 1; } else { - if(dest) { + if (dest) { dest->xmin = 0; dest->xmax = 0; dest->ymin = 0; @@ -204,14 +192,14 @@ int BLI_isect_rcti(rcti *src1, rcti *src2, rcti *dest) { int xmin, xmax; int ymin, ymax; - + xmin = (src1->xmin) > (src2->xmin) ? (src1->xmin) : (src2->xmin); xmax = (src1->xmax) < (src2->xmax) ? (src1->xmax) : (src2->xmax); ymin = (src1->ymin) > (src2->ymin) ? (src1->ymin) : (src2->ymin); ymax = (src1->ymax) < (src2->ymax) ? (src1->ymax) : (src2->ymax); - - if(xmax>=xmin && ymax>=ymin) { - if(dest) { + + if (xmax >= xmin && ymax >= ymin) { + if (dest) { dest->xmin = xmin; dest->xmax = xmax; dest->ymin = ymin; @@ -220,7 +208,7 @@ int BLI_isect_rcti(rcti *src1, rcti *src2, rcti *dest) return 1; } else { - if(dest) { + if (dest) { dest->xmin = 0; dest->xmax = 0; dest->ymin = 0; @@ -232,18 +220,20 @@ int BLI_isect_rcti(rcti *src1, rcti *src2, rcti *dest) void BLI_copy_rcti_rctf(rcti *tar, const rctf *src) { - tar->xmin= floor(src->xmin + 0.5f); - tar->xmax= floor((src->xmax - src->xmin) + 0.5f); - tar->ymin= floor(src->ymin + 0.5f); - tar->ymax= floor((src->ymax - src->ymin) + 0.5f); + tar->xmin = floor(src->xmin + 0.5f); + tar->xmax = floor((src->xmax - src->xmin) + 0.5f); + tar->ymin = floor(src->ymin + 0.5f); + tar->ymax = floor((src->ymax - src->ymin) + 0.5f); } void print_rctf(const char *str, rctf *rect) { - printf("%s: xmin %.3f, xmax %.3f, ymin %.3f, ymax %.3f (%.3fx%.3f)\n", str, rect->xmin, rect->xmax, rect->ymin, rect->ymax, rect->xmax - rect->xmin, rect->ymax - rect->ymin); + printf("%s: xmin %.3f, xmax %.3f, ymin %.3f, ymax %.3f (%.3fx%.3f)\n", str, + rect->xmin, rect->xmax, rect->ymin, rect->ymax, rect->xmax - rect->xmin, rect->ymax - rect->ymin); } void print_rcti(const char *str, rcti *rect) { - printf("%s: xmin %d, xmax %d, ymin %d, ymax %d (%dx%d)\n", str, rect->xmin, rect->xmax, rect->ymin, rect->ymax, rect->xmax - rect->xmin, rect->ymax - rect->ymin); + printf("%s: xmin %d, xmax %d, ymin %d, ymax %d (%dx%d)\n", str, + rect->xmin, rect->xmax, rect->ymin, rect->ymax, rect->xmax - rect->xmin, rect->ymax - rect->ymin); } |