Commit d81fee76235a1f13123818815ecebcb27764595d
2022-03-19T10:27:31
SDL_Rect: Added floating point versions of all the rectangle APIs. Fixes #5110.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145
diff --git a/include/SDL_rect.h b/include/SDL_rect.h
index 6616ba6..5ff50f9 100644
--- a/include/SDL_rect.h
+++ b/include/SDL_rect.h
@@ -54,8 +54,13 @@ typedef struct SDL_Point
/**
* The structure that defines a point (floating point)
*
- * \sa SDL_EnclosePoints
- * \sa SDL_PointInRect
+ * \sa SDL_FRectEmpty
+ * \sa SDL_FRectEquals
+ * \sa SDL_HasIntersectionF
+ * \sa SDL_IntersectFRect
+ * \sa SDL_UnionFRect
+ * \sa SDL_EncloseFPoints
+ * \sa SDL_PointInFRect
*/
typedef struct SDL_FPoint
{
@@ -213,6 +218,119 @@ extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRectAndLine(const SDL_Rect *
int *Y1, int *X2,
int *Y2);
+
+/* SDL_FRect versions... */
+
+/**
+ * Returns true if point resides inside a rectangle.
+ */
+SDL_FORCE_INLINE SDL_bool SDL_PointInFRect(const SDL_FPoint *p, const SDL_FRect *r)
+{
+ return ( (p->x >= r->x) && (p->x < (r->x + r->w)) &&
+ (p->y >= r->y) && (p->y < (r->y + r->h)) ) ? SDL_TRUE : SDL_FALSE;
+}
+
+/**
+ * Returns true if the rectangle has no area.
+ */
+SDL_FORCE_INLINE SDL_bool SDL_FRectEmpty(const SDL_FRect *r)
+{
+ return ((!r) || (r->w <= 0.0f) || (r->h <= 0.0f)) ? SDL_TRUE : SDL_FALSE;
+}
+
+/**
+ * Returns true if the two rectangles are equal.
+ */
+SDL_FORCE_INLINE SDL_bool SDL_FRectEquals(const SDL_FRect *a, const SDL_FRect *b)
+{
+ return (a && b && (a->x == b->x) && (a->y == b->y) &&
+ (a->w == b->w) && (a->h == b->h)) ? SDL_TRUE : SDL_FALSE;
+}
+
+/**
+ * Determine whether two rectangles intersect with float precision.
+ *
+ * If either pointer is NULL the function will return SDL_FALSE.
+ *
+ * \param A an SDL_FRect structure representing the first rectangle
+ * \param B an SDL_FRect structure representing the second rectangle
+ * \returns SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
+ *
+ * \sa SDL_IntersectRect
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasIntersectionF(const SDL_FRect * A,
+ const SDL_FRect * B);
+
+/**
+ * Calculate the intersection of two rectangles with float precision.
+ *
+ * If `result` is NULL then this function will return SDL_FALSE.
+ *
+ * \param A an SDL_FRect structure representing the first rectangle
+ * \param B an SDL_FRect structure representing the second rectangle
+ * \param result an SDL_FRect structure filled in with the intersection of
+ * rectangles `A` and `B`
+ * \returns SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
+ *
+ * \sa SDL_HasIntersectionF
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_IntersectFRect(const SDL_FRect * A,
+ const SDL_FRect * B,
+ SDL_FRect * result);
+
+/**
+ * Calculate the union of two rectangles with float precision.
+ *
+ * \param A an SDL_FRect structure representing the first rectangle
+ * \param B an SDL_FRect structure representing the second rectangle
+ * \param result an SDL_FRect structure filled in with the union of rectangles
+ * `A` and `B`
+ */
+extern DECLSPEC void SDLCALL SDL_UnionFRect(const SDL_FRect * A,
+ const SDL_FRect * B,
+ SDL_FRect * result);
+
+/**
+ * Calculate a minimal rectangle enclosing a set of points with float precision.
+ *
+ * If `clip` is not NULL then only points inside of the clipping rectangle are
+ * considered.
+ *
+ * \param points an array of SDL_FPoint structures representing points to be
+ * enclosed
+ * \param count the number of structures in the `points` array
+ * \param clip an SDL_FRect used for clipping or NULL to enclose all points
+ * \param result an SDL_FRect structure filled in with the minimal enclosing
+ * rectangle
+ * \returns SDL_TRUE if any points were enclosed or SDL_FALSE if all the
+ * points were outside of the clipping rectangle.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_EncloseFPoints(const SDL_FPoint * points,
+ int count,
+ const SDL_FRect * clip,
+ SDL_FRect * result);
+
+/**
+ * Calculate the intersection of a rectangle and line segment with float precision.
+ *
+ * This function is used to clip a line segment to a rectangle. A line segment
+ * contained entirely within the rectangle or that does not intersect will
+ * remain unchanged. A line segment that crosses the rectangle at either or
+ * both ends will be clipped to the boundary of the rectangle and the new
+ * coordinates saved in `X1`, `Y1`, `X2`, and/or `Y2` as necessary.
+ *
+ * \param rect an SDL_FRect structure representing the rectangle to intersect
+ * \param X1 a pointer to the starting X-coordinate of the line
+ * \param Y1 a pointer to the starting Y-coordinate of the line
+ * \param X2 a pointer to the ending X-coordinate of the line
+ * \param Y2 a pointer to the ending Y-coordinate of the line
+ * \returns SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_IntersectFRectAndLine(const SDL_FRect *
+ rect, float *X1,
+ float *Y1, float *X2,
+ float *Y2);
+
/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}
diff --git a/src/dynapi/SDL_dynapi_overrides.h b/src/dynapi/SDL_dynapi_overrides.h
index 6e652e4..299dde3 100644
--- a/src/dynapi/SDL_dynapi_overrides.h
+++ b/src/dynapi/SDL_dynapi_overrides.h
@@ -859,3 +859,8 @@
#define SDL_GetTouchName SDL_GetTouchName_REAL
#define SDL_ClearComposition SDL_ClearComposition_REAL
#define SDL_IsTextInputShown SDL_IsTextInputShown_REAL
+#define SDL_HasIntersectionF SDL_HasIntersectionF_REAL
+#define SDL_IntersectFRect SDL_IntersectFRect_REAL
+#define SDL_UnionFRect SDL_UnionFRect_REAL
+#define SDL_EncloseFPoints SDL_EncloseFPoints_REAL
+#define SDL_IntersectFRectAndLine SDL_IntersectFRectAndLine_REAL
diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h
index 6323185..2c0d5b0 100644
--- a/src/dynapi/SDL_dynapi_procs.h
+++ b/src/dynapi/SDL_dynapi_procs.h
@@ -930,3 +930,8 @@ SDL_DYNAPI_PROC(int,SDL_AndroidSendMessage,(Uint32 a, int b),(a,b),return)
SDL_DYNAPI_PROC(const char*,SDL_GetTouchName,(int a),(a),return)
SDL_DYNAPI_PROC(void,SDL_ClearComposition,(void),(),)
SDL_DYNAPI_PROC(SDL_bool,SDL_IsTextInputShown,(void),(),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_HasIntersectionF,(const SDL_FRect *a, const SDL_FRect *b),(a,b),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_IntersectFRect,(const SDL_FRect *a, const SDL_FRect *b, SDL_FRect *c),(a,b,c),return)
+SDL_DYNAPI_PROC(void,SDL_UnionFRect,(const SDL_FRect *a, const SDL_FRect *b, SDL_FRect *c),(a,b,c),)
+SDL_DYNAPI_PROC(SDL_bool,SDL_EncloseFPoints,(const SDL_FPoint *a, int b, const SDL_FRect *c, SDL_FRect *d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_IntersectFRectAndLine,(const SDL_FRect *a, float *b, float *c, float *d, float *e),(a,b,c,d,e),return)
diff --git a/src/render/SDL_render.c b/src/render/SDL_render.c
index 09e216d..af38a8a 100644
--- a/src/render/SDL_render.c
+++ b/src/render/SDL_render.c
@@ -3382,60 +3382,6 @@ SDL_RenderFillRectsF(SDL_Renderer * renderer,
return retval < 0 ? retval : FlushRenderCommandsIfNotBatching(renderer);
}
-/* !!! FIXME: move this to a public API if we want to do float versions of all of these later */
-SDL_FORCE_INLINE SDL_bool SDL_FRectEmpty(const SDL_FRect *r)
-{
- return ((!r) || (r->w <= 0.0f) || (r->h <= 0.0f)) ? SDL_TRUE : SDL_FALSE;
-}
-
-/* !!! FIXME: move this to a public API if we want to do float versions of all of these later */
-static SDL_bool
-SDL_HasIntersectionF(const SDL_FRect * A, const SDL_FRect * B)
-{
- float Amin, Amax, Bmin, Bmax;
-
- if (!A) {
- SDL_InvalidParamError("A");
- return SDL_FALSE;
- }
-
- if (!B) {
- SDL_InvalidParamError("B");
- return SDL_FALSE;
- }
-
- /* Special cases for empty rects */
- if (SDL_FRectEmpty(A) || SDL_FRectEmpty(B)) {
- return SDL_FALSE;
- }
-
- /* Horizontal intersection */
- Amin = A->x;
- Amax = Amin + A->w;
- Bmin = B->x;
- Bmax = Bmin + B->w;
- if (Bmin > Amin)
- Amin = Bmin;
- if (Bmax < Amax)
- Amax = Bmax;
- if (Amax <= Amin)
- return SDL_FALSE;
-
- /* Vertical intersection */
- Amin = A->y;
- Amax = Amin + A->h;
- Bmin = B->y;
- Bmax = Bmin + B->h;
- if (Bmin > Amin)
- Amin = Bmin;
- if (Bmax < Amax)
- Amax = Bmax;
- if (Amax <= Amin)
- return SDL_FALSE;
-
- return SDL_TRUE;
-}
-
int
SDL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * srcrect, const SDL_Rect * dstrect)
diff --git a/src/video/SDL_rect.c b/src/video/SDL_rect.c
index 29e1af8..dfa9390 100644
--- a/src/video/SDL_rect.c
+++ b/src/video/SDL_rect.c
@@ -23,420 +23,8 @@
#include "SDL_rect.h"
#include "SDL_rect_c.h"
-SDL_bool
-SDL_HasIntersection(const SDL_Rect * A, const SDL_Rect * B)
-{
- int Amin, Amax, Bmin, Bmax;
-
- if (!A) {
- SDL_InvalidParamError("A");
- return SDL_FALSE;
- } else if (!B) {
- SDL_InvalidParamError("B");
- return SDL_FALSE;
- } else if (SDL_RectEmpty(A) || SDL_RectEmpty(B)) {
- return SDL_FALSE; /* Special cases for empty rects */
- }
-
- /* Horizontal intersection */
- Amin = A->x;
- Amax = Amin + A->w;
- Bmin = B->x;
- Bmax = Bmin + B->w;
- if (Bmin > Amin) {
- Amin = Bmin;
- }
- if (Bmax < Amax) {
- Amax = Bmax;
- }
- if (Amax <= Amin) {
- return SDL_FALSE;
- }
- /* Vertical intersection */
- Amin = A->y;
- Amax = Amin + A->h;
- Bmin = B->y;
- Bmax = Bmin + B->h;
- if (Bmin > Amin) {
- Amin = Bmin;
- }
- if (Bmax < Amax) {
- Amax = Bmax;
- }
- if (Amax <= Amin) {
- return SDL_FALSE;
- }
- return SDL_TRUE;
-}
-
-SDL_bool
-SDL_IntersectRect(const SDL_Rect * A, const SDL_Rect * B, SDL_Rect * result)
-{
- int Amin, Amax, Bmin, Bmax;
-
- if (!A) {
- SDL_InvalidParamError("A");
- return SDL_FALSE;
- } else if (!B) {
- SDL_InvalidParamError("B");
- return SDL_FALSE;
- } else if (!result) {
- SDL_InvalidParamError("result");
- return SDL_FALSE;
- } else if (SDL_RectEmpty(A) || SDL_RectEmpty(B)) { /* Special cases for empty rects */
- result->w = 0;
- result->h = 0;
- return SDL_FALSE;
- }
-
- /* Horizontal intersection */
- Amin = A->x;
- Amax = Amin + A->w;
- Bmin = B->x;
- Bmax = Bmin + B->w;
- if (Bmin > Amin) {
- Amin = Bmin;
- }
- result->x = Amin;
- if (Bmax < Amax) {
- Amax = Bmax;
- }
- result->w = Amax - Amin;
-
- /* Vertical intersection */
- Amin = A->y;
- Amax = Amin + A->h;
- Bmin = B->y;
- Bmax = Bmin + B->h;
- if (Bmin > Amin) {
- Amin = Bmin;
- }
- result->y = Amin;
- if (Bmax < Amax) {
- Amax = Bmax;
- }
- result->h = Amax - Amin;
-
- return !SDL_RectEmpty(result);
-}
-
-void
-SDL_UnionRect(const SDL_Rect * A, const SDL_Rect * B, SDL_Rect * result)
-{
- int Amin, Amax, Bmin, Bmax;
-
- if (!A) {
- SDL_InvalidParamError("A");
- return;
- } else if (!B) {
- SDL_InvalidParamError("B");
- return;
- } else if (!result) {
- SDL_InvalidParamError("result");
- return;
- } else if (SDL_RectEmpty(A)) { /* Special cases for empty Rects */
- if (SDL_RectEmpty(B)) { /* A and B empty */
- SDL_zerop(result);
- } else { /* A empty, B not empty */
- *result = *B;
- }
- return;
- } else if (SDL_RectEmpty(B)) { /* A not empty, B empty */
- *result = *A;
- return;
- }
-
- /* Horizontal union */
- Amin = A->x;
- Amax = Amin + A->w;
- Bmin = B->x;
- Bmax = Bmin + B->w;
- if (Bmin < Amin) {
- Amin = Bmin;
- }
- result->x = Amin;
- if (Bmax > Amax) {
- Amax = Bmax;
- }
- result->w = Amax - Amin;
-
- /* Vertical union */
- Amin = A->y;
- Amax = Amin + A->h;
- Bmin = B->y;
- Bmax = Bmin + B->h;
- if (Bmin < Amin) {
- Amin = Bmin;
- }
- result->y = Amin;
- if (Bmax > Amax) {
- Amax = Bmax;
- }
- result->h = Amax - Amin;
-}
-
-SDL_bool
-SDL_EnclosePoints(const SDL_Point * points, int count, const SDL_Rect * clip,
- SDL_Rect * result)
-{
- int minx = 0;
- int miny = 0;
- int maxx = 0;
- int maxy = 0;
- int x, y, i;
-
- if (!points) {
- SDL_InvalidParamError("points");
- return SDL_FALSE;
- } else if (count < 1) {
- SDL_InvalidParamError("count");
- return SDL_FALSE;
- }
-
- if (clip) {
- SDL_bool added = SDL_FALSE;
- const int clip_minx = clip->x;
- const int clip_miny = clip->y;
- const int clip_maxx = clip->x+clip->w-1;
- const int clip_maxy = clip->y+clip->h-1;
-
- /* Special case for empty rectangle */
- if (SDL_RectEmpty(clip)) {
- return SDL_FALSE;
- }
-
- for (i = 0; i < count; ++i) {
- x = points[i].x;
- y = points[i].y;
-
- if (x < clip_minx || x > clip_maxx ||
- y < clip_miny || y > clip_maxy) {
- continue;
- }
- if (!added) {
- /* Special case: if no result was requested, we are done */
- if (result == NULL) {
- return SDL_TRUE;
- }
-
- /* First point added */
- minx = maxx = x;
- miny = maxy = y;
- added = SDL_TRUE;
- continue;
- }
- if (x < minx) {
- minx = x;
- } else if (x > maxx) {
- maxx = x;
- }
- if (y < miny) {
- miny = y;
- } else if (y > maxy) {
- maxy = y;
- }
- }
- if (!added) {
- return SDL_FALSE;
- }
- } else {
- /* Special case: if no result was requested, we are done */
- if (result == NULL) {
- return SDL_TRUE;
- }
-
- /* No clipping, always add the first point */
- minx = maxx = points[0].x;
- miny = maxy = points[0].y;
-
- for (i = 1; i < count; ++i) {
- x = points[i].x;
- y = points[i].y;
-
- if (x < minx) {
- minx = x;
- } else if (x > maxx) {
- maxx = x;
- }
- if (y < miny) {
- miny = y;
- } else if (y > maxy) {
- maxy = y;
- }
- }
- }
-
- if (result) {
- result->x = minx;
- result->y = miny;
- result->w = (maxx-minx)+1;
- result->h = (maxy-miny)+1;
- }
- return SDL_TRUE;
-}
-
-/* Use the Cohen-Sutherland algorithm for line clipping */
-#define CODE_BOTTOM 1
-#define CODE_TOP 2
-#define CODE_LEFT 4
-#define CODE_RIGHT 8
-
-static int
-ComputeOutCode(const SDL_Rect * rect, int x, int y)
-{
- int code = 0;
- if (y < rect->y) {
- code |= CODE_TOP;
- } else if (y >= rect->y + rect->h) {
- code |= CODE_BOTTOM;
- }
- if (x < rect->x) {
- code |= CODE_LEFT;
- } else if (x >= rect->x + rect->w) {
- code |= CODE_RIGHT;
- }
- return code;
-}
-
-SDL_bool
-SDL_IntersectRectAndLine(const SDL_Rect * rect, int *X1, int *Y1, int *X2,
- int *Y2)
-{
- int x = 0;
- int y = 0;
- int x1, y1;
- int x2, y2;
- int rectx1;
- int recty1;
- int rectx2;
- int recty2;
- int outcode1, outcode2;
-
- if (!rect) {
- SDL_InvalidParamError("rect");
- return SDL_FALSE;
- } else if (!X1) {
- SDL_InvalidParamError("X1");
- return SDL_FALSE;
- } else if (!Y1) {
- SDL_InvalidParamError("Y1");
- return SDL_FALSE;
- } else if (!X2) {
- SDL_InvalidParamError("X2");
- return SDL_FALSE;
- } else if (!Y2) {
- SDL_InvalidParamError("Y2");
- return SDL_FALSE;
- } else if (SDL_RectEmpty(rect)) {
- return SDL_FALSE; /* Special case for empty rect */
- }
-
- x1 = *X1;
- y1 = *Y1;
- x2 = *X2;
- y2 = *Y2;
- rectx1 = rect->x;
- recty1 = rect->y;
- rectx2 = rect->x + rect->w - 1;
- recty2 = rect->y + rect->h - 1;
-
- /* Check to see if entire line is inside rect */
- if (x1 >= rectx1 && x1 <= rectx2 && x2 >= rectx1 && x2 <= rectx2 &&
- y1 >= recty1 && y1 <= recty2 && y2 >= recty1 && y2 <= recty2) {
- return SDL_TRUE;
- }
-
- /* Check to see if entire line is to one side of rect */
- if ((x1 < rectx1 && x2 < rectx1) || (x1 > rectx2 && x2 > rectx2) ||
- (y1 < recty1 && y2 < recty1) || (y1 > recty2 && y2 > recty2)) {
- return SDL_FALSE;
- }
-
- if (y1 == y2) { /* Horizontal line, easy to clip */
- if (x1 < rectx1) {
- *X1 = rectx1;
- } else if (x1 > rectx2) {
- *X1 = rectx2;
- }
- if (x2 < rectx1) {
- *X2 = rectx1;
- } else if (x2 > rectx2) {
- *X2 = rectx2;
- }
- return SDL_TRUE;
- }
-
- if (x1 == x2) { /* Vertical line, easy to clip */
- if (y1 < recty1) {
- *Y1 = recty1;
- } else if (y1 > recty2) {
- *Y1 = recty2;
- }
- if (y2 < recty1) {
- *Y2 = recty1;
- } else if (y2 > recty2) {
- *Y2 = recty2;
- }
- return SDL_TRUE;
- }
-
- /* More complicated Cohen-Sutherland algorithm */
- outcode1 = ComputeOutCode(rect, x1, y1);
- outcode2 = ComputeOutCode(rect, x2, y2);
- while (outcode1 || outcode2) {
- if (outcode1 & outcode2) {
- return SDL_FALSE;
- }
-
- if (outcode1) {
- if (outcode1 & CODE_TOP) {
- y = recty1;
- x = x1 + ((x2 - x1) * (y - y1)) / (y2 - y1);
- } else if (outcode1 & CODE_BOTTOM) {
- y = recty2;
- x = x1 + ((x2 - x1) * (y - y1)) / (y2 - y1);
- } else if (outcode1 & CODE_LEFT) {
- x = rectx1;
- y = y1 + ((y2 - y1) * (x - x1)) / (x2 - x1);
- } else if (outcode1 & CODE_RIGHT) {
- x = rectx2;
- y = y1 + ((y2 - y1) * (x - x1)) / (x2 - x1);
- }
- x1 = x;
- y1 = y;
- outcode1 = ComputeOutCode(rect, x, y);
- } else {
- if (outcode2 & CODE_TOP) {
- y = recty1;
- x = x1 + ((x2 - x1) * (y - y1)) / (y2 - y1);
- } else if (outcode2 & CODE_BOTTOM) {
- y = recty2;
- x = x1 + ((x2 - x1) * (y - y1)) / (y2 - y1);
- } else if (outcode2 & CODE_LEFT) {
- /* If this assertion ever fires, here's the static analysis that warned about it:
- http://buildbot.libsdl.org/sdl-static-analysis/sdl-macosx-static-analysis/sdl-macosx-static-analysis-1101/report-b0d01a.html#EndPath */
- SDL_assert(x2 != x1); /* if equal: division by zero. */
- x = rectx1;
- y = y1 + ((y2 - y1) * (x - x1)) / (x2 - x1);
- } else if (outcode2 & CODE_RIGHT) {
- /* If this assertion ever fires, here's the static analysis that warned about it:
- http://buildbot.libsdl.org/sdl-static-analysis/sdl-macosx-static-analysis/sdl-macosx-static-analysis-1101/report-39b114.html#EndPath */
- SDL_assert(x2 != x1); /* if equal: division by zero. */
- x = rectx2;
- y = y1 + ((y2 - y1) * (x - x1)) / (x2 - x1);
- }
- x2 = x;
- y2 = y;
- outcode2 = ComputeOutCode(rect, x, y);
- }
- }
- *X1 = x1;
- *Y1 = y1;
- *X2 = x2;
- *Y2 = y2;
- return SDL_TRUE;
-}
-
+/* There's no float version of this at the moment, because it's not a public API
+ and internally we only need the int version. */
SDL_bool
SDL_GetSpanEnclosingRect(int width, int height,
int numrects, const SDL_Rect * rects, SDL_Rect *span)
@@ -492,4 +80,36 @@ SDL_GetSpanEnclosingRect(int width, int height,
return SDL_FALSE;
}
+
+/* For use with the Cohen-Sutherland algorithm for line clipping, in SDL_rect_impl.h */
+#define CODE_BOTTOM 1
+#define CODE_TOP 2
+#define CODE_LEFT 4
+#define CODE_RIGHT 8
+
+/* Same code twice, for float and int versions... */
+#define RECTTYPE SDL_Rect
+#define POINTTYPE SDL_Point
+#define SCALARTYPE int
+#define COMPUTEOUTCODE ComputeOutCode
+#define SDL_HASINTERSECTION SDL_HasIntersection
+#define SDL_INTERSECTRECT SDL_IntersectRect
+#define SDL_RECTEMPTY SDL_RectEmpty
+#define SDL_UNIONRECT SDL_UnionRect
+#define SDL_ENCLOSEPOINTS SDL_EnclosePoints
+#define SDL_INTERSECTRECTANDLINE SDL_IntersectRectAndLine
+#include "SDL_rect_impl.h"
+
+#define RECTTYPE SDL_FRect
+#define POINTTYPE SDL_FPoint
+#define SCALARTYPE float
+#define COMPUTEOUTCODE ComputeOutCodeF
+#define SDL_HASINTERSECTION SDL_HasIntersectionF
+#define SDL_INTERSECTRECT SDL_IntersectFRect
+#define SDL_RECTEMPTY SDL_FRectEmpty
+#define SDL_UNIONRECT SDL_UnionFRect
+#define SDL_ENCLOSEPOINTS SDL_EncloseFPoints
+#define SDL_INTERSECTRECTANDLINE SDL_IntersectFRectAndLine
+#include "SDL_rect_impl.h"
+
/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_rect_impl.h b/src/video/SDL_rect_impl.h
new file mode 100644
index 0000000..993bb8e
--- /dev/null
+++ b/src/video/SDL_rect_impl.h
@@ -0,0 +1,444 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* This file is #included twice to support int and float versions with the same code. */
+
+SDL_bool
+SDL_HASINTERSECTION(const RECTTYPE * A, const RECTTYPE * B)
+{
+ SCALARTYPE Amin, Amax, Bmin, Bmax;
+
+ if (!A) {
+ SDL_InvalidParamError("A");
+ return SDL_FALSE;
+ } else if (!B) {
+ SDL_InvalidParamError("B");
+ return SDL_FALSE;
+ } else if (SDL_RECTEMPTY(A) || SDL_RECTEMPTY(B)) {
+ return SDL_FALSE; /* Special cases for empty rects */
+ }
+
+ /* Horizontal intersection */
+ Amin = A->x;
+ Amax = Amin + A->w;
+ Bmin = B->x;
+ Bmax = Bmin + B->w;
+ if (Bmin > Amin) {
+ Amin = Bmin;
+ }
+ if (Bmax < Amax) {
+ Amax = Bmax;
+ }
+ if (Amax <= Amin) {
+ return SDL_FALSE;
+ }
+ /* Vertical intersection */
+ Amin = A->y;
+ Amax = Amin + A->h;
+ Bmin = B->y;
+ Bmax = Bmin + B->h;
+ if (Bmin > Amin) {
+ Amin = Bmin;
+ }
+ if (Bmax < Amax) {
+ Amax = Bmax;
+ }
+ if (Amax <= Amin) {
+ return SDL_FALSE;
+ }
+ return SDL_TRUE;
+}
+
+SDL_bool
+SDL_INTERSECTRECT(const RECTTYPE * A, const RECTTYPE * B, RECTTYPE * result)
+{
+ SCALARTYPE Amin, Amax, Bmin, Bmax;
+
+ if (!A) {
+ SDL_InvalidParamError("A");
+ return SDL_FALSE;
+ } else if (!B) {
+ SDL_InvalidParamError("B");
+ return SDL_FALSE;
+ } else if (!result) {
+ SDL_InvalidParamError("result");
+ return SDL_FALSE;
+ } else if (SDL_RECTEMPTY(A) || SDL_RECTEMPTY(B)) { /* Special cases for empty rects */
+ result->w = 0;
+ result->h = 0;
+ return SDL_FALSE;
+ }
+
+ /* Horizontal intersection */
+ Amin = A->x;
+ Amax = Amin + A->w;
+ Bmin = B->x;
+ Bmax = Bmin + B->w;
+ if (Bmin > Amin) {
+ Amin = Bmin;
+ }
+ result->x = Amin;
+ if (Bmax < Amax) {
+ Amax = Bmax;
+ }
+ result->w = Amax - Amin;
+
+ /* Vertical intersection */
+ Amin = A->y;
+ Amax = Amin + A->h;
+ Bmin = B->y;
+ Bmax = Bmin + B->h;
+ if (Bmin > Amin) {
+ Amin = Bmin;
+ }
+ result->y = Amin;
+ if (Bmax < Amax) {
+ Amax = Bmax;
+ }
+ result->h = Amax - Amin;
+
+ return !SDL_RECTEMPTY(result);
+}
+
+void
+SDL_UNIONRECT(const RECTTYPE * A, const RECTTYPE * B, RECTTYPE * result)
+{
+ SCALARTYPE Amin, Amax, Bmin, Bmax;
+
+ if (!A) {
+ SDL_InvalidParamError("A");
+ return;
+ } else if (!B) {
+ SDL_InvalidParamError("B");
+ return;
+ } else if (!result) {
+ SDL_InvalidParamError("result");
+ return;
+ } else if (SDL_RECTEMPTY(A)) { /* Special cases for empty Rects */
+ if (SDL_RECTEMPTY(B)) { /* A and B empty */
+ SDL_zerop(result);
+ } else { /* A empty, B not empty */
+ *result = *B;
+ }
+ return;
+ } else if (SDL_RECTEMPTY(B)) { /* A not empty, B empty */
+ *result = *A;
+ return;
+ }
+
+ /* Horizontal union */
+ Amin = A->x;
+ Amax = Amin + A->w;
+ Bmin = B->x;
+ Bmax = Bmin + B->w;
+ if (Bmin < Amin) {
+ Amin = Bmin;
+ }
+ result->x = Amin;
+ if (Bmax > Amax) {
+ Amax = Bmax;
+ }
+ result->w = Amax - Amin;
+
+ /* Vertical union */
+ Amin = A->y;
+ Amax = Amin + A->h;
+ Bmin = B->y;
+ Bmax = Bmin + B->h;
+ if (Bmin < Amin) {
+ Amin = Bmin;
+ }
+ result->y = Amin;
+ if (Bmax > Amax) {
+ Amax = Bmax;
+ }
+ result->h = Amax - Amin;
+}
+
+SDL_bool SDL_ENCLOSEPOINTS(const POINTTYPE * points, int count, const RECTTYPE * clip,
+ RECTTYPE * result)
+{
+ SCALARTYPE minx = 0;
+ SCALARTYPE miny = 0;
+ SCALARTYPE maxx = 0;
+ SCALARTYPE maxy = 0;
+ SCALARTYPE x, y;
+ int i;
+
+ if (!points) {
+ SDL_InvalidParamError("points");
+ return SDL_FALSE;
+ } else if (count < 1) {
+ SDL_InvalidParamError("count");
+ return SDL_FALSE;
+ }
+
+ if (clip) {
+ SDL_bool added = SDL_FALSE;
+ const SCALARTYPE clip_minx = clip->x;
+ const SCALARTYPE clip_miny = clip->y;
+ const SCALARTYPE clip_maxx = clip->x+clip->w-1;
+ const SCALARTYPE clip_maxy = clip->y+clip->h-1;
+
+ /* Special case for empty rectangle */
+ if (SDL_RECTEMPTY(clip)) {
+ return SDL_FALSE;
+ }
+
+ for (i = 0; i < count; ++i) {
+ x = points[i].x;
+ y = points[i].y;
+
+ if (x < clip_minx || x > clip_maxx ||
+ y < clip_miny || y > clip_maxy) {
+ continue;
+ }
+ if (!added) {
+ /* Special case: if no result was requested, we are done */
+ if (result == NULL) {
+ return SDL_TRUE;
+ }
+
+ /* First point added */
+ minx = maxx = x;
+ miny = maxy = y;
+ added = SDL_TRUE;
+ continue;
+ }
+ if (x < minx) {
+ minx = x;
+ } else if (x > maxx) {
+ maxx = x;
+ }
+ if (y < miny) {
+ miny = y;
+ } else if (y > maxy) {
+ maxy = y;
+ }
+ }
+ if (!added) {
+ return SDL_FALSE;
+ }
+ } else {
+ /* Special case: if no result was requested, we are done */
+ if (result == NULL) {
+ return SDL_TRUE;
+ }
+
+ /* No clipping, always add the first point */
+ minx = maxx = points[0].x;
+ miny = maxy = points[0].y;
+
+ for (i = 1; i < count; ++i) {
+ x = points[i].x;
+ y = points[i].y;
+
+ if (x < minx) {
+ minx = x;
+ } else if (x > maxx) {
+ maxx = x;
+ }
+ if (y < miny) {
+ miny = y;
+ } else if (y > maxy) {
+ maxy = y;
+ }
+ }
+ }
+
+ if (result) {
+ result->x = minx;
+ result->y = miny;
+ result->w = (maxx-minx)+1;
+ result->h = (maxy-miny)+1;
+ }
+ return SDL_TRUE;
+}
+
+/* Use the Cohen-Sutherland algorithm for line clipping */
+static int
+COMPUTEOUTCODE(const RECTTYPE * rect, SCALARTYPE x, SCALARTYPE y)
+{
+ int code = 0;
+ if (y < rect->y) {
+ code |= CODE_TOP;
+ } else if (y >= rect->y + rect->h) {
+ code |= CODE_BOTTOM;
+ }
+ if (x < rect->x) {
+ code |= CODE_LEFT;
+ } else if (x >= rect->x + rect->w) {
+ code |= CODE_RIGHT;
+ }
+ return code;
+}
+
+SDL_bool
+SDL_INTERSECTRECTANDLINE(const RECTTYPE * rect, SCALARTYPE *X1, SCALARTYPE *Y1, SCALARTYPE *X2,
+ SCALARTYPE *Y2)
+{
+ SCALARTYPE x = 0;
+ SCALARTYPE y = 0;
+ SCALARTYPE x1, y1;
+ SCALARTYPE x2, y2;
+ SCALARTYPE rectx1;
+ SCALARTYPE recty1;
+ SCALARTYPE rectx2;
+ SCALARTYPE recty2;
+ int outcode1, outcode2;
+
+ if (!rect) {
+ SDL_InvalidParamError("rect");
+ return SDL_FALSE;
+ } else if (!X1) {
+ SDL_InvalidParamError("X1");
+ return SDL_FALSE;
+ } else if (!Y1) {
+ SDL_InvalidParamError("Y1");
+ return SDL_FALSE;
+ } else if (!X2) {
+ SDL_InvalidParamError("X2");
+ return SDL_FALSE;
+ } else if (!Y2) {
+ SDL_InvalidParamError("Y2");
+ return SDL_FALSE;
+ } else if (SDL_RECTEMPTY(rect)) {
+ return SDL_FALSE; /* Special case for empty rect */
+ }
+
+ x1 = *X1;
+ y1 = *Y1;
+ x2 = *X2;
+ y2 = *Y2;
+ rectx1 = rect->x;
+ recty1 = rect->y;
+ rectx2 = rect->x + rect->w - 1;
+ recty2 = rect->y + rect->h - 1;
+
+ /* Check to see if entire line is inside rect */
+ if (x1 >= rectx1 && x1 <= rectx2 && x2 >= rectx1 && x2 <= rectx2 &&
+ y1 >= recty1 && y1 <= recty2 && y2 >= recty1 && y2 <= recty2) {
+ return SDL_TRUE;
+ }
+
+ /* Check to see if entire line is to one side of rect */
+ if ((x1 < rectx1 && x2 < rectx1) || (x1 > rectx2 && x2 > rectx2) ||
+ (y1 < recty1 && y2 < recty1) || (y1 > recty2 && y2 > recty2)) {
+ return SDL_FALSE;
+ }
+
+ if (y1 == y2) { /* Horizontal line, easy to clip */
+ if (x1 < rectx1) {
+ *X1 = rectx1;
+ } else if (x1 > rectx2) {
+ *X1 = rectx2;
+ }
+ if (x2 < rectx1) {
+ *X2 = rectx1;
+ } else if (x2 > rectx2) {
+ *X2 = rectx2;
+ }
+ return SDL_TRUE;
+ }
+
+ if (x1 == x2) { /* Vertical line, easy to clip */
+ if (y1 < recty1) {
+ *Y1 = recty1;
+ } else if (y1 > recty2) {
+ *Y1 = recty2;
+ }
+ if (y2 < recty1) {
+ *Y2 = recty1;
+ } else if (y2 > recty2) {
+ *Y2 = recty2;
+ }
+ return SDL_TRUE;
+ }
+
+ /* More complicated Cohen-Sutherland algorithm */
+ outcode1 = COMPUTEOUTCODE(rect, x1, y1);
+ outcode2 = COMPUTEOUTCODE(rect, x2, y2);
+ while (outcode1 || outcode2) {
+ if (outcode1 & outcode2) {
+ return SDL_FALSE;
+ }
+
+ if (outcode1) {
+ if (outcode1 & CODE_TOP) {
+ y = recty1;
+ x = x1 + ((x2 - x1) * (y - y1)) / (y2 - y1);
+ } else if (outcode1 & CODE_BOTTOM) {
+ y = recty2;
+ x = x1 + ((x2 - x1) * (y - y1)) / (y2 - y1);
+ } else if (outcode1 & CODE_LEFT) {
+ x = rectx1;
+ y = y1 + ((y2 - y1) * (x - x1)) / (x2 - x1);
+ } else if (outcode1 & CODE_RIGHT) {
+ x = rectx2;
+ y = y1 + ((y2 - y1) * (x - x1)) / (x2 - x1);
+ }
+ x1 = x;
+ y1 = y;
+ outcode1 = COMPUTEOUTCODE(rect, x, y);
+ } else {
+ if (outcode2 & CODE_TOP) {
+ y = recty1;
+ x = x1 + ((x2 - x1) * (y - y1)) / (y2 - y1);
+ } else if (outcode2 & CODE_BOTTOM) {
+ y = recty2;
+ x = x1 + ((x2 - x1) * (y - y1)) / (y2 - y1);
+ } else if (outcode2 & CODE_LEFT) {
+ /* If this assertion ever fires, here's the static analysis that warned about it:
+ http://buildbot.libsdl.org/sdl-static-analysis/sdl-macosx-static-analysis/sdl-macosx-static-analysis-1101/report-b0d01a.html#EndPath */
+ SDL_assert(x2 != x1); /* if equal: division by zero. */
+ x = rectx1;
+ y = y1 + ((y2 - y1) * (x - x1)) / (x2 - x1);
+ } else if (outcode2 & CODE_RIGHT) {
+ /* If this assertion ever fires, here's the static analysis that warned about it:
+ http://buildbot.libsdl.org/sdl-static-analysis/sdl-macosx-static-analysis/sdl-macosx-static-analysis-1101/report-39b114.html#EndPath */
+ SDL_assert(x2 != x1); /* if equal: division by zero. */
+ x = rectx2;
+ y = y1 + ((y2 - y1) * (x - x1)) / (x2 - x1);
+ }
+ x2 = x;
+ y2 = y;
+ outcode2 = COMPUTEOUTCODE(rect, x, y);
+ }
+ }
+ *X1 = x1;
+ *Y1 = y1;
+ *X2 = x2;
+ *Y2 = y2;
+ return SDL_TRUE;
+}
+
+#undef RECTTYPE
+#undef POINTTYPE
+#undef SCALARTYPE
+#undef COMPUTEOUTCODE
+#undef SDL_HASINTERSECTION
+#undef SDL_INTERSECTRECT
+#undef SDL_RECTEMPTY
+#undef SDL_UNIONRECT
+#undef SDL_ENCLOSEPOINTS
+#undef SDL_INTERSECTRECTANDLINE
+
+/* vi: set ts=4 sw=4 expandtab: */