aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--spectre-internal.h2
-rw-r--r--spectre.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/spectre-internal.h b/spectre-internal.h
index bbb2561..e43d30b 100644
--- a/spectre-internal.h
+++ b/spectre-internal.h
@@ -243,7 +243,7 @@ void spectrectx_step_hex(SpectreContext *ctx, SpectreCoords *sc,
* delivering both plane and combinatorial coordinates as they go */
Spectre *spectre_initial(SpectreContext *ctx);
Spectre *spectre_adjacent(SpectreContext *ctx, const Spectre *src_spec,
- unsigned src_edge);
+ unsigned src_edge, unsigned *dst_edge);
/* For extracting the point coordinates */
typedef struct Coord {
diff --git a/spectre.c b/spectre.c
index 2ad32ff..ba72304 100644
--- a/spectre.c
+++ b/spectre.c
@@ -154,7 +154,7 @@ Spectre *spectre_initial(SpectreContext *ctx)
}
Spectre *spectre_adjacent(SpectreContext *ctx, const Spectre *src_spec,
- unsigned src_edge)
+ unsigned src_edge, unsigned *dst_edge_out)
{
unsigned dst_edge;
Spectre *dst_spec = snew(Spectre);
@@ -162,6 +162,8 @@ Spectre *spectre_adjacent(SpectreContext *ctx, const Spectre *src_spec,
spectrectx_step(ctx, dst_spec->sc, src_edge, &dst_edge);
spectre_place(dst_spec, src_spec->vertices[(src_edge+1) % 14],
src_spec->vertices[src_edge], dst_edge);
+ if (dst_edge_out)
+ *dst_edge_out = dst_edge;
return dst_spec;
}
@@ -454,7 +456,7 @@ void spectrectx_generate(SpectreContext *ctx,
for (edge = 0; edge < 14; edge++) {
Spectre *new_spec;
- new_spec = spectre_adjacent(ctx, spec, edge);
+ new_spec = spectre_adjacent(ctx, spec, edge, NULL);
if (find234(placed, new_spec, NULL)) {
spectre_free(new_spec);