X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/a5712538a2bbb8c2d51a592fa5f71bb6607c90b4..1cea529f7dc604c05ae5d8a86c736e37fedd88aa:/slant.c diff --git a/slant.c b/slant.c index 6c540ba..52f21d6 100644 --- a/slant.c +++ b/slant.c @@ -39,6 +39,8 @@ enum { COL_SLANT1, COL_SLANT2, COL_ERROR, + COL_CURSOR, + COL_FILLEDSQUARE, NCOLOURS }; @@ -83,7 +85,6 @@ typedef struct game_clues { #define ERR_VERTEX 1 #define ERR_SQUARE 2 -#define ERR_SQUARE_TMP 4 struct game_state { struct game_params p; @@ -468,15 +469,13 @@ static int slant_solve(int w, int h, const signed char *clues, * Establish a disjoint set forest for tracking connectedness * between grid points. */ - for (i = 0; i < W*H; i++) - sc->connected[i] = i; /* initially all distinct */ + dsf_init(sc->connected, W*H); /* * Establish a disjoint set forest for tracking which squares * are known to slant in the same direction. */ - for (i = 0; i < w*h; i++) - sc->equiv[i] = i; /* initially all distinct */ + dsf_init(sc->equiv, w*h); /* * Clear the slashval array. @@ -1006,9 +1005,7 @@ static void slant_generate(int w, int h, signed char *soln, random_state *rs) * Establish a disjoint set forest for tracking connectedness * between grid points. */ - connected = snewn(W*H, int); - for (i = 0; i < W*H; i++) - connected[i] = i; /* initially all distinct */ + connected = snew_dsf(W*H); /* * Prepare a list of the squares in the grid, and fill them in @@ -1263,7 +1260,7 @@ static game_state *new_game(midend *me, game_params *params, char *desc) state->clues->h = h; state->clues->clues = snewn(W*H, signed char); state->clues->refcount = 1; - state->clues->tmpdsf = snewn(W*H, int); + state->clues->tmpdsf = snewn(W*H*2+W+H, int); memset(state->clues->clues, -1, W*H); while (*desc) { int n = *desc++; @@ -1357,160 +1354,92 @@ static int vertex_degree(int w, int h, signed char *soln, int x, int y, static int check_completion(game_state *state) { int w = state->p.w, h = state->p.h, W = w+1, H = h+1; - int i, x, y, err = FALSE; + int x, y, err = FALSE; int *dsf; memset(state->errors, 0, W*H); /* * To detect loops in the grid, we iterate through each edge - * building up a dsf of connected components, and raise the - * alarm whenever we find an edge that connects two - * already-connected vertices. - * + * building up a dsf of connected components of the space + * around the edges; if there's more than one such component, + * we have a loop, and in particular we can then easily + * identify and highlight every edge forming part of a loop + * because it separates two nonequivalent regions. + * * We use the `tmpdsf' scratch space in the shared clues * structure, to avoid mallocing too often. - * - * When we find such an edge, we then search around the grid to - * find the loop it is a part of, so that we can highlight it - * as an error for the user. We do this by the hand-on-one-wall - * technique: the search will follow branches off the inside of - * the loop, discover they're dead ends, and unhighlight them - * again when returning to the actual loop. - * - * This technique guarantees that every loop it tracks will - * surround a disjoint area of the grid (since if an existing - * loop appears on the boundary of a new one, so that there are - * multiple possible paths that would come back to the starting - * point, it will pick the one that allows it to turn right - * most sharply and hence the one that does not re-surround the - * area of the previous one). Thus, the total time taken in - * searching round loops is linear in the grid area since every - * edge is visited at most twice. + * + * For these purposes, the grid is considered to be divided + * into diamond-shaped regions surrounding an orthogonal edge. + * This means we have W*h vertical edges and w*H horizontal + * ones; so our vertical edges are indexed in the dsf as + * (y*W+x) (0<=yclues->tmpdsf; - for (i = 0; i < W*H; i++) - dsf[i] = i; /* initially all distinct */ + dsf_init(dsf, W*h + w*H); + /* Start by identifying all the outer edges with each other. */ + for (y = 0; y < h; y++) { + dsf_merge(dsf, 0, y*W+0); + dsf_merge(dsf, 0, y*W+w); + } + for (x = 0; x < w; x++) { + dsf_merge(dsf, 0, W*h + 0*w+x); + dsf_merge(dsf, 0, W*h + h*w+x); + } + /* Now go through the actual grid. */ for (y = 0; y < h; y++) for (x = 0; x < w; x++) { - int i1, i2; - - if (state->soln[y*w+x] == 0) - continue; - if (state->soln[y*w+x] < 0) { - i1 = y*W+x; - i2 = (y+1)*W+(x+1); - } else { - i1 = y*W+(x+1); - i2 = (y+1)*W+x; - } - - /* - * Our edge connects i1 with i2. If they're already - * connected, flag an error. Otherwise, link them. - */ - if (dsf_canonify(dsf, i1) == dsf_canonify(dsf, i2)) { - int x1, y1, x2, y2, dx, dy, dt, pass; - - err = TRUE; - + if (state->soln[y*w+x] >= 0) { /* - * Now search around the boundary of the loop to - * highlight it. - * - * We have to do this in two passes. The first - * time, we toggle ERR_SQUARE_TMP on each edge; - * this pass terminates with ERR_SQUARE_TMP set on - * exactly the loop edges. In the second pass, we - * trace round that loop again and turn - * ERR_SQUARE_TMP into ERR_SQUARE. We have to do - * this because otherwise we might cancel part of a - * loop highlighted in a previous iteration of the - * outer loop. + * There isn't a \ in this square, so we can unify + * the top edge with the left, and the bottom with + * the right. */ - - for (pass = 0; pass < 2; pass++) { - - x1 = i1 % W; - y1 = i1 / W; - x2 = i2 % W; - y2 = i2 / W; - - do { - /* Mark this edge. */ - if (pass == 0) { - state->errors[min(y1,y2)*W+min(x1,x2)] ^= - ERR_SQUARE_TMP; - } else { - state->errors[min(y1,y2)*W+min(x1,x2)] |= - ERR_SQUARE; - state->errors[min(y1,y2)*W+min(x1,x2)] &= - ~ERR_SQUARE_TMP; - } - - /* - * Progress to the next edge by turning as - * sharply right as possible. In fact we do - * this by facing back along the edge and - * turning _left_ until we see an edge we - * can follow. - */ - dx = x1 - x2; - dy = y1 - y2; - - for (i = 0; i < 4; i++) { - /* - * Rotate (dx,dy) to the left. - */ - dt = dx; dx = dy; dy = -dt; - - /* - * See if (x2,y2) has an edge in direction - * (dx,dy). - */ - if (x2+dx < 0 || x2+dx >= W || - y2+dy < 0 || y2+dy >= H) - continue; /* off the side of the grid */ - /* In the second pass, ignore unmarked edges. */ - if (pass == 1 && - !(state->errors[(y2-(dy<0))*W+x2-(dx<0)] & - ERR_SQUARE_TMP)) - continue; - if (state->soln[(y2-(dy<0))*w+x2-(dx<0)] == - (dx==dy ? -1 : +1)) - break; - } - - /* - * In pass 0, we expect to have found - * _some_ edge we can follow, even if it - * was found by rotating all the way round - * and going back the way we came. - * - * In pass 1, because we're removing the - * mark on each edge that allows us to - * follow it, we expect to find _no_ edge - * we can follow when we've come all the - * way round the loop. - */ - if (pass == 1 && i == 4) - break; - assert(i < 4); - - /* - * Set x1,y1 to x2,y2, and x2,y2 to be the - * other end of the new edge. - */ - x1 = x2; - y1 = y2; - x2 += dx; - y2 += dy; - } while (y2*W+x2 != i2); - - } - - } else - dsf_merge(dsf, i1, i2); + dsf_merge(dsf, y*W+x, W*h + y*w+x); + dsf_merge(dsf, y*W+(x+1), W*h + (y+1)*w+x); + } + if (state->soln[y*w+x] <= 0) { + /* + * There isn't a / in this square, so we can unify + * the top edge with the right, and the bottom + * with the left. + */ + dsf_merge(dsf, y*W+x, W*h + (y+1)*w+x); + dsf_merge(dsf, y*W+(x+1), W*h + y*w+x); + } + } + /* Now go through again and mark the appropriate edges as erroneous. */ + for (y = 0; y < h; y++) + for (x = 0; x < w; x++) { + int erroneous = 0; + if (state->soln[y*w+x] > 0) { + /* + * A / separates the top and left edges (which + * must already have been identified with each + * other) from the bottom and right (likewise). + * Hence it is erroneous if and only if the top + * and right edges are nonequivalent. + */ + erroneous = (dsf_canonify(dsf, y*W+(x+1)) != + dsf_canonify(dsf, W*h + y*w+x)); + } else if (state->soln[y*w+x] < 0) { + /* + * A \ separates the top and right edges (which + * must already have been identified with each + * other) from the bottom and left (likewise). + * Hence it is erroneous if and only if the top + * and left edges are nonequivalent. + */ + erroneous = (dsf_canonify(dsf, y*W+x) != + dsf_canonify(dsf, W*h + y*w+x)); + } + if (erroneous) { + state->errors[y*W+x] |= ERR_SQUARE; + err = TRUE; + } } /* @@ -1620,6 +1549,11 @@ static char *solve_game(game_state *state, game_state *currstate, return move; } +static int game_can_format_as_text_now(game_params *params) +{ + return TRUE; +} + static char *game_text_format(game_state *state) { int w = state->p.w, h = state->p.h, W = w+1, H = h+1; @@ -1662,13 +1596,20 @@ static char *game_text_format(game_state *state) return ret; } +struct game_ui { + int cur_x, cur_y, cur_visible; +}; + static game_ui *new_ui(game_state *state) { - return NULL; + game_ui *ui = snew(game_ui); + ui->cur_x = ui->cur_y = ui->cur_visible = 0; + return ui; } static void free_ui(game_ui *ui) { + sfree(ui); } static char *encode_ui(game_ui *ui) @@ -1716,6 +1657,7 @@ static void game_changed_state(game_ui *ui, game_state *oldstate, #define ERR_TR 0x00008000L #define ERR_BL 0x00010000L #define ERR_BR 0x00020000L +#define CURSOR 0x00040000L struct game_drawstate { int tilesize; @@ -1728,11 +1670,11 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds, int x, int y, int button) { int w = state->p.w, h = state->p.h; + int v; + char buf[80]; + enum { CLOCKWISE, ANTICLOCKWISE, NONE } action = NONE; if (button == LEFT_BUTTON || button == RIGHT_BUTTON) { - int v; - char buf[80]; - /* * This is an utterly awful hack which I should really sort out * by means of a proper configuration mechanism. One Slant @@ -1755,13 +1697,29 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds, button = LEFT_BUTTON; } } + action = (button == LEFT_BUTTON) ? CLOCKWISE : ANTICLOCKWISE; x = FROMCOORD(x); y = FROMCOORD(y); if (x < 0 || y < 0 || x >= w || y >= h) return NULL; + } else if (IS_CURSOR_SELECT(button)) { + if (!ui->cur_visible) { + ui->cur_visible = 1; + return ""; + } + x = ui->cur_x; + y = ui->cur_y; + + action = (button == CURSOR_SELECT2) ? ANTICLOCKWISE : CLOCKWISE; + } else if (IS_CURSOR_MOVE(button)) { + move_cursor(button, &ui->cur_x, &ui->cur_y, w, h, 0); + ui->cur_visible = 1; + return ""; + } - if (button == LEFT_BUTTON) { + if (action != NONE) { + if (action == CLOCKWISE) { /* * Left-clicking cycles blank -> \ -> / -> blank. */ @@ -1835,7 +1793,8 @@ static void game_compute_size(game_params *params, int tilesize, int *x, int *y) { /* fool the macros */ - struct dummy { int tilesize; } dummy = { tilesize }, *ds = &dummy; + struct dummy { int tilesize; } dummy, *ds = &dummy; + dummy.tilesize = tilesize; *x = 2 * BORDER + params->w * TILESIZE + 1; *y = 2 * BORDER + params->h * TILESIZE + 1; @@ -1851,7 +1810,12 @@ static float *game_colours(frontend *fe, int *ncolours) { float *ret = snewn(3 * NCOLOURS, float); - frontend_default_colour(fe, &ret[COL_BACKGROUND * 3]); + /* CURSOR colour is a background highlight. */ + game_mkhighlight(fe, ret, COL_BACKGROUND, COL_CURSOR, -1); + + ret[COL_FILLEDSQUARE * 3 + 0] = ret[COL_BACKGROUND * 3 + 0]; + ret[COL_FILLEDSQUARE * 3 + 1] = ret[COL_BACKGROUND * 3 + 1]; + ret[COL_FILLEDSQUARE * 3 + 2] = ret[COL_BACKGROUND * 3 + 2]; ret[COL_GRID * 3 + 0] = ret[COL_BACKGROUND * 3 + 0] * 0.7F; ret[COL_GRID * 3 + 1] = ret[COL_BACKGROUND * 3 + 1] * 0.7F; @@ -1910,7 +1874,7 @@ static void draw_clue(drawing *dr, game_drawstate *ds, if (v < 0) return; - p[0] = v + '0'; + p[0] = (char)v + '0'; p[1] = '\0'; draw_circle(dr, COORD(x), COORD(y), CLUE_RADIUS, bg >= 0 ? bg : COL_BACKGROUND, ccol); @@ -1929,7 +1893,10 @@ static void draw_tile(drawing *dr, game_drawstate *ds, game_clues *clues, clip(dr, COORD(x), COORD(y), TILESIZE, TILESIZE); draw_rect(dr, COORD(x), COORD(y), TILESIZE, TILESIZE, - (v & FLASH) ? COL_GRID : COL_BACKGROUND); + (v & FLASH) ? COL_GRID : + (v & CURSOR) ? COL_CURSOR : + (v & (BACKSLASH | FORWSLASH)) ? COL_FILLEDSQUARE : + COL_BACKGROUND); /* * Draw the grid lines. @@ -2068,6 +2035,8 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate, ds->todraw[(y+2)*(w+2)+(x+1)] |= ERR_T_L | ERR_C_TL; } } + if (ui->cur_visible && ui->cur_x == x && ui->cur_y == y) + ds->todraw[(y+1)*(w+2)+(x+1)] |= CURSOR; } } @@ -2110,6 +2079,11 @@ static float game_flash_length(game_state *oldstate, game_state *newstate, return 0.0F; } +static int game_status(game_state *state) +{ + return state->completed ? +1 : 0; +} + static int game_timing_state(game_state *state, game_ui *ui) { return TRUE; @@ -2123,8 +2097,8 @@ static void game_print_size(game_params *params, float *x, float *y) * I'll use 6mm squares by default. */ game_compute_size(params, 600, &pw, &ph); - *x = pw / 100.0; - *y = ph / 100.0; + *x = pw / 100.0F; + *y = ph / 100.0F; } static void game_print(drawing *dr, game_state *state, int tilesize) @@ -2191,7 +2165,7 @@ static void game_print(drawing *dr, game_state *state, int tilesize) #endif const struct game thegame = { - "Slant", "games.slant", + "Slant", "games.slant", "slant", default_params, game_fetch_preset, decode_params, @@ -2206,7 +2180,7 @@ const struct game thegame = { dup_game, free_game, TRUE, solve_game, - TRUE, game_text_format, + TRUE, game_can_format_as_text_now, game_text_format, new_ui, free_ui, encode_ui, @@ -2221,6 +2195,7 @@ const struct game thegame = { game_redraw, game_anim_length, game_flash_length, + game_status, TRUE, FALSE, game_print_size, game_print, FALSE, /* wants_statusbar */ FALSE, game_timing_state, @@ -2316,3 +2291,5 @@ int main(int argc, char **argv) } #endif + +/* vim: set shiftwidth=4 tabstop=8: */