luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Corrected the "grow-euclidean" option for grow/shrink/bloat-or so 

that it correctly lands on a grid limit boundary (which the
previous commit did not do).  Note that work is still ongoing to
detect some pathological cases where the shapes end up off-grid
where two non-manhattan shapes intersect at different angles
(such as an inside corner).
This commit is contained in:
Tim Edwards 2021-11-16 17:33:05 -05:00
parent 7ffe8bc866
commit cf47772278
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
cif/CIFgen.c
View File

@ -187,6 +187,39 @@ SetBoxGrid(area)
} }
} }
/*
* ----------------------------------------------------------------------------
* SetValueGrid ---
*
* Adjust the given distance to the nearest CIF minimum grid.
*
* Returns: The adjusted value.
*
* Side Effects: None.
*
* Notes: Value is assumed to be a distance, therefore always positive.
*
* ----------------------------------------------------------------------------
*/
int
SetValueGrid(value)
int value;
{
int limit;
int delta;
limit = CIFCurStyle->cs_gridLimit;
if (CIFCurStyle && (limit > 1))
{
delta = value % limit;
if (delta > 0)
value += limit - delta;
}
return value;
}
/* /*
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
* SetMinBoxGrid --- * SetMinBoxGrid ---
@ -571,8 +604,12 @@ cifGrowEuclideanFunc(tile, table)
width = area.r_xtop - area.r_xbot; width = area.r_xtop - area.r_xbot;
height = area.r_ytop - area.r_ybot; height = area.r_ytop - area.r_ybot;
hyp = sqrt((double)(width * width + height * height)); hyp = sqrt((double)(width * width + height * height));
growDistanceY = ceil((growDistance * (hyp - height)) / width); growDistanceY = ceil((double)(growDistance * width) / hyp);
growDistanceX = ceil((growDistance * (hyp - width)) / height); growDistanceX = ceil((double)(growDistance * height) / hyp);
/* Adjust for grid limit */
growDistanceX = SetValueGrid(growDistanceX);
growDistanceY = SetValueGrid(growDistanceY);
/* Draw vertical tile to distance X */ /* Draw vertical tile to distance X */
@ -581,7 +618,6 @@ cifGrowEuclideanFunc(tile, table)
if (!(growDirs & GROW_WEST)) rtmp.r_xbot = rtmp.r_xtop - growDistanceX; if (!(growDirs & GROW_WEST)) rtmp.r_xbot = rtmp.r_xtop - growDistanceX;
if (!(growDirs & GROW_SOUTH)) rtmp.r_ybot -= growDistance; if (!(growDirs & GROW_SOUTH)) rtmp.r_ybot -= growDistance;
if (!(growDirs & GROW_NORTH)) rtmp.r_ytop += growDistance; if (!(growDirs & GROW_NORTH)) rtmp.r_ytop += growDistance;
SetBoxGrid(&rtmp);
DBPaintPlane(cifPlane, &rtmp, table, (PaintUndoInfo *) NULL); DBPaintPlane(cifPlane, &rtmp, table, (PaintUndoInfo *) NULL);
/* Draw horizontal tile to distance Y */ /* Draw horizontal tile to distance Y */
@ -591,7 +627,6 @@ cifGrowEuclideanFunc(tile, table)
if (!(growDirs & GROW_WEST)) rtmp.r_xbot -= growDistance; if (!(growDirs & GROW_WEST)) rtmp.r_xbot -= growDistance;
if (!(growDirs & GROW_SOUTH)) rtmp.r_ybot = rtmp.r_ytop - growDistanceY; if (!(growDirs & GROW_SOUTH)) rtmp.r_ybot = rtmp.r_ytop - growDistanceY;
if (!(growDirs & GROW_NORTH)) rtmp.r_ytop = rtmp.r_ybot + growDistanceY; if (!(growDirs & GROW_NORTH)) rtmp.r_ytop = rtmp.r_ybot + growDistanceY;
SetBoxGrid(&rtmp);
DBPaintPlane(cifPlane, &rtmp, table, (PaintUndoInfo *) NULL); DBPaintPlane(cifPlane, &rtmp, table, (PaintUndoInfo *) NULL);
/* Finally, translate, resize, and paint the diagonal tile */ /* Finally, translate, resize, and paint the diagonal tile */
@ -615,7 +650,6 @@ cifGrowEuclideanFunc(tile, table)
else else
rtmp.r_xbot += growDistanceX; rtmp.r_xbot += growDistanceX;
SetBoxGrid(&rtmp);
DBNMPaintPlane(cifPlane, oldType, &rtmp, table, (PaintUndoInfo *) NULL); DBNMPaintPlane(cifPlane, oldType, &rtmp, table, (PaintUndoInfo *) NULL);
oldType = (growDirs & GROW_EAST) ? TiGetRightType(tile) : TiGetLeftType(tile); oldType = (growDirs & GROW_EAST) ? TiGetRightType(tile) : TiGetLeftType(tile);