X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/1482ee76f9b9a587ea12a09d4c971f5ed92cb6fe..48a10826fef7777bb8b061f4a121f481ced98bc0:/cube.c diff --git a/cube.c b/cube.c index 8a19ae7..82901e5 100644 --- a/cube.c +++ b/cube.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include "puzzles.h" @@ -21,87 +22,92 @@ struct solid { int faces[MAXFACES * MAXORDER]; /* order*nfaces point indices */ float normals[MAXFACES * 3]; /* 3*npoints vector components */ float shear; /* isometric shear for nice drawing */ + float border; /* border required around arena */ }; -static const struct solid tetrahedron = { +static const struct solid s_tetrahedron = { 4, { - 0.0, -0.57735026919, -0.20412414523, - -0.5, 0.28867513459, -0.20412414523, - 0.0, -0.0, 0.6123724357, - 0.5, 0.28867513459, -0.20412414523, + 0.0F, -0.57735026919F, -0.20412414523F, + -0.5F, 0.28867513459F, -0.20412414523F, + 0.0F, -0.0F, 0.6123724357F, + 0.5F, 0.28867513459F, -0.20412414523F, }, 3, 4, { 0,2,1, 3,1,2, 2,0,3, 1,3,0 }, { - -0.816496580928, -0.471404520791, 0.333333333334, - 0.0, 0.942809041583, 0.333333333333, - 0.816496580928, -0.471404520791, 0.333333333334, - 0.0, 0.0, -1.0, + -0.816496580928F, -0.471404520791F, 0.333333333334F, + 0.0F, 0.942809041583F, 0.333333333333F, + 0.816496580928F, -0.471404520791F, 0.333333333334F, + 0.0F, 0.0F, -1.0F, }, - 0.0 + 0.0F, 0.3F }; -static const struct solid cube = { +static const struct solid s_cube = { 8, { - -0.5,-0.5,-0.5, -0.5,-0.5,+0.5, -0.5,+0.5,-0.5, -0.5,+0.5,+0.5, - +0.5,-0.5,-0.5, +0.5,-0.5,+0.5, +0.5,+0.5,-0.5, +0.5,+0.5,+0.5, + -0.5F,-0.5F,-0.5F, -0.5F,-0.5F,+0.5F, + -0.5F,+0.5F,-0.5F, -0.5F,+0.5F,+0.5F, + +0.5F,-0.5F,-0.5F, +0.5F,-0.5F,+0.5F, + +0.5F,+0.5F,-0.5F, +0.5F,+0.5F,+0.5F, }, 4, 6, { 0,1,3,2, 1,5,7,3, 5,4,6,7, 4,0,2,6, 0,4,5,1, 3,7,6,2 }, { - -1,0,0, 0,0,+1, +1,0,0, 0,0,-1, 0,-1,0, 0,+1,0 + -1.0F,0.0F,0.0F, 0.0F,0.0F,+1.0F, + +1.0F,0.0F,0.0F, 0.0F,0.0F,-1.0F, + 0.0F,-1.0F,0.0F, 0.0F,+1.0F,0.0F }, - 0.3 + 0.3F, 0.5F }; -static const struct solid octahedron = { +static const struct solid s_octahedron = { 6, { - -0.5, -0.28867513459472505, 0.4082482904638664, - 0.5, 0.28867513459472505, -0.4082482904638664, - -0.5, 0.28867513459472505, -0.4082482904638664, - 0.5, -0.28867513459472505, 0.4082482904638664, - 0.0, -0.57735026918945009, -0.4082482904638664, - 0.0, 0.57735026918945009, 0.4082482904638664, + -0.5F, -0.28867513459472505F, 0.4082482904638664F, + 0.5F, 0.28867513459472505F, -0.4082482904638664F, + -0.5F, 0.28867513459472505F, -0.4082482904638664F, + 0.5F, -0.28867513459472505F, 0.4082482904638664F, + 0.0F, -0.57735026918945009F, -0.4082482904638664F, + 0.0F, 0.57735026918945009F, 0.4082482904638664F, }, 3, 8, { 4,0,2, 0,5,2, 0,4,3, 5,0,3, 1,4,2, 5,1,2, 4,1,3, 1,5,3 }, { - -0.816496580928, -0.471404520791, -0.333333333334, - -0.816496580928, 0.471404520791, 0.333333333334, - 0.0, -0.942809041583, 0.333333333333, - 0.0, 0.0, 1.0, - 0.0, 0.0, -1.0, - 0.0, 0.942809041583, -0.333333333333, - 0.816496580928, -0.471404520791, -0.333333333334, - 0.816496580928, 0.471404520791, 0.333333333334, + -0.816496580928F, -0.471404520791F, -0.333333333334F, + -0.816496580928F, 0.471404520791F, 0.333333333334F, + 0.0F, -0.942809041583F, 0.333333333333F, + 0.0F, 0.0F, 1.0F, + 0.0F, 0.0F, -1.0F, + 0.0F, 0.942809041583F, -0.333333333333F, + 0.816496580928F, -0.471404520791F, -0.333333333334F, + 0.816496580928F, 0.471404520791F, 0.333333333334F, }, - 0.0 + 0.0F, 0.5F }; -static const struct solid icosahedron = { +static const struct solid s_icosahedron = { 12, { - 0.0, 0.57735026919, 0.75576131408, - 0.0, -0.93417235896, 0.17841104489, - 0.0, 0.93417235896, -0.17841104489, - 0.0, -0.57735026919, -0.75576131408, - -0.5, -0.28867513459, 0.75576131408, - -0.5, 0.28867513459, -0.75576131408, - 0.5, -0.28867513459, 0.75576131408, - 0.5, 0.28867513459, -0.75576131408, - -0.80901699437, 0.46708617948, 0.17841104489, - 0.80901699437, 0.46708617948, 0.17841104489, - -0.80901699437, -0.46708617948, -0.17841104489, - 0.80901699437, -0.46708617948, -0.17841104489, + 0.0F, 0.57735026919F, 0.75576131408F, + 0.0F, -0.93417235896F, 0.17841104489F, + 0.0F, 0.93417235896F, -0.17841104489F, + 0.0F, -0.57735026919F, -0.75576131408F, + -0.5F, -0.28867513459F, 0.75576131408F, + -0.5F, 0.28867513459F, -0.75576131408F, + 0.5F, -0.28867513459F, 0.75576131408F, + 0.5F, 0.28867513459F, -0.75576131408F, + -0.80901699437F, 0.46708617948F, 0.17841104489F, + 0.80901699437F, 0.46708617948F, 0.17841104489F, + -0.80901699437F, -0.46708617948F, -0.17841104489F, + 0.80901699437F, -0.46708617948F, -0.17841104489F, }, 3, 20, { @@ -111,35 +117,35 @@ static const struct solid icosahedron = { 1,11,6, 8,2,5, 2,9,7, 3,10,5, 11,3,7, }, { - -0.356822089773, 0.87267799625, 0.333333333333, - 0.356822089773, 0.87267799625, 0.333333333333, - -0.356822089773, -0.87267799625, -0.333333333333, - 0.356822089773, -0.87267799625, -0.333333333333, - -0.0, 0.0, 1.0, - 0.0, -0.666666666667, 0.745355992501, - 0.0, 0.666666666667, -0.745355992501, - 0.0, 0.0, -1.0, - -0.934172358963, -0.12732200375, 0.333333333333, - -0.934172358963, 0.12732200375, -0.333333333333, - 0.934172358963, -0.12732200375, 0.333333333333, - 0.934172358963, 0.12732200375, -0.333333333333, - -0.57735026919, 0.333333333334, 0.745355992501, - 0.57735026919, 0.333333333334, 0.745355992501, - -0.57735026919, -0.745355992501, 0.333333333334, - 0.57735026919, -0.745355992501, 0.333333333334, - -0.57735026919, 0.745355992501, -0.333333333334, - 0.57735026919, 0.745355992501, -0.333333333334, - -0.57735026919, -0.333333333334, -0.745355992501, - 0.57735026919, -0.333333333334, -0.745355992501, + -0.356822089773F, 0.87267799625F, 0.333333333333F, + 0.356822089773F, 0.87267799625F, 0.333333333333F, + -0.356822089773F, -0.87267799625F, -0.333333333333F, + 0.356822089773F, -0.87267799625F, -0.333333333333F, + -0.0F, 0.0F, 1.0F, + 0.0F, -0.666666666667F, 0.745355992501F, + 0.0F, 0.666666666667F, -0.745355992501F, + 0.0F, 0.0F, -1.0F, + -0.934172358963F, -0.12732200375F, 0.333333333333F, + -0.934172358963F, 0.12732200375F, -0.333333333333F, + 0.934172358963F, -0.12732200375F, 0.333333333333F, + 0.934172358963F, 0.12732200375F, -0.333333333333F, + -0.57735026919F, 0.333333333334F, 0.745355992501F, + 0.57735026919F, 0.333333333334F, 0.745355992501F, + -0.57735026919F, -0.745355992501F, 0.333333333334F, + 0.57735026919F, -0.745355992501F, 0.333333333334F, + -0.57735026919F, 0.745355992501F, -0.333333333334F, + 0.57735026919F, 0.745355992501F, -0.333333333334F, + -0.57735026919F, -0.333333333334F, -0.745355992501F, + 0.57735026919F, -0.333333333334F, -0.745355992501F, }, - 0.0 + 0.0F, 0.8F }; enum { TETRAHEDRON, CUBE, OCTAHEDRON, ICOSAHEDRON }; static const struct solid *solids[] = { - &tetrahedron, &cube, &octahedron, &icosahedron + &s_tetrahedron, &s_cube, &s_octahedron, &s_icosahedron }; enum { @@ -149,10 +155,10 @@ enum { NCOLOURS }; -enum { LEFT, RIGHT, UP, DOWN }; +enum { LEFT, RIGHT, UP, DOWN, UP_LEFT, UP_RIGHT, DOWN_LEFT, DOWN_RIGHT }; -#define GRID_SCALE 48 -#define ROLLTIME 0.1 +#define GRID_SCALE 48.0F +#define ROLLTIME 0.13F #define SQ(x) ( (x) * (x) ) @@ -170,7 +176,7 @@ struct grid_square { float x, y; int npoints; float points[8]; /* maximum */ - int directions[4]; /* bit masks showing point pairs */ + int directions[8]; /* bit masks showing point pairs */ int flip; int blue; int tetra_class; @@ -205,7 +211,7 @@ struct game_state { int movecount; }; -game_params *default_params(void) +static game_params *default_params(void) { game_params *ret = snew(game_params); @@ -216,11 +222,89 @@ game_params *default_params(void) return ret; } -void free_params(game_params *params) +static int game_fetch_preset(int i, char **name, game_params **params) +{ + game_params *ret = snew(game_params); + char *str; + + switch (i) { + case 0: + str = "Cube"; + ret->solid = CUBE; + ret->d1 = 4; + ret->d2 = 4; + break; + case 1: + str = "Tetrahedron"; + ret->solid = TETRAHEDRON; + ret->d1 = 1; + ret->d2 = 2; + break; + case 2: + str = "Octahedron"; + ret->solid = OCTAHEDRON; + ret->d1 = 2; + ret->d2 = 2; + break; + case 3: + str = "Icosahedron"; + ret->solid = ICOSAHEDRON; + ret->d1 = 3; + ret->d2 = 3; + break; + default: + sfree(ret); + return FALSE; + } + + *name = dupstr(str); + *params = ret; + return TRUE; +} + +static void free_params(game_params *params) { sfree(params); } +static game_params *dup_params(game_params *params) +{ + game_params *ret = snew(game_params); + *ret = *params; /* structure copy */ + return ret; +} + +static game_params *decode_params(char const *string) +{ + game_params *ret = default_params(); + + switch (*string) { + case 't': ret->solid = TETRAHEDRON; string++; break; + case 'c': ret->solid = CUBE; string++; break; + case 'o': ret->solid = OCTAHEDRON; string++; break; + case 'i': ret->solid = ICOSAHEDRON; string++; break; + default: break; + } + ret->d1 = ret->d2 = atoi(string); + while (*string && isdigit(*string)) string++; + if (*string == 'x') { + string++; + ret->d2 = atoi(string); + } + + return ret; +} + +static char *encode_params(game_params *params) +{ + char data[256]; + + assert(params->solid >= 0 && params->solid < 4); + sprintf(data, "%c%dx%d", "tcoi"[params->solid], params->d1, params->d2); + + return dupstr(data); +} + static void enum_grid_squares(game_params *params, void (*callback)(void *, struct grid_square *), void *ctx) @@ -230,26 +314,30 @@ static void enum_grid_squares(game_params *params, if (solid->order == 4) { int x, y; - for (x = 0; x < params->d1; x++) - for (y = 0; y < params->d2; y++) { + for (y = 0; y < params->d2; y++) + for (x = 0; x < params->d1; x++) { struct grid_square sq; - sq.x = x; - sq.y = y; - sq.points[0] = x - 0.5; - sq.points[1] = y - 0.5; - sq.points[2] = x - 0.5; - sq.points[3] = y + 0.5; - sq.points[4] = x + 0.5; - sq.points[5] = y + 0.5; - sq.points[6] = x + 0.5; - sq.points[7] = y - 0.5; + sq.x = (float)x; + sq.y = (float)y; + sq.points[0] = x - 0.5F; + sq.points[1] = y - 0.5F; + sq.points[2] = x - 0.5F; + sq.points[3] = y + 0.5F; + sq.points[4] = x + 0.5F; + sq.points[5] = y + 0.5F; + sq.points[6] = x + 0.5F; + sq.points[7] = y - 0.5F; sq.npoints = 4; sq.directions[LEFT] = 0x03; /* 0,1 */ sq.directions[RIGHT] = 0x0C; /* 2,3 */ sq.directions[UP] = 0x09; /* 0,3 */ sq.directions[DOWN] = 0x06; /* 1,2 */ + sq.directions[UP_LEFT] = 0; /* no diagonals in a square */ + sq.directions[UP_RIGHT] = 0; /* no diagonals in a square */ + sq.directions[DOWN_LEFT] = 0; /* no diagonals in a square */ + sq.directions[DOWN_RIGHT] = 0; /* no diagonals in a square */ sq.flip = FALSE; @@ -263,15 +351,15 @@ static void enum_grid_squares(game_params *params, } } else { int row, rowlen, other, i, firstix = -1; - float theight = sqrt(3) / 2.0; + float theight = (float)(sqrt(3) / 2.0); for (row = 0; row < params->d1 + params->d2; row++) { - if (row < params->d1) { + if (row < params->d2) { other = +1; - rowlen = row + params->d2; + rowlen = row + params->d1; } else { other = -1; - rowlen = 2*params->d1 + params->d2 - row; + rowlen = 2*params->d2 + params->d1 - row; } /* @@ -283,15 +371,15 @@ static void enum_grid_squares(game_params *params, float x, y; ix = (2 * i - (rowlen-1)); - x = ix * 0.5; + x = ix * 0.5F; y = theight * row; sq.x = x; sq.y = y + theight / 3; - sq.points[0] = x - 0.5; + sq.points[0] = x - 0.5F; sq.points[1] = y; sq.points[2] = x; sq.points[3] = y + theight; - sq.points[4] = x + 0.5; + sq.points[4] = x + 0.5F; sq.points[5] = y; sq.npoints = 3; @@ -300,6 +388,15 @@ static void enum_grid_squares(game_params *params, sq.directions[UP] = 0x05; /* 0,2 */ sq.directions[DOWN] = 0; /* invalid move */ + /* + * Down-pointing triangle: both the up diagonals go + * up, and the down ones go left and right. + */ + sq.directions[UP_LEFT] = sq.directions[UP_RIGHT] = + sq.directions[UP]; + sq.directions[DOWN_LEFT] = sq.directions[LEFT]; + sq.directions[DOWN_RIGHT] = sq.directions[RIGHT]; + sq.flip = TRUE; if (firstix < 0) @@ -319,15 +416,15 @@ static void enum_grid_squares(game_params *params, float x, y; ix = (2 * i - (rowlen+other-1)); - x = ix * 0.5; + x = ix * 0.5F; y = theight * row; sq.x = x; sq.y = y + 2*theight / 3; - sq.points[0] = x + 0.5; + sq.points[0] = x + 0.5F; sq.points[1] = y + theight; sq.points[2] = x; sq.points[3] = y; - sq.points[4] = x - 0.5; + sq.points[4] = x - 0.5F; sq.points[5] = y + theight; sq.npoints = 3; @@ -336,10 +433,19 @@ static void enum_grid_squares(game_params *params, sq.directions[DOWN] = 0x05; /* 0,2 */ sq.directions[UP] = 0; /* invalid move */ + /* + * Up-pointing triangle: both the down diagonals go + * down, and the up ones go left and right. + */ + sq.directions[DOWN_LEFT] = sq.directions[DOWN_RIGHT] = + sq.directions[DOWN]; + sq.directions[UP_LEFT] = sq.directions[LEFT]; + sq.directions[UP_RIGHT] = sq.directions[RIGHT]; + sq.flip = FALSE; if (firstix < 0) - firstix = ix; + firstix = (ix - 1) & 3; ix -= firstix; sq.tetra_class = ((row+(ix&1)) & 2) ^ (ix & 3); @@ -367,6 +473,99 @@ static int grid_area(int d1, int d2, int order) return d1*d1 + d2*d2 + 4*d1*d2; } +static config_item *game_configure(game_params *params) +{ + config_item *ret = snewn(4, config_item); + char buf[80]; + + ret[0].name = "Type of solid"; + ret[0].type = C_CHOICES; + ret[0].sval = ":Tetrahedron:Cube:Octahedron:Icosahedron"; + ret[0].ival = params->solid; + + ret[1].name = "Width / top"; + ret[1].type = C_STRING; + sprintf(buf, "%d", params->d1); + ret[1].sval = dupstr(buf); + ret[1].ival = 0; + + ret[2].name = "Height / bottom"; + ret[2].type = C_STRING; + sprintf(buf, "%d", params->d2); + ret[2].sval = dupstr(buf); + ret[2].ival = 0; + + ret[3].name = NULL; + ret[3].type = C_END; + ret[3].sval = NULL; + ret[3].ival = 0; + + return ret; +} + +static game_params *custom_params(config_item *cfg) +{ + game_params *ret = snew(game_params); + + ret->solid = cfg[0].ival; + ret->d1 = atoi(cfg[1].sval); + ret->d2 = atoi(cfg[2].sval); + + return ret; +} + +static void count_grid_square_callback(void *ctx, struct grid_square *sq) +{ + int *classes = (int *)ctx; + int thisclass; + + if (classes[4] == 4) + thisclass = sq->tetra_class; + else if (classes[4] == 2) + thisclass = sq->flip; + else + thisclass = 0; + + classes[thisclass]++; +} + +static char *validate_params(game_params *params) +{ + int classes[5]; + int i; + + if (params->solid < 0 || params->solid >= lenof(solids)) + return "Unrecognised solid type"; + + if (solids[params->solid]->order == 4) { + if (params->d1 <= 0 || params->d2 <= 0) + return "Both grid dimensions must be greater than zero"; + } else { + if (params->d1 <= 0 && params->d2 <= 0) + return "At least one grid dimension must be greater than zero"; + } + + for (i = 0; i < 4; i++) + classes[i] = 0; + if (params->solid == TETRAHEDRON) + classes[4] = 4; + else if (params->solid == OCTAHEDRON) + classes[4] = 2; + else + classes[4] = 1; + enum_grid_squares(params, count_grid_square_callback, classes); + + for (i = 0; i < classes[4]; i++) + if (classes[i] < solids[params->solid]->nfaces / classes[4]) + return "Not enough grid space to place all blue faces"; + + if (grid_area(params->d1, params->d2, solids[params->solid]->order) < + solids[params->solid]->nfaces + 1) + return "Not enough space to place the solid on an empty square"; + + return NULL; +} + struct grid_data { int *gridptrs[4]; int nsquares[4]; @@ -390,7 +589,8 @@ static void classify_grid_square_callback(void *ctx, struct grid_square *sq) data->squareindex++; } -char *new_game_seed(game_params *params) +static char *new_game_seed(game_params *params, random_state *rs, + game_aux_info **aux) { struct grid_data data; int i, j, k, m, area, facesperclass; @@ -435,15 +635,7 @@ char *new_game_seed(game_params *params) for (i = 0; i < data.nclasses; i++) { for (j = 0; j < facesperclass; j++) { - unsigned long divisor = RAND_MAX / data.nsquares[i]; - unsigned long max = divisor * data.nsquares[i]; - int n; - - do { - n = rand(); - } while (n >= max); - - n /= divisor; + int n = random_upto(rs, data.nsquares[i]); assert(!flags[data.gridptrs[i][n]]); flags[data.gridptrs[i][n]] = TRUE; @@ -491,19 +683,7 @@ char *new_game_seed(game_params *params) /* * Choose a non-blue square for the polyhedron. */ - { - unsigned long divisor = RAND_MAX / m; - unsigned long max = divisor * m; - int n; - - do { - n = rand(); - } while (n >= max); - - n /= divisor; - - sprintf(p, ":%d", data.gridptrs[0][n]); - } + sprintf(p, ",%d", data.gridptrs[0][random_upto(rs, m)]); sfree(data.gridptrs[0]); sfree(flags); @@ -511,6 +691,11 @@ char *new_game_seed(game_params *params) return seed; } +static void game_free_aux_info(game_aux_info *aux) +{ + assert(!"Shouldn't happen"); +} + static void add_grid_square_callback(void *ctx, struct grid_square *sq) { game_state *state = (game_state *)ctx; @@ -634,8 +819,8 @@ static struct solid *transform_poly(const struct solid *solid, int flip, vmatrix[1] = -vy; vmatrix[4] = vx; vmatrix[7] = 0; vmatrix[2] = 0; vmatrix[5] = 0; vmatrix[8] = 1; - ax = cos(angle); - ay = sin(angle); + ax = (float)cos(angle); + ay = (float)sin(angle); amatrix[0] = 1; amatrix[3] = 0; amatrix[6] = 0; amatrix[1] = 0; amatrix[4] = ax; amatrix[7] = ay; @@ -659,7 +844,35 @@ static struct solid *transform_poly(const struct solid *solid, int flip, return ret; } -game_state *new_game(game_params *params, char *seed) +static char *validate_seed(game_params *params, char *seed) +{ + int area = grid_area(params->d1, params->d2, solids[params->solid]->order); + int i, j; + + i = (area + 3) / 4; + for (j = 0; j < i; j++) { + int c = seed[j]; + if (c >= '0' && c <= '9') continue; + if (c >= 'A' && c <= 'F') continue; + if (c >= 'a' && c <= 'f') continue; + return "Not enough hex digits at start of string"; + /* NB if seed[j]=='\0' that will also be caught here, so we're safe */ + } + + if (seed[i] != ',') + return "Expected ',' after hex digits"; + + i++; + do { + if (seed[i] < '0' || seed[i] > '9') + return "Expected decimal integer after ','"; + i++; + } while (seed[i]); + + return NULL; +} + +static game_state *new_game(game_params *params, char *seed) { game_state *state = snew(game_state); int area; @@ -705,7 +918,7 @@ game_state *new_game(game_params *params, char *seed) j = 8; } - if (*p == ':') + if (*p == ',') p++; state->current = atoi(p); @@ -732,13 +945,13 @@ game_state *new_game(game_params *params, char *seed) state->previous = state->current; state->angle = 0.0; - state->completed = FALSE; + state->completed = 0; state->movecount = 0; return state; } -game_state *dup_game(game_state *state) +static game_state *dup_game(game_state *state) { game_state *ret = snew(game_state); @@ -767,12 +980,33 @@ game_state *dup_game(game_state *state) return ret; } -void free_game(game_state *state) +static void free_game(game_state *state) { sfree(state); } -game_state *make_move(game_state *from, int x, int y, int button) +static game_state *solve_game(game_state *state, game_aux_info *aux, + char **error) +{ + return NULL; +} + +static char *game_text_format(game_state *state) +{ + return NULL; +} + +static game_ui *new_ui(game_state *state) +{ + return NULL; +} + +static void free_ui(game_ui *ui) +{ +} + +static game_state *make_move(game_state *from, game_ui *ui, + int x, int y, int button) { int direction; int pkey[2], skey[2], dkey[2]; @@ -793,6 +1027,14 @@ game_state *make_move(game_state *from, int x, int y, int button) direction = LEFT; else if (button == CURSOR_RIGHT) direction = RIGHT; + else if (button == CURSOR_UP_LEFT) + direction = UP_LEFT; + else if (button == CURSOR_DOWN_LEFT) + direction = DOWN_LEFT; + else if (button == CURSOR_UP_RIGHT) + direction = UP_RIGHT; + else if (button == CURSOR_DOWN_RIGHT) + direction = DOWN_RIGHT; else return NULL; @@ -894,7 +1136,7 @@ game_state *make_move(game_state *from, int x, int y, int button) for (i = 0; i < 3; i++) dp += (from->solid->normals[f[0]*3+i] * from->solid->normals[f[1]*3+i]); - angle = acos(dp); + angle = (float)acos(dp); } /* @@ -982,6 +1224,8 @@ game_state *make_move(game_state *from, int x, int y, int button) ret->facecolours = newcolours; } + ret->movecount++; + /* * And finally, swap the colour between the bottom face of the * polyhedron and the face we've just landed on. @@ -1004,7 +1248,7 @@ game_state *make_move(game_state *from, int x, int y, int button) if (ret->facecolours[i]) j++; if (j == ret->solid->nfaces) - ret->completed = TRUE; + ret->completed = ret->movecount; } sfree(poly); @@ -1033,7 +1277,6 @@ game_state *make_move(game_state *from, int x, int y, int button) ret->sgkey[1] = skey[1]; ret->previous = from->current; ret->angle = angle; - ret->movecount++; return ret; } @@ -1071,23 +1314,23 @@ static struct bbox find_bbox(game_params *params) * These should be hugely more than the real bounding box will * be. */ - bb.l = 2 * (params->d1 + params->d2); - bb.r = -2 * (params->d1 + params->d2); - bb.u = 2 * (params->d1 + params->d2); - bb.d = -2 * (params->d1 + params->d2); + bb.l = 2.0F * (params->d1 + params->d2); + bb.r = -2.0F * (params->d1 + params->d2); + bb.u = 2.0F * (params->d1 + params->d2); + bb.d = -2.0F * (params->d1 + params->d2); enum_grid_squares(params, find_bbox_callback, &bb); return bb; } -void game_size(game_params *params, int *x, int *y) +static void game_size(game_params *params, int *x, int *y) { struct bbox bb = find_bbox(params); - *x = (bb.r - bb.l + 2) * GRID_SCALE; - *y = (bb.d - bb.u + 2) * GRID_SCALE; + *x = (int)((bb.r - bb.l + 2*solids[params->solid]->border) * GRID_SCALE); + *y = (int)((bb.d - bb.u + 2*solids[params->solid]->border) * GRID_SCALE); } -float *game_colours(frontend *fe, game_state *state, int *ncolours) +static float *game_colours(frontend *fe, game_state *state, int *ncolours) { float *ret = snewn(3 * NCOLOURS, float); @@ -1105,24 +1348,25 @@ float *game_colours(frontend *fe, game_state *state, int *ncolours) return ret; } -game_drawstate *game_new_drawstate(game_state *state) +static game_drawstate *game_new_drawstate(game_state *state) { struct game_drawstate *ds = snew(struct game_drawstate); struct bbox bb = find_bbox(&state->params); - ds->ox = -(bb.l - 1) * GRID_SCALE; - ds->oy = -(bb.u - 1) * GRID_SCALE; + ds->ox = (int)(-(bb.l - state->solid->border) * GRID_SCALE); + ds->oy = (int)(-(bb.u - state->solid->border) * GRID_SCALE); return ds; } -void game_free_drawstate(game_drawstate *ds) +static void game_free_drawstate(game_drawstate *ds) { sfree(ds); } -void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, - game_state *state, float animtime) +static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, + game_state *state, int dir, game_ui *ui, + float animtime, float flashtime) { int i, j; struct bbox bb = find_bbox(&state->params); @@ -1133,16 +1377,18 @@ void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, game_state *newstate; int square; - draw_rect(fe, 0, 0, (bb.r-bb.l+2) * GRID_SCALE, - (bb.d-bb.u+2) * GRID_SCALE, COL_BACKGROUND); + draw_rect(fe, 0, 0, (int)((bb.r-bb.l+2.0F) * GRID_SCALE), + (int)((bb.d-bb.u+2.0F) * GRID_SCALE), COL_BACKGROUND); - if (oldstate && oldstate->movecount > state->movecount) { + if (dir < 0) { game_state *t; /* * This is an Undo. So reverse the order of the states, and * run the roll timer backwards. */ + assert(oldstate); + t = oldstate; oldstate = state; state = t; @@ -1169,10 +1415,10 @@ void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, int coords[8]; for (j = 0; j < state->squares[i].npoints; j++) { - coords[2*j] = state->squares[i].points[2*j] - * GRID_SCALE + ds->ox; - coords[2*j+1] = state->squares[i].points[2*j+1] - * GRID_SCALE + ds->oy; + coords[2*j] = ((int)(state->squares[i].points[2*j] * GRID_SCALE) + + ds->ox); + coords[2*j+1] = ((int)(state->squares[i].points[2*j+1]*GRID_SCALE) + + ds->oy); } draw_polygon(fe, coords, state->squares[i].npoints, TRUE, @@ -1229,8 +1475,8 @@ void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, } for (j = 0; j < poly->order; j++) { - coords[j*2] = points[j*2] * GRID_SCALE + ds->ox; - coords[j*2+1] = points[j*2+1] * GRID_SCALE + ds->oy; + coords[j*2] = (int)floor(points[j*2] * GRID_SCALE) + ds->ox; + coords[j*2+1] = (int)floor(points[j*2+1] * GRID_SCALE) + ds->oy; } /* @@ -1263,11 +1509,71 @@ void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, } sfree(poly); - draw_update(fe, 0, 0, (bb.r-bb.l+2) * GRID_SCALE, - (bb.d-bb.u+2) * GRID_SCALE); + draw_update(fe, 0, 0, (int)((bb.r-bb.l+2.0F) * GRID_SCALE), + (int)((bb.d-bb.u+2.0F) * GRID_SCALE)); + + /* + * Update the status bar. + */ + { + char statusbuf[256]; + + sprintf(statusbuf, "%sMoves: %d", + (state->completed ? "COMPLETED! " : ""), + (state->completed ? state->completed : state->movecount)); + + status_bar(fe, statusbuf); + } } -float game_anim_length(game_state *oldstate, game_state *newstate) +static float game_anim_length(game_state *oldstate, + game_state *newstate, int dir) { return ROLLTIME; } + +static float game_flash_length(game_state *oldstate, + game_state *newstate, int dir) +{ + return 0.0F; +} + +static int game_wants_statusbar(void) +{ + return TRUE; +} + +#ifdef COMBINED +#define thegame cube +#endif + +const struct game thegame = { + "Cube", "games.cube", + default_params, + game_fetch_preset, + decode_params, + encode_params, + free_params, + dup_params, + TRUE, game_configure, custom_params, + validate_params, + new_game_seed, + game_free_aux_info, + validate_seed, + new_game, + dup_game, + free_game, + FALSE, solve_game, + FALSE, game_text_format, + new_ui, + free_ui, + make_move, + game_size, + game_colours, + game_new_drawstate, + game_free_drawstate, + game_redraw, + game_anim_length, + game_flash_length, + game_wants_statusbar, +};