luke/magic
1
0
Fork 0
mirror of https://github.com/RTimothyEdwards/magic.git synced 2026-08-22 14:17:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Additional changes; fixed some of the most problematic issues

Browse Source 
involving searches on split tile areas, including one very
important check for interaction between split tiles during
hierarchical extraction.  There is still something wrong in
the hierarchical extraction, but it could be the last remaining
issue.
This commit is contained in:
R. Timothy Edwards
2026-01-15 21:35:46 -05:00
parent 8bd01f5597
commit 846c8e0f65
15 changed files with 1841 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extract/extractInt.h
+21 -17
View File
@@ -161,6 +161,8 @@ typedef struct reg
*/
typedef struct split_reg
{
ExtRegion *reg_guard; // Use this to guard against failure to
// identify a split region (temporary).
ExtRegion *reg_left; // Region belonging to tile left side
ExtRegion *reg_right; // Region belonging to tile right side
} ExtSplitRegion;
@@ -953,12 +955,6 @@ extern ExtStyle *ExtCurStyle;
/* ------------------- Hierarchical node merging ---------------------- */
/*
* Table used to hold all merged nodes during hierarchical extraction.
* Used for duplicate suppression.
*/
extern HashTable extHierMergeTable;
/*
* Each hash entry in the above table points to a NodeName struct.
* Each NodeName points to the Node corresponding to that name.
@@ -1002,7 +998,7 @@ extern ExtRegion *ExtGetRegion(Tile *tile, TileType dinfo);
/* time the tile is pushed and the time that it is popped. */
#define PUSHTILE(tp, di, pl) \
(tp)->ti_client = VISITPENDING; \
ExtSetRegion(tp, di, (ExtRegion *)VISITPENDING); \
STACKPUSH((ClientData)(pointertype)pl, extNodeStack); \
STACKPUSH((ClientData)(pointertype)di, extNodeStack); \
STACKPUSH((ClientData)(pointertype)tp, extNodeStack)
@@ -1015,27 +1011,31 @@ extern ExtRegion *ExtGetRegion(Tile *tile, TileType dinfo);
/* Variations of "pushtile" to force a specific value on TT_SIDE */
#define PUSHTILEBOTTOM(tp, pl) \
(tp)->ti_client = VISITPENDING; \
{ \
TileType di = (SplitDirection(tp)) ? 0 : TT_SIDE; \
ExtSetRegion(tp, di, (ExtRegion *)VISITPENDING); \
STACKPUSH((ClientData)(pointertype)pl, extNodeStack); \
STACKPUSH((ClientData)(pointertype) \
((SplitDirection(tp)) ? 0 : TT_SIDE), extNodeStack) ;\
STACKPUSH((ClientData)(pointertype)tp, extNodeStack)
STACKPUSH((ClientData)(pointertype)di, extNodeStack); \
STACKPUSH((ClientData)(pointertype)tp, extNodeStack); \
}
#define PUSHTILETOP(tp, pl) \
(tp)->ti_client = VISITPENDING; \
{ \
TileType di = (SplitDirection(tp)) ? TT_SIDE : 0; \
ExtSetRegion(tp, di, (ExtRegion *)VISITPENDING); \
STACKPUSH((ClientData)(pointertype)pl, extNodeStack); \
STACKPUSH((ClientData)(pointertype) \
((SplitDirection(tp)) ? TT_SIDE : 0), extNodeStack) ;\
STACKPUSH((ClientData)(pointertype)tp, extNodeStack)
STACKPUSH((ClientData)(pointertype)di, extNodeStack); \
STACKPUSH((ClientData)(pointertype)tp, extNodeStack); \
}
#define PUSHTILELEFT(tp, pl) \
(tp)->ti_client = VISITPENDING; \
ExtSetRegion(tp, (TileType)0, (ExtRegion *)VISITPENDING); \
STACKPUSH((ClientData)(pointertype)(pl), extNodeStack); \
STACKPUSH((ClientData)(pointertype)0, extNodeStack); \
STACKPUSH((ClientData)(pointertype)tp, extNodeStack)
#define PUSHTILERIGHT(tp, pl) \
(tp)->ti_client = VISITPENDING; \
ExtSetRegion(tp, (TileType)TT_SIDE, (ExtRegion *)VISITPENDING); \
STACKPUSH((ClientData)(pointertype)pl, extNodeStack); \
STACKPUSH((ClientData)(pointertype)TT_SIDE, extNodeStack); \
STACKPUSH((ClientData)(pointertype)tp, extNodeStack)
@@ -1117,6 +1117,10 @@ extern Plane *extCellFile();
extern int extInterAreaFunc();
extern int extTreeSrPaintArea();
extern int extMakeUnique();
extern void extEnumTerminal();
extern void extEnumTerminal(Tile *tile, TileType dinfo,
TileTypeBitMask *connect, void (*func)(), ClientData clientData);
/* ------------------ Connectivity table management ------------------- */