split buildHeptagon to buildHeptagon1 and rest

This commit is contained in:
Zeno Rogue 2018-08-18 17:43:54 +02:00
parent c6496de645
commit 6ebd8ab9da
3 changed files with 8 additions and 4 deletions

View File

@ -77,7 +77,7 @@ namespace binary {
}
heptagon *build(heptagon *parent, int d, int d1, int t, int side, int delta) {
auto h = buildHeptagon(parent, d, hsOrigin, d1);
auto h = buildHeptagon1(new heptagon, parent, d, hsOrigin, d1);
h->distance = parent->distance + delta;
h->c7 = newCell(t, h);
h->cdata = NULL;

View File

@ -66,13 +66,17 @@ template<class... T> auto iprintf(T... t) { for(int i=0; i<indent; i++) putchar(
#define COMPUTE -1000000
// create a new heptagon
heptagon *buildHeptagon(heptagon *parent, int d, hstate s, int pard = 0, int fixdistance = COMPUTE) {
heptagon *h = new heptagon;
heptagon *buildHeptagon1(heptagon *h, heptagon *parent, int d, hstate s, int pard = 0, int fixdistance = COMPUTE) {
h->alt = NULL;
h->s = s;
h->c.clear();
h->c.connect(pard, parent, d, false);
h->cdata = NULL;
return h;
}
heptagon *buildHeptagon(heptagon *parent, int d, hstate s, int pard = 0, int fixdistance = COMPUTE) {
heptagon *h = buildHeptagon1(new heptagon, parent, d, s, pard, fixdistance);
if(binarytiling || syntetic) return h;
if(parent->c7) {
if(irr::on)

View File

@ -289,7 +289,7 @@ void debug(heptagon *h) {
heptagon *build_child(heptagon *parent, int d, int id, int pindex) {
indenter ind;
auto h = buildHeptagon(parent, d, hstate(1), 0);
auto h = buildHeptagon1(new heptagon, parent, d, hstate(1), 0);
id_of(h) = id;
parent_index_of(h) = pindex;
int nei = neighbors_of(h);