chiark
/
gitweb
/
~ian
/
moebius2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SGT's model
[moebius2.git]
/
mgraph.h
diff --git
a/mgraph.h
b/mgraph.h
index 46383677d2ec6c153e799d5936329529d3e75de2..85577e92c3e325b79ba5a2a3a2762b3f2b4bc740 100644
(file)
--- a/
mgraph.h
+++ b/
mgraph.h
@@
-52,6
+52,8
@@
#ifndef MGRAPH_H
#define MGRAPH_H
#ifndef MGRAPH_H
#define MGRAPH_H
+#include "common.h"
+
#define XBITS 4
#define X (1<<XBITS)
#define YBITS 4
#define XBITS 4
#define X (1<<XBITS)
#define YBITS 4
@@
-65,7
+67,7
@@
#define XMASK (X-1)
#define YSHIFT XBITS
#define Y1 (1 << YSHIFT)
#define XMASK (X-1)
#define YSHIFT XBITS
#define Y1 (1 << YSHIFT)
-#define YMASK (
Y-1
<< YSHIFT)
+#define YMASK (
(Y-1)
<< YSHIFT)
#define V6 6
#define V6 6
@@
-85,7
+87,7
@@
extern int edge_end2(unsigned v1, int e);
FOR_VPEDGE((v1),(e)) \
if (((v2)= EDGE_END2((v1),(e)), \
(init), \
FOR_VPEDGE((v1),(e)) \
if (((v2)= EDGE_END2((v1),(e)), \
(init), \
- (v2)) < 0) { otherwise } else
+ (v2)) < 0) { otherwise
;
} else
#define NOTHING ((void)0)
#define NOTHING ((void)0)
@@
-96,11
+98,6
@@
extern int edge_end2(unsigned v1, int e);
FOR_VERTEX((v1)) \
FOR_VEDGE((v1),(e),(v2))
FOR_VERTEX((v1)) \
FOR_VEDGE((v1),(e),(v2))
-#define FOR_COORD(k) \
- for ((k)=0; (k)<D3; (k)++)
-
-#define K FOR_COORD(k)
-
#define FOR_RIM_VERTEX(vy,vx,v) \
for ((vy)=0; (vy)<Y; (vy)+=Y-1) \
for ((vx)=0; (v)= (vy)<<YSHIFT | (vx), (vx)<X; (vx)++)
#define FOR_RIM_VERTEX(vy,vx,v) \
for ((vy)=0; (vy)<Y; (vy)+=Y-1) \
for ((vx)=0; (v)= (vy)<<YSHIFT | (vx), (vx)<X; (vx)++)