mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-14 19:25:48 +00:00
Code Issues Releases Wiki Activity

fixes to product radar

Browse Source
This commit is contained in:
Zeno Rogue 2022-12-18 00:31:41 +01:00
parent 9dee000a6a
commit 09ae23b310
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
radar.cpp
View File

@ -35,10 +35,10 @@ pair<bool, hyperpoint> makeradar(shiftpoint h) {
h1[3] = h1[2]; h1[2] = 0; h1[3] = h1[2]; h1[2] = 0;
// h1 = current_display->radar_transform * h1; // h1 = current_display->radar_transform * h1;
} }
for(int a=0; a<3; a++) h1[a] = h1[a] / (1 + h1[3]); for(int a=0; a<LDIM; a++) h1[a] = h1[a] / (1 + h1[LDIM]);
} }
else if(msphere) { else if(msphere) {
if(geom3::same_in_same()) h1[2] = h1[3]; if(geom3::same_in_same()) h1[2] = h1[LDIM];
if(geom3::sph_in_hyp()) h1 /= sinh(1); if(geom3::sph_in_hyp()) h1 /= sinh(1);
} }
else { else {
@ -107,9 +107,9 @@ EX void draw_radar(bool cornermode) {
if(subscreens::split([=] () { calcparam(); draw_radar(false); })) return; if(subscreens::split([=] () { calcparam(); draw_radar(false); })) return;
if(dual::split([] { dual::in_subscreen([] { calcparam(); draw_radar(false); }); })) return; if(dual::split([] { dual::in_subscreen([] { calcparam(); draw_radar(false); }); })) return;
bool d3 = WDIM == 3; bool d3 = WDIM == 3;
bool hyp = hyperbolic; bool hyp = mhyperbolic;
bool sph = sphere; bool sph = msphere;
bool scompass = nonisotropic && !mhybrid; bool scompass = nonisotropic && !mhybrid && !embedded_plane;
dynamicval<eGeometry> g(geometry, gEuclid); dynamicval<eGeometry> g(geometry, gEuclid);
dynamicval<eModel> pm(pmodel, mdDisk); dynamicval<eModel> pm(pmodel, mdDisk);
@ -178,7 +178,7 @@ EX void draw_radar(bool cornermode) {
if(sph) if(sph)
return point3(cx + (rad-10) * h[0], cy + (rad-10) * h[2] * si + (rad-10) * h[1] * co, +h[1] * si > h[2] * co ? 8 : 16); return point3(cx + (rad-10) * h[0], cy + (rad-10) * h[2] * si + (rad-10) * h[1] * co, +h[1] * si > h[2] * co ? 8 : 16);
else if(hyp) else if(hyp)
return point3(cx + rad * h[0], cy + rad * h[1], 1/(1+h[3]) * cgi.scalefactor * current_display->radius / (inHighQual ? 10 : 6)); return point3(cx + rad * h[0], cy + rad * h[1], 1/(1+h[LDIM]) * cgi.scalefactor * current_display->radius / (inHighQual ? 10 : 6));
else else
return point3(cx + rad * h[0], cy + rad * h[1], rad * cgi.scalefactor / (vid.radarrange + cgi.scalefactor/4) * 0.8); return point3(cx + rad * h[0], cy + rad * h[1], rad * cgi.scalefactor / (vid.radarrange + cgi.scalefactor/4) * 0.8);
}; };