mirror of
https://github.com/RTimothyEdwards/magic.git
synced 2026-09-03 16:29:09 +02:00
More updates. . . Got it to the point were gpio_ovtv2 is LVS
clean, which has never happened before.
This commit is contained in:
@@ -626,7 +626,7 @@ donesides:
|
||||
if (IsSplit(tile))
|
||||
{
|
||||
if (DBSrPaintNMArea((Tile *) NULL, csa->csa_def->cd_planes[i],
|
||||
TiGetTypeExact(tile), &newArea, connectMask,
|
||||
TiGetTypeExact(tile) | dinfo, &newArea, connectMask,
|
||||
dbcFindTileFunc, (ClientData)&tad) != 0)
|
||||
{
|
||||
STACKPUSH(PTR2CD(tad.tad_tile), dbConnectStack);
|
||||
|
||||
@@ -449,148 +449,6 @@ nm_enum:
|
||||
return 1;
|
||||
}
|
||||
|
||||
#if 0
|
||||
rheight = rect->r_ytop - rect->r_ybot;
|
||||
rwidth = rect->r_xtop - rect->r_xbot;
|
||||
rmax = MAX(rheight, rwidth);
|
||||
f1 = (BOTTOM(tp) > MINFINITY + 2) ?
|
||||
((dlong)(rect->r_ytop - BOTTOM(tp)) * rwidth) : DLONG_MAX;
|
||||
f2 = (TOP(tp) < INFINITY - 2) ?
|
||||
((dlong)(TOP(tp) - rect->r_ybot) * rwidth) : DLONG_MAX;
|
||||
|
||||
if (ttype & TT_SIDE)
|
||||
{
|
||||
/* Outside-of-triangle check---ignore sub-integer slivers */
|
||||
if (RIGHT(tp) < INFINITY - 2)
|
||||
{
|
||||
f3 = (dlong)(rect->r_xtop - RIGHT(tp)) * rheight;
|
||||
f3 += rmax;
|
||||
}
|
||||
else
|
||||
f3 = DLONG_MIN;
|
||||
if ((ttype & TT_DIRECTION) ? (f2 < f3) : (f1 < f3))
|
||||
goto enum_next;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Outside-of-triangle check---ignore sub-integer slivers */
|
||||
if (LEFT(tp) > MINFINITY + 2)
|
||||
{
|
||||
f4 = (dlong)(LEFT(tp) - rect->r_xbot) * rheight;
|
||||
f4 += rmax;
|
||||
}
|
||||
else
|
||||
f4 = DLONG_MIN;
|
||||
if ((ttype & TT_DIRECTION) ? (f1 < f4) : (f2 < f4))
|
||||
goto enum_next;
|
||||
}
|
||||
|
||||
/* Secondary checks---if tile is also non-Manhattan, is */
|
||||
/* either side of it outside the area? If so, restrict it. */
|
||||
/* This check is only necessary if the split directions are */
|
||||
/* the same, so we have to see if either of the neighboring */
|
||||
/* points is also inside the search triangle. */
|
||||
|
||||
ignore_sides = 0;
|
||||
|
||||
if (IsSplit(tp))
|
||||
{
|
||||
if (!TTMaskHasType(mask, SplitLeftType(tp)))
|
||||
ignore_sides |= IGNORE_LEFT;
|
||||
if (!TTMaskHasType(mask, SplitRightType(tp)))
|
||||
ignore_sides |= IGNORE_RIGHT;
|
||||
|
||||
tpt = TiGetTypeExact(tp);
|
||||
if ((tpt & TT_DIRECTION) == (ttype & TT_DIRECTION))
|
||||
{
|
||||
f3 = (LEFT(tp) > MINFINITY + 2) ?
|
||||
((dlong)(rect->r_xtop - LEFT(tp)) * rheight) : DLONG_MAX;
|
||||
f4 = (RIGHT(tp) < INFINITY - 2) ?
|
||||
((dlong)(RIGHT(tp) - rect->r_xbot) * rheight) : DLONG_MAX;
|
||||
|
||||
if (ttype & TT_SIDE)
|
||||
{
|
||||
/* Ignore sub-integer slivers */
|
||||
if (f4 != DLONG_MAX) f4 -= rmax;
|
||||
if (f3 != DLONG_MAX) f3 += rmax;
|
||||
|
||||
if (ttype & TT_DIRECTION)
|
||||
{
|
||||
if ((f2 < f3) && (f1 > f4))
|
||||
/* Tile bottom left is outside search area */
|
||||
ignore_sides |= IGNORE_LEFT;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((f1 < f3) && (f2 > f4))
|
||||
/* Tile top left is outside search area */
|
||||
ignore_sides |= IGNORE_LEFT;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Ignore sub-integer slivers */
|
||||
if (f4 != DLONG_MAX) f4 += rmax;
|
||||
if (f3 != DLONG_MAX) f3 -= rmax;
|
||||
|
||||
if (ttype & TT_DIRECTION)
|
||||
{
|
||||
if ((f2 > f3) && (f1 < f4))
|
||||
/* Tile top right is outside search area */
|
||||
ignore_sides |= IGNORE_RIGHT;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((f1 > f3) && (f2 < f4))
|
||||
/* Tile bottom right is outside search area */
|
||||
ignore_sides |= IGNORE_RIGHT;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* If the tile is larger than the search area or overlaps */
|
||||
/* the search area, we need to check if one of the sides */
|
||||
/* of the tile is disjoint from the search area. */
|
||||
|
||||
rheight = TOP(tp) - BOTTOM(tp);
|
||||
rwidth = RIGHT(tp) - LEFT(tp);
|
||||
rmax = MAX(rheight, rwidth);
|
||||
f1 = (TOP(tp) < INFINITY - 2) ?
|
||||
((dlong)(TOP(tp) - rect->r_ybot) * rwidth) : DLONG_MAX;
|
||||
f2 = (BOTTOM(tp) > MINFINITY + 2) ?
|
||||
((dlong)(rect->r_ytop - BOTTOM(tp)) * rwidth) : DLONG_MAX;
|
||||
f3 = (RIGHT(tp) < INFINITY - 2) ?
|
||||
((dlong)(RIGHT(tp) - rect->r_xtop) * rheight) : DLONG_MAX;
|
||||
f4 = (LEFT(tp) > MINFINITY + 2) ?
|
||||
((dlong)(rect->r_xbot - LEFT(tp)) * rheight) : DLONG_MAX;
|
||||
|
||||
/* ignore sub-integer slivers */
|
||||
if (f4 < DLONG_MAX) f4 += rmax;
|
||||
if (f3 < DLONG_MAX) f3 += rmax;
|
||||
|
||||
if (SplitDirection(tp) ? (f1 < f4) : (f2 < f4))
|
||||
ignore_sides |= IGNORE_LEFT;
|
||||
|
||||
if (SplitDirection(tp) ? (f2 < f3) : (f1 < f3))
|
||||
ignore_sides |= IGNORE_RIGHT;
|
||||
|
||||
/* May call function twice to paint both sides of */
|
||||
/* the split tile, if necessary. */
|
||||
|
||||
if (!(ignore_sides & IGNORE_LEFT))
|
||||
{
|
||||
if ((*func)(tp, (TileType)TT_DIAGONAL, arg)) return (1);
|
||||
}
|
||||
if (!(ignore_sides & IGNORE_RIGHT))
|
||||
{
|
||||
if ((*func)(tp, (TileType)TT_DIAGONAL | TT_SIDE, arg)) return (1);
|
||||
}
|
||||
}
|
||||
else
|
||||
if (TTMaskHasType(mask, TiGetType(tp)) && (*func)(tp, (TileType)0, arg))
|
||||
return (1);
|
||||
#endif
|
||||
|
||||
enum_next:
|
||||
tpnew = TR(tp);
|
||||
if (LEFT(tpnew) < rect->r_xtop)
|
||||
|
||||
Reference in New Issue
Block a user