This commit is contained in:
2025-02-15 12:57:41 +03:30
parent b9ce179fa3
commit 7fbb3970e0
3 changed files with 1453 additions and 216 deletions
+35 -9
View File
@@ -7037,7 +7037,8 @@ bool IsInside(
template <typename T, typename F>
bool IsInsideDiff(
T *source,
F *dest //
F *dest,
bool forceSideOut = false //
)
{
//
@@ -7068,7 +7069,8 @@ bool IsInsideDiff(
//
result = IsBoxInside(
sourceBox,
destBox //
destBox,
forceSideOut //
);
//
@@ -7424,12 +7426,14 @@ bool IsBoxAbove(
*
* @param source: XBoxZone instance Reference ...
* @param dest: XBoxZone instance Reference ...
* @param forceSideOut: bool, force check Box has One Side Out ...
*
* @return ( bool )
*/
bool IsBoxInside(
XBoxZone &source,
XBoxZone &dest //
XBoxZone &dest,
bool forceSideOut = false //
)
{
//
@@ -7445,8 +7449,30 @@ bool IsBoxInside(
}
//
result = source.lower >= dest.lower &&
source.upper <= dest.upper;
bool isBullish = IsBullish(dest.dir);
//
if (!forceSideOut)
{
//
result = source.lower >= dest.lower &&
source.upper <= dest.upper;
}
else
{
//
bool hasSideIn =
isBullish
? source.lower >= dest.lower
: source.upper <= dest.upper;
bool hasSideOut =
isBullish
? source.upper >= dest.upper
: source.lower <= dest.lower;
result =
hasSideIn &&
hasSideOut;
}
//
return result;
@@ -7557,8 +7583,8 @@ bool IsBoxUsed(
//
result =
//
box.IsValid()
fromIndex > 0 &&
box.IsValid() &&
fromIndex > 0 &&
fromIndex > toIndex
//
;
@@ -7574,8 +7600,8 @@ bool IsBoxUsed(
}
//
EUM_X_DIRECT forDir = box.dir;
bool isBllish = IsBullish(forDir);
ENUM_X_DIRECTION forDir = box.dir;
bool isBullish = IsBullish(forDir);
//
for (int i = fromIndex; i >= toIndex; i--)