mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-24 17:10:36 +00:00
Code Issues Releases Wiki Activity

refactored generate_subcells

Browse Source
This commit is contained in:
Zeno Rogue 2021-07-08 23:30:53 +02:00
parent 3d1be24558
commit 964d1010b3
1 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
reg3.cpp
View File

@ -281,36 +281,29 @@ EX namespace reg3 {
generate_subcells(); generate_subcells();
} }
EX void generate_subcells() { EX void generate_plain_subcubes() {
auto& ssh = cgi.subshapes; auto& ssh = cgi.subshapes;
const int sub = subcube_count; const int sub = subcube_count;
if(variation == eVariation::subcubes) { auto vx = abs(cgi.cellshape[0][0][0]);
auto vx = abs(cgi.cellshape[0][0][0]); auto vz = abs(cgi.cellshape[0][0][3]);
auto vz = abs(cgi.cellshape[0][0][3]); for(int x=1-sub; x<sub; x+=2)
for(int x=1-sub; x<sub; x+=2) for(int y=1-sub; y<sub; y+=2)
for(int y=1-sub; y<sub; y+=2) for(int z=1-sub; z<sub; z+=2) {
for(int z=1-sub; z<sub; z+=2) { ssh.emplace_back();
cgi.subshapes.emplace_back(); auto &ss = ssh.back();
auto &ss = cgi.subshapes.back(); ss.faces = cgi.cellshape;
ss.faces = cgi.cellshape; for(auto& face: ss.faces) for(auto& v: face) {
for(auto& face: ss.faces) for(auto& v: face) { v[0] += vx * x;
v[0] += vx * x; v[1] += vx * y;
v[1] += vx * y; v[2] += vx * z;
v[2] += vx * z; v[3] += vz * (sub-1);
v[3] += vz * (sub-1);
v = normalize(v);
}
ss.vertices_only = cgi.vertices_only;
for(auto& v: ss.vertices_only) {
v[0] += vx * x;
v[1] += vx * y;
v[2] += vx * z;
v[3] += vz * (sub-1);
}
} }
} }
else if(among(variation, eVariation::dual_subcubes, eVariation::bch)) { }
bool bch = variation == eVariation::bch;
EX void generate_special_subcubes(bool bch) {
const int sub = subcube_count;
if(1) {
auto vx = abs(cgi.cellshape[0][0][0]); auto vx = abs(cgi.cellshape[0][0][0]);
auto vz = abs(cgi.cellshape[0][0][3]); auto vz = abs(cgi.cellshape[0][0][3]);
auto step = hdist0(tC0(cgi.adjmoves[0])); auto step = hdist0(tC0(cgi.adjmoves[0]));
@ -498,16 +491,37 @@ EX namespace reg3 {
add_face({V*pt(-1,-.5,0), V*pt(-1,0,-.5), V*pt(-.5,0,-1), V*pt(0,-.5,-1), V*pt(0,-1,-.5), V*pt(-.5,-1,0)}); add_face({V*pt(-1,-.5,0), V*pt(-1,0,-.5), V*pt(-.5,0,-1), V*pt(0,-.5,-1), V*pt(0,-1,-.5), V*pt(-.5,-1,0)});
} }
} }
make_vertices_only(ss.vertices_only, ss.faces);
} }
println(hlog, "subcells generated = ", isize(ssh));
} }
else { }
cgi.subshapes.emplace_back();
cgi.subshapes[0].faces = cgi.cellshape; EX void generate_subcells() {
cgi.subshapes[0].vertices_only = cgi.vertices_only;
switch(variation) {
case eVariation::subcubes:
generate_plain_subcubes();
break;
case eVariation::dual_subcubes:
generate_special_subcubes(false);
break;
case eVariation::bch:
generate_special_subcubes(true);
break;
case eVariation::pure: {
cgi.subshapes.emplace_back();
cgi.subshapes[0].faces = cgi.cellshape;
break;
}
default:
throw hr_exception("unknown variation in generate_subcells");
} }
for(auto& ss: ssh) {
for(auto& ss: cgi.subshapes) {
make_vertices_only(ss.vertices_only, ss.faces);
hyperpoint gres = Hypc; hyperpoint gres = Hypc;
for(auto& face: ss.faces) { for(auto& face: ss.faces) {
hyperpoint res = Hypc; hyperpoint res = Hypc;
@ -523,6 +537,8 @@ EX namespace reg3 {
for(auto& face: ss.faces_local) for(auto& v: face) v = ss.from_cellcenter * v; for(auto& face: ss.faces_local) for(auto& v: face) v = ss.from_cellcenter * v;
for(auto& v: ss.vertices_only_local) v = ss.from_cellcenter * v; for(auto& v: ss.vertices_only_local) v = ss.from_cellcenter * v;
} }
println(hlog, "subcells generated = ", isize(cgi.subshapes));
} }
void binary_rebase(heptagon *h, const transmatrix& V) { void binary_rebase(heptagon *h, const transmatrix& V) {