mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Great Walls in bch

This commit is contained in:
Zeno Rogue 2021-07-11 15:07:40 +02:00
parent 53efc30bd5
commit e9de3ac7d5
5 changed files with 117 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
barriers.cpp
View File

@ -748,6 +748,20 @@ EX void buildCrossroads2(cell *c) {
EX bool bufferzone() { return PURE && S7 == 6; }
EX int basic_tests() { return 50; }
EX bool valid_dir(const vector<char>& ad, int j, cell *c) {
bool bch = variation == eVariation::bch;
if(!bch) return ad[j] == 1;
if(ad[j] != 2) return false;
auto ad1 = currentmap->dirdist(c, j);
int a = 0;
for(auto& dd: ad1) if(dd == 1) a++;
int a0 = 0;
for(auto& dd: ad) if(dd == 1) a0++;
return a < 6;
}
EX void extend3D(cell *c) {
eLand l1 = c->land;
c->barleft = NOWALLSEP_USED;
@ -768,8 +782,27 @@ EX void extend3D(cell *c) {
cw1.at->bardir = cw1.spin;
}
auto& ad = currentmap->adjacent_dirs(cw);
for(int j=0; j<cw.at->type; j++) if(ad[j]) {
bool bch = variation == eVariation::bch;
auto& ad = currentmap->dirdist(cw);
for(int j=0; j<cw.at->type; j++) {
if(!valid_dir(ad, j, cw.at)) {
if(bch && ad[j] == 1) {
cell *c1 = cw.at->cmove(j);
c1->bardir = NOBARRIERS;
setland(c1, c->barright);
}
if(bch && ad[j] == 2) {
cell *c1 = cw.at->cmove(j);
c1->bardir = NOBARRIERS;
setland(c1, l1);
}
continue;
}
cellwalker bb2 = currentmap->strafe(cw, j);
if(bufferzone()) { bb2 += rev; bb2 += wstep; }
@ -788,10 +821,20 @@ bool built = false;
EX bool buildBarrier3D(cell *c, eLand l2, int forced_dir) {
if(forced_dir == NODIR) {
for(int t=0; t<S7; t++) if((!c->move(t) || c->move(t)->mpdist > c->mpdist) && buildBarrier3D(c, l2, t)) return true;
for(int t=0; t<c->type; t++) if((!c->move(t) || c->move(t)->mpdist > c->mpdist) && buildBarrier3D(c, l2, t)) return true;
return false;
}
bool bch = variation == eVariation::bch;
cellwalker cw(c, forced_dir);
if(bch) {
auto& ad = currentmap->dirdist(cw);
int a = 0;
for(auto& dd: ad) if(dd == 1) a++;
if(a == 6) return false;
}
if(bufferzone()) { cw += wstep; cw += rev; }
set<cell*> listed_cells = { cw.at };
vector<cellwalker> to_test { cw };
@ -804,15 +847,15 @@ EX bool buildBarrier3D(cell *c, eLand l2, int forced_dir) {
if(bufferzone() && (bb+rev).cpeek()->mpdist < BARLEV) return false;
if(bufferzone() && (bb+rev).cpeek()->bardir != NODIR) return false;
if(bb.at->bardir != NODIR) return false;
auto& ad = currentmap->adjacent_dirs(bb);
auto& ad = currentmap->dirdist(bb);
for(int j=0; j<bb.at->type; j++) {
if(i < tc) bb.at->cmove(j);
if(ad[j] && bb.at->move(j)) {
cellwalker bb2 = currentmap->strafe(bb, j);
if(listed_cells.count(bb2.at)) continue;
listed_cells.insert(bb2.at);
to_test.push_back(bb2);
}
if(!bb.at->move(j)) continue;
if(!valid_dir(ad, j, bb.at)) continue;
cellwalker bb2 = currentmap->strafe(bb, j);
if(listed_cells.count(bb2.at)) continue;
listed_cells.insert(bb2.at);
to_test.push_back(bb2);
}
}

4
cell.cpp
View File

@ -77,12 +77,12 @@ struct hrmap {
}
/** \brief in 3D honeycombs, returns a vector<bool> v, where v[j] iff faces i and j are adjacent */
virtual const vector<bool>& adjacent_dirs(cell *c, int i) { throw hr_exception("adjacent_dirs called unexpectedly"); }
virtual const vector<char>& dirdist(cell *c, int i) { throw hr_exception("dirdist called unexpectedly"); }
/** \brief in 3D honeycombs, returns a cellwalker res at cw->move(j) such that the face pointed at by cw and res share an edge */
virtual cellwalker strafe(cellwalker cw, int j) { throw hr_exception("strafe called unexpectedly"); }
const vector<bool>& adjacent_dirs(cellwalker cw) { return adjacent_dirs(cw.at, cw.spin); }
const vector<char>& dirdist(cellwalker cw) { return dirdist(cw.at, cw.spin); }
};
/** hrmaps which are based on regular non-Euclidean 2D tilings, possibly quotient

4
geometry.cpp
View File

@ -105,7 +105,7 @@ struct subcellshape {
vector<hyperpoint> vertices_only;
vector<hyperpoint> vertices_only_local;
vector<hyperpoint> face_centers;
vector<vector<bool>> dirs_adjacent;
vector<vector<char>> dirdist;
hyperpoint cellcenter;
transmatrix to_cellcenter;
transmatrix from_cellcenter;
@ -152,7 +152,7 @@ struct geometry_information {
ld adjcheck;
ld strafedist;
vector<vector<bool>> dirs_adjacent;
vector<vector<char>> dirdist;
ld ultra_mirror_dist, ultra_material_part, ultra_mirror_part;

75
reg3.cpp
View File

@ -122,7 +122,7 @@ EX namespace reg3 {
auto& spins = cgi.spins;
auto& cellshape = cgi.cellshape;
auto& adjcheck = cgi.adjcheck;
auto& dirs_adjacent = cgi.dirs_adjacent;
auto& dirdist = cgi.dirdist;
int& mid = cgi.schmid;
mid = 3;
@ -256,14 +256,18 @@ EX namespace reg3 {
adjcheck = hdist(tC0(cgi.adjmoves[0]), tC0(cgi.adjmoves[1])) * 1.0001;
int numedges = 0;
dirs_adjacent.resize(S7);
dirdist.resize(S7);
for(int a=0; a<S7; a++) {
dirs_adjacent[a].resize(S7);
dirdist[a].resize(S7);
for(int b=0; b<S7; b++) {
dirs_adjacent[a][b] = a != b && hdist(tC0(cgi.adjmoves[a]), tC0(cgi.adjmoves[b])) < adjcheck;
if(dirs_adjacent[a][b]) numedges++;
dirdist[a][b] =
a == b ? 0 :
hdist(tC0(cgi.adjmoves[a]), tC0(cgi.adjmoves[b])) < adjcheck ? 1 :
INFD;
if(dirdist[a][b] == 1) numedges++;
}
}
floyd_warshall(dirdist);
DEBB(DF_GEOM, ("numedges = ", numedges));
if(loop == 4) cgi.strafedist = adjcheck;
@ -281,9 +285,9 @@ EX namespace reg3 {
for(int a=0; a<S7; a++)
for(int b=0; b<S7; b++)
if(cgi.dirs_adjacent[a][b])
if(cgi.dirdist[a][b] == 1)
for(int c=0; c<S7; c++)
if(cgi.dirs_adjacent[a][c] && cgi.dirs_adjacent[b][c]) {
if(cgi.dirdist[a][c] == 1 && cgi.dirdist[b][c] == 1) {
transmatrix t = build_matrix(tC0(cgi.adjmoves[a]), tC0(cgi.adjmoves[b]), tC0(cgi.adjmoves[c]), C0);
if(det(t) > 1e-3) cgi.next_dir[a][b] = c;
}
@ -618,18 +622,19 @@ EX namespace reg3 {
for(auto& v: ss.vertices_only_local) v = ss.from_cellcenter * v;
int N = isize(ss.faces);
ss.dirs_adjacent.resize(N);
ss.dirdist.resize(N);
for(int i=0; i<N; i++) {
auto& da = ss.dirs_adjacent[i];
auto& da = ss.dirdist[i];
da.resize(N, false);
set<unsigned> cface;
for(auto& v: ss.faces[i]) cface.insert(bucketer(v));
for(int j=0; j<N; j++) {
int mutual = 0;
for(auto& w: ss.faces[j]) if(cface.count(bucketer(w))) mutual++;
da[j] = mutual == 2;
da[j] = i == j ? 0 : mutual == 2 ? 1 : INFD;
}
}
floyd_warshall(ss.dirdist);
}
println(hlog, "subcells generated = ", isize(cgi.subshapes));
@ -693,9 +698,9 @@ EX namespace reg3 {
virtual transmatrix ray_iadj(cell *c, int i) override;
const vector<bool>& adjacent_dirs(cell *c, int i) {
const vector<char>& dirdist(cell *c, int i) {
int id = local_id.at(c).second;
return cgi.subshapes[id].dirs_adjacent[i];
return cgi.subshapes[id].dirdist[i];
}
cellwalker strafe(cellwalker cw, int j) override {
@ -877,7 +882,7 @@ EX namespace reg3 {
for(int i1=0; i1<c->type; i1++) {
set<unsigned> facevertices;
for(auto v: ss[id].faces[i1]) facevertices.insert(bucketer(v));
if(ss[id].dirs_adjacent[i][i1]) {
if(ss[id].dirdist[i][i1] == 1) {
int found_strafe = 0;
for(int j1=0; j1<c1->type; j1++) if(j1 != j) {
int num = 0;
@ -889,6 +894,32 @@ EX namespace reg3 {
if(found_strafe != 1) println(hlog, "found_strafe = ", found_strafe);
}
}
/* for bch, also provide second-order strafe */
if(variation == eVariation::bch) for(int i1=0; i1<c->type; i1++) {
if(ss[id].dirdist[i][i1] != 2) continue;
if(isize(ss[id].faces[i]) == 6) continue;
if(isize(ss[id].faces[i1]) == 6) continue;
vector<int> fac;
for(int i2=0; i2<c->type; i2++) if(ss[id].dirdist[i][i2] == 1 && ss[id].dirdist[i2][i1] == 1)
fac.push_back(sd[i2]);
if(isize(fac) != 2) {
println(hlog, "fac= ", fac);
exit(1);
}
int found_strafe = 0;
for(int j1=0; j1<c1->type; j1++) if(j1 != j)
if(ss[id1].dirdist[j1][fac[0]] == 1)
if(ss[id1].dirdist[j1][fac[1]] == 1) {
sd[i1] = j1;
if(isize(ss[id1].faces[j1]) == 6) {
println(hlog, "id1 is 6");
exit(1);
}
found_strafe++;
}
if(found_strafe != 1) println(hlog, "found_strafe = ", found_strafe, " (second order)");
}
}
foundtab_ids.emplace_back(va.h_id, id1, j);
found++;
@ -1000,7 +1031,7 @@ EX namespace reg3 {
if(plane.count(cw)) return;
plane.insert(cw);
for(int i=0; i<S7; i++)
if(cgi.dirs_adjacent[i][cw.spin])
if(cgi.dirdist[i][cw.spin] == 1)
make_plane(strafe(cw, i));
}
@ -1101,9 +1132,9 @@ EX namespace reg3 {
// start_game();
for(int a=0; a<12; a++)
for(int b=0; b<12; b++)
if(cgi.dirs_adjacent[a][b])
if(cgi.dirdist[a][b] == 1)
for(int c=0; c<12; c++)
if(cgi.dirs_adjacent[a][c] && cgi.dirs_adjacent[b][c]) {
if(cgi.dirdist[a][c] == 1 && cgi.dirdist[b][c] == 1) {
transmatrix t = build_matrix(tC0(cgi.adjmoves[a]), tC0(cgi.adjmoves[b]), tC0(cgi.adjmoves[c]), C0);
if(det(t) > 0) cgi.next_dir[a][b] = c;
}
@ -1111,7 +1142,7 @@ EX namespace reg3 {
set<coord> boundaries;
for(int a=0; a<12; a++)
for(int b=0; b<12; b++) if(cgi.dirs_adjacent[a][b]) {
for(int b=0; b<12; b++) if(cgi.dirdist[a][b] == 1) {
coord res = crystal::c0;
int sa = a, sb = b;
do {
@ -1490,8 +1521,8 @@ EX namespace reg3 {
return cgi.vertices_only;
}
const vector<bool>& adjacent_dirs(cell *c, int i) {
return cgi.dirs_adjacent[i];
const vector<char>& dirdist(cell *c, int i) {
return cgi.dirdist[i];
}
cellwalker strafe(cellwalker cw, int j) override {
@ -1970,10 +2001,10 @@ EX namespace reg3 {
return quotient_map->ray_iadj(quotient_map->acells[aid], i);
}
const vector<bool>& adjacent_dirs(cell *c, int i) {
if(PURE) return cgi.dirs_adjacent[i];
const vector<char>& dirdist(cell *c, int i) {
if(PURE) return cgi.dirdist[i];
int aid = cell_id.at(c);
return quotient_map->adjacent_dirs(quotient_map->acells[aid], i);
return quotient_map->dirdist(quotient_map->acells[aid], i);
}
cellwalker strafe(cellwalker cw, int j) override {

7
util.cpp
View File

@ -739,4 +739,11 @@ EX void open_wiki(const char *title) {
open_url(url);
}
EX void floyd_warshall(vector<vector<char>>& v) {
int N = isize(v);
for(int k=0; k<N; k++)
for(int i=0; i<N; i++)
for(int j=0; j<N; j++)
v[i][j] = min<int>(v[i][j], v[i][k] + v[k][j]);
}
}