1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-26 18:10:35 +00:00

embeddings:: fixed radar in hyp_in_solnih

This commit is contained in:
Zeno Rogue 2023-02-04 12:44:33 +01:00
parent a48f255c17
commit d4eb33cd71

View File

@ -829,10 +829,19 @@ struct emb_hyp_in_solnih : emb_actual {
return point31(0, -hy, hx); return point31(0, -hy, hx);
} }
transmatrix actual_to_base(const transmatrix& T) override { transmatrix actual_to_base(const transmatrix& T) override {
return Id; /* TBD actual computation */ hyperpoint h = T * C0;
auto f = geom3::flipped;
geom3::light_flip(true);
transmatrix b = parabolic1(h[1]) * xpush(h[2]);
geom3::light_flip(f);
return b;
} }
hyperpoint actual_to_base(hyperpoint h) override { hyperpoint actual_to_base(hyperpoint h) override {
return C02; /* TBD actual computation */ auto f = geom3::flipped;
geom3::light_flip(true);
hyperpoint b = parabolic1(h[1]) * xpush0(h[2]);
geom3::light_flip(f);
return b;
} }
transmatrix get_lsti() override { return cspin90(0, 1) * cspin90(1, 2) * cspin90(0, 1); } transmatrix get_lsti() override { return cspin90(0, 1) * cspin90(1, 2) * cspin90(0, 1); }
hyperpoint orthogonal_move(const hyperpoint& a, ld z) override { return nisot::translate(a) * cpush0(0, z); } hyperpoint orthogonal_move(const hyperpoint& a, ld z) override { return nisot::translate(a) * cpush0(0, z); }
@ -1033,8 +1042,11 @@ void embedding_method::set_radar_transform() {
rt = inverse(intermediate_to_actual_translation(l)) * inverse(U); rt = inverse(intermediate_to_actual_translation(l)) * inverse(U);
transmatrix T = View * intermediate_to_actual_translation(logical_to_intermediate * l0); transmatrix T = View * intermediate_to_actual_translation(logical_to_intermediate * l0);
if(gproduct) T = NLP * T; if(gproduct) T = NLP * T;
T = cspin(1, 0, geom3::euclid_embed_rotate * degree) * intermediate_to_logical_scaled * T * logical_scaled_to_intermediate; T = intermediate_to_logical_scaled * T * logical_scaled_to_intermediate;
if(cgi.emb->is_euc_in_noniso()) T = cspin(1, 0, geom3::euclid_embed_rotate * degree) * T;
if(cgi.emb->is_hyp_in_solnih()) T = T * MirrorY;
rtp = cspin(0, 1, atan2(T[0][1], T[0][0])); rtp = cspin(0, 1, atan2(T[0][1], T[0][0]));
if(cgi.emb->is_hyp_in_solnih()) rtp = MirrorX * cspin90(0, 1) * rtp;
} }
EX void swapmatrix(transmatrix& T) { EX void swapmatrix(transmatrix& T) {