mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-09-18 17:59:38 +00:00
Code Issues Releases Wiki Activity

underlying_as_pc parameter, and fixed some bugs with draw underlying in product space

Browse Source
This commit is contained in:
Zeno Rogue 2024-06-10 01:30:25 +02:00
parent bb14c55997
commit f5b5dbb3d3
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.cpp
View File

@ -1599,6 +1599,8 @@ EX void initConfig() {
param_i(s2xe::qrings, "s2xe-rings");
param_f(rots::underlying_scale, "rots-underlying-scale");
param_b(rots::underlying_as_pc, "underlying_as_pc")
-> editable("draw PC on the underlying map", 'P');
param_b(vid.bubbles_special, "bubbles-special", 1);
param_b(vid.bubbles_threshold, "bubbles-threshold", 1);

20
nonisotropic.cpp
View File

@ -2305,6 +2305,7 @@ EX namespace rots {
}
EX bool drawing_underlying = false;
EX bool underlying_as_pc = true;
EX void draw_underlying(bool cornermode) {
if(underlying_scale <= 0) return;
@ -2314,6 +2315,7 @@ EX namespace rots {
if(det(T) < 0) T = centralsym * T;
ld orig_d = d;
if(mproduct) d = 0;
hyperpoint h = inverse(View * spin(master_to_c7_angle()) * T) * C0;
@ -2322,12 +2324,23 @@ EX namespace rots {
auto g0 = std::move(gmatrix0);
ld alpha = atan2(ortho_inverse(NLP) * point3(1, 0, 0));
dynamicval<transmatrix> dn(NLP);
dynamicval<transmatrix> dv(View);
bool inprod = mproduct;
transmatrix pView = View;
if(inprod) {
pView = spin(alpha) * View;
ld z = zlevel(tC0(View));
/* special case when we are actually in E2xE as a rotation space */
if(in_e2xe() && abs(cgi.plevel * hybrid::csteps - TAU) < 1e-6) alpha = orig_d - z;
println(hlog, "depth = ", cgi.plevel * hybrid::csteps, " orig_d = ", orig_d, " z = ", z);
pView = spin(alpha) * View;
for(int a=0; a<3; a++) pView[a] *= exp(-z);
}
@ -2358,14 +2371,15 @@ EX namespace rots {
reset_projection(); current_display->set_all(0, 0);
ptds.clear();
drawthemap();
if(underlying_as_pc) drawPlayer(moPlayer, centerover, shiftless(spin90()), 0xFFFFFFFF, 0);
drawqueue();
displaychr(current_display->xcenter, current_display->ycenter, 0, 24 * mapfontscale / 100, '+', 0xFFFFFFFF);
if(!underlying_as_pc) displaychr(current_display->xcenter, current_display->ycenter, 0, 24 * mapfontscale / 100, '+', 0xFFFFFFFF);
glflush();
});
gmatrix = std::move(g);
gmatrix0 = std::move(g0);
calcparam();
reset_projection(); current_display->set_all(0, 0);
reset_projection(); current_display->set_all(0, 0); make_actual_view();
}
/** @brief exponential function for both slr and Berger sphere */