last works ...
This commit is contained in:
@@ -1074,7 +1074,8 @@ bool IsBoxInside(
|
||||
*/
|
||||
bool IsBoxInsideOr(
|
||||
XBoxZone &source,
|
||||
XBoxZone &dest //
|
||||
XBoxZone &dest,
|
||||
bool forceInside = false //
|
||||
)
|
||||
{
|
||||
//
|
||||
@@ -1090,19 +1091,25 @@ bool IsBoxInsideOr(
|
||||
}
|
||||
|
||||
//
|
||||
bool isLowerInside =
|
||||
source.lower > dest.lower &&
|
||||
source.lower < dest.upper &&
|
||||
(source.upper < dest.upper ||
|
||||
source.upper > dest.upper);
|
||||
bool isInside =
|
||||
source.upper <= dest.upper &&
|
||||
source.upper >= dest.lower &&
|
||||
source.lower >= dest.lower &&
|
||||
source.lower <= dest.upper;
|
||||
bool isUpperInside =
|
||||
source.upper < dest.upper &&
|
||||
source.upper > dest.lower &&
|
||||
(source.lower > dest.lower ||
|
||||
source.lower < dest.lower);
|
||||
source.upper <= dest.upper &&
|
||||
source.upper >= dest.lower;
|
||||
bool isLowerInside =
|
||||
source.lower >= dest.lower &&
|
||||
source.lower <= dest.upper;
|
||||
|
||||
//
|
||||
result =
|
||||
isLowerInside ||
|
||||
isUpperInside;
|
||||
forceInside
|
||||
? isInside
|
||||
: (isInside ||
|
||||
isLowerInside ||
|
||||
isUpperInside);
|
||||
|
||||
//
|
||||
return result;
|
||||
|
||||
Reference in New Issue
Block a user