chiark
/
gitweb
/
~ian
/
moebius2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prepare to generalise generator
[moebius2.git]
/
mgraph.c
diff --git
a/mgraph.c
b/mgraph.c
index 19bb4ba2afbbafaa803e328e7e93d848a1ca1494..23a10e352ffa69bc91f9a4c9185fd911e90dbfd1 100644
(file)
--- a/
mgraph.c
+++ b/
mgraph.c
@@
-4,35
+4,23
@@
#include "mgraph.h"
#include "mgraph.h"
-static const unsigned dx[V6]= { +1, +1, 0, -1, -1, 0 },
- dy[V6]= { 0, +Y1, +Y1, 0, -Y1, -Y1 };
+static const unsigned dx[2][V6]= {{ +1, 0, -1, -1, -1, 0 },
+ { +1, +1, 0, -1, 0, +1 }},
+ dy[V6]= { 0, -Y1, -Y1, 0, +Y1, +Y1 };
int edge_end2(unsigned v1, int e) {
int edge_end2(unsigned v1, int e) {
- /* The topology is equivalent to that of a square lattice with only
- * half of the diagonals. Ie, the result of shearing the triangular
- * lattice to make the lines of constant x vertical. This gives
- * these six directions:
- *
- * 2 1
- * | /
- * |/
- * 3--*--0
- * /|
- * / |
- * 4 5
- *
- * This also handily makes vertical the numbering discontinuity,
- * where the join happens.
- */
unsigned x, y;
y= (v1 & YMASK) + dy[e];
unsigned x, y;
y= (v1 & YMASK) + dy[e];
- if (y
& ~YMASK
) return -1;
+ if (y
>= Y*Y1
) return -1;
- x= (v1 & XMASK) + dx[e];
+ x= (v1 & XMASK) + dx[
(v1 >> YSHIFT) & 1][
e];
if (x & ~XMASK) {
if (x & ~XMASK) {
+ //int orgy= y;
y= (Y-1)*Y1 - y;
x &= XMASK;;
y= (Y-1)*Y1 - y;
x &= XMASK;;
+ //printf("%40s %02x -%d-> %02x (was %02x) \n", "", v1, e, x|y, x|orgy);
}
}
+
return x | y;
}
return x | y;
}