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

hat:: fixed crashes when changing hat param with mouse, also works with embedded_plane now

Browse Source
This commit is contained in:
Zeno Rogue 2023-03-25 23:43:26 +01:00
parent d13c939ff6
commit f8b6b28c75
2 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
aperiodic-hat.cpp
View File

@ -408,9 +408,13 @@ struct hrmap_hat : hrmap {
hc.clear(); hc.clear();
hatcorners[1].clear(); hatcorners[1].clear();
bool f = geom3::flipped;
bool emb = embedded_plane;
if(emb) geom3::light_flip(true);
auto move = [&] (ld angle, ld dist) { auto move = [&] (ld angle, ld dist) {
hc.push_back(T * C0); hc.push_back(T * C0);
T = T * spin(angle * degree); T = T * cspin(0, 1, angle * degree);
T = T * xpush(dist); T = T * xpush(dist);
}; };
@ -470,6 +474,13 @@ struct hrmap_hat : hrmap {
for(auto& h: hatcorners[1]) h = T * h; for(auto& h: hatcorners[1]) h = T * h;
} }
if(emb) {
geom3::light_flip(f);
for(auto i:{0, 1}) for(auto& p: hatcorners[i]) {
println(hlog, p, " -> ", cgi.emb->base_to_actual(p));
p = cgi.emb->base_to_actual(p);
}
}
} }
constexpr static int relations = 34; constexpr static int relations = 34;
@ -586,14 +597,21 @@ struct hrmap_hat : hrmap {
hyperpoint vl = hatcorners[t0][d0]; hyperpoint vl = hatcorners[t0][d0];
hyperpoint vr = hatcorners[t0][(d0+1)%n]; hyperpoint vr = hatcorners[t0][(d0+1)%n];
hyperpoint vm = mid(vl, vr);
transmatrix rm = gpushxto0(vm);
hyperpoint xvl = hatcorners[t1][d1]; hyperpoint xvl = hatcorners[t1][d1];
hyperpoint xvr = hatcorners[t1][(d1+1)%n]; hyperpoint xvr = hatcorners[t1][(d1+1)%n];
hyperpoint xvm = mid(xvl, xvr);
bool emb = embedded_plane;
if(emb) {
vl = cgi.emb->actual_to_base(vl); vl[2] = 1;
vr = cgi.emb->actual_to_base(vr); vr[2] = 1;
xvl = cgi.emb->actual_to_base(xvl); xvl[2] = 1;
xvr = cgi.emb->actual_to_base(xvr); xvr[2] = 1;
geom3::light_flip(true);
}
hyperpoint vm = mid(vl, vr);
transmatrix rm = gpushxto0(vm);
hyperpoint xvm = mid(xvl, xvr);
transmatrix xrm = gpushxto0(xvm); transmatrix xrm = gpushxto0(xvm);
if(abs(hdist(vl, vr) - hdist(xvl, xvr)) > 1e-3) if(abs(hdist(vl, vr) - hdist(xvl, xvr)) > 1e-3)
@ -601,6 +619,10 @@ struct hrmap_hat : hrmap {
transmatrix T = rgpushxto0(vm) * rspintox(rm*vr) * spintox(xrm*xvl) * xrm; transmatrix T = rgpushxto0(vm) * rspintox(rm*vr) * spintox(xrm*xvl) * xrm;
if(emb) {
T = cgi.emb->base_to_actual(T);
geom3::light_flip(false);
}
return T; return T;
} }
@ -632,12 +654,12 @@ EX hrmap *new_map() { return new hrmap_hat; }
hrmap_hat* hat_map() { return dynamic_cast<hrmap_hat*>(currentmap); } hrmap_hat* hat_map() { return dynamic_cast<hrmap_hat*>(currentmap); }
EX bool pseudohept(cell *c) { EX bool pseudohept(cell *c) {
int id = hat_map()->hat_id(c); int id = get_hat_id(c);
return id == 0 || id == 6; return id == 0 || id == 6;
} }
EX int get_hat_id(cell *c) { EX int get_hat_id(cell *c) {
return hat_map()->hat_id(c); return FPIU(hat_map())->hat_id(c);
} }
EX void reshape() { EX void reshape() {
@ -662,6 +684,8 @@ EX color_t hatcolor(cell *c, int mode) {
return col; return col;
} }
auto hooksw = addHook(hooks_swapdim, 100, [] { auto h = hat_map(); if(h) h->init(); });
}} }}

2
geom-exp.cpp
View File

@ -542,7 +542,7 @@ EX string geometry_name(eGeometryClass gc) {
} }
EX string geometry_name() { EX string geometry_name() {
if(cgi.emb->is_same_in_same()) if(cgi.emb && cgi.emb->is_same_in_same())
return geometry_name(geom3::mgclass()); return geometry_name(geom3::mgclass());
else if(embedded_plane && gproduct) else if(embedded_plane && gproduct)
return geometry_name(geom3::mgclass()) + " (x E)"; return geometry_name(geom3::mgclass()) + " (x E)";