mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-05-08 10:14:08 +00:00
Code Issues Releases Wiki Activity

rogueviz::fundamental:: now works with valences greater than 3

Browse Source
This commit is contained in:
Zeno Rogue 2025-02-23 20:54:23 +01:00
parent f694104a54
commit 3f2bb8f6bd
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
rogueviz/fundamental.cpp
View File

@ -59,6 +59,21 @@ shiftmatrix labelpos(shiftpoint h1, shiftpoint h2) {
ld widthfactor = 5; ld widthfactor = 5;
ld label_scale = 1; ld label_scale = 1;
bool single_edges = false;
bool fill_faces = true;
int group_count(cellwalker cw) {
if(is_connected(cw)) return 0;
auto cw1 = cw;
int groups = 0;
do {
if(!is_connected(cw1)) groups++;
cw1 = cw1 + wstep - 1;
}
while(cw1 != cw);
return groups;
}
void fundamental_marker() { void fundamental_marker() {
if(!funmode || !quotient) return; if(!funmode || !quotient) return;
same.clear(); same.clear();
@ -86,15 +101,15 @@ void fundamental_marker() {
} }
} }
while(true) { while(fill_faces) {
int f = face_edges; int f = face_edges;
for(int k=0; k<isize(cells); k++) { for(int k=0; k<isize(cells); k++) {
cell *c = cells[k]; cell *c = cells[k];
for(int i=0; i<c->type; i++) { for(int i=0; i<c->type; i++) {
cellwalker cw(c, i); cellwalker cw(c, i);
if(is_connected(cw) && is_connected(cw+1) && !is_connected(cw+wstep-1)) { if(group_count(cw) == 1) {
face_edges++; face_edges++;
be_connected(cw+wstep-1); be_connected(cw);
} }
} }
} }
@ -109,29 +124,33 @@ void fundamental_marker() {
cell *c = cells[k]; cell *c = cells[k];
for(int i=0; i<c->type; i++) { for(int i=0; i<c->type; i++) {
cellwalker cw0(c, i); cellwalker cw0(c, i);
if(!is_connected(cw0) && !is_connected(cw0+1) && !is_connected(cw0+wstep-1)) if(single_edges) {
corners++, cw = cw0; if(!is_connected(cw0)) corners++, cw = cw0;
}
else {
if(group_count(cw0) >= 3) corners++, cw = cw0;
}
} }
} }
if(!corners) return;
// printf("tree edges = %d, face edges = %d, corners = %d\n", tree_edges, face_edges, corners); // printf("tree edges = %d, face edges = %d, corners = %d\n", tree_edges, face_edges, corners);
vector<cellwalker> cornerlist; vector<cellwalker> cornerlist;
map<cellwalker, int> corner_id; map<cellwalker, int> corner_id;
for(int ci=0; ci<corners; ci++) { for(int ci=0; ci<corners; ci++) {
cellwalker cw0 = cw; corner_id[cw] = cornerlist.size();
corner_id[cw0] = cornerlist.size(); cornerlist.push_back(cw);
cornerlist.push_back(cw0);
while(true) { while(true) {
cw++; cw++;
if(is_connected(cw)) { while(is_connected(cw)) {
cw += wstep; cw += wstep;
cw++; cw++;
} }
if(!is_connected(cw+1) && !is_connected(cw+wstep-1)) if(single_edges || group_count(cw) >= 3) break;
break;
} }
} }
auto corners0 = corners; auto corners0 = corners;
@ -200,6 +219,7 @@ void fundamental_marker() {
auto cw = cornerlist[ci]; auto cw = cornerlist[ci];
cellwalker cw1 = (cw+1+wstep); cellwalker cw1 = (cw+1+wstep);
bool mirrored = false; bool mirrored = false;
while(is_connected(cw1)) cw1 = cw1 + 1 + wstep;
if(!corner_id.count(cw1)) cw1 = cw1 + wmirror - 1, mirrored = true; if(!corner_id.count(cw1)) cw1 = cw1 + wmirror - 1, mirrored = true;
if(!corner_id.count(cw1)) println(hlog, "still bad"); if(!corner_id.count(cw1)) println(hlog, "still bad");
auto ci1 = corner_id[cw1]; auto ci1 = corner_id[cw1];