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

plowFindWidth() pass by-pointer const TileTypeBitMask* instead of by-value 

sizeof(TileTypeBitMask) == 32
This commit is contained in:
Darryl L. Miles 2025-02-17 09:49:58 +00:00 committed by Tim Edwards
parent bc5a4a0fb1
commit 2ff6d6113d
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plow/PlowMain.c
View File

@ -1762,7 +1762,7 @@ retry:
{ {
*prReal = *prMin; *prReal = *prMin;
prReal->pr_next = prReal + 1; prReal->pr_next = prReal + 1;
dist = plowFindWidth(edge, prMin->pr_oktypes, bbox, &maxBox); dist = plowFindWidth(edge, &prMin->pr_oktypes, bbox, &maxBox);
/* Conservative test of whether we need to yank more */ /* Conservative test of whether we need to yank more */
if (plowYankMore(&maxBox, 1, 1)) if (plowYankMore(&maxBox, 1, 1))

2
plow/PlowTest.c
View File

@ -273,7 +273,7 @@ PlowTest(w, cmd)
editArea.r_ybot, editArea.r_ytop); editArea.r_ybot, editArea.r_ytop);
saveDef = plowYankDef; saveDef = plowYankDef;
plowYankDef = def; plowYankDef = def;
(void) plowFindWidth(&edge, okTypes, &def->cd_bbox, &editArea); (void) plowFindWidth(&edge, &okTypes, &def->cd_bbox, &editArea);
plowYankDef = saveDef; plowYankDef = saveDef;
GeoTransRect(&EditToRootTransform, &editArea, &rootBox); GeoTransRect(&EditToRootTransform, &editArea, &rootBox);
ToolMoveBox(TOOL_BL, &rootBox.r_ll, FALSE, rootBoxDef); ToolMoveBox(TOOL_BL, &rootBox.r_ll, FALSE, rootBoxDef);

12
plow/PlowWidth.c
View File

@ -62,13 +62,12 @@ int plowWidthNumChoices = 0;
*/ */
int int
plowFindWidth(edge, types, bbox, prect) plowFindWidth(
Edge *edge; /* Edge along the LHS of this material */ Edge *edge, /* Edge along the LHS of this material */
TileTypeBitMask types; /* Types whose width is being computed. Note const TileTypeBitMask *typesp,/* Types whose width is being computed.
* that this set is passed by value.
*/ */
Rect *bbox; /* Bounding box of the cell */ Rect *bbox, /* Bounding box of the cell */
Rect *prect; /* (Debugging only): if this is non-NULL, Rect *prect) /* (Debugging only): if this is non-NULL,
* the rectangle it points to is filled * the rectangle it points to is filled
* in with the rectangle found by this * in with the rectangle found by this
* algorithm to be the largest containing * algorithm to be the largest containing
@ -76,6 +75,7 @@ plowFindWidth(edge, types, bbox, prect)
* set 'types'. * set 'types'.
*/ */
{ {
TileTypeBitMask types = *typesp; /* TTMaskCopy(&types, typesp); */
Plane *plane = plowYankDef->cd_planes[edge->e_pNum]; Plane *plane = plowYankDef->cd_planes[edge->e_pNum];
TileTypeBitMask ctypes; TileTypeBitMask ctypes;
struct wclip wc; struct wclip wc;

2
plow/plowInt.h
View File

@ -257,7 +257,7 @@ extern int plowApplySearchRules();
extern int plowAtomize(); extern int plowAtomize();
extern void plowCleanupJogs(); extern void plowCleanupJogs();
extern void plowDebugEdge(); extern void plowDebugEdge();
extern int plowFindWidth(); extern int plowFindWidth(Edge *edge, const TileTypeBitMask *typesp, Rect *bbox, Rect *prect);
extern int plowFindWidthBack(); extern int plowFindWidthBack();
extern int plowGenRandom(); extern int plowGenRandom();
extern void plowQueueDone(); extern void plowQueueDone();