mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-11 18:00:34 +00:00
Code Issues Releases Wiki Activity

fixed Mercator with textures and NANs

Browse Source
This commit is contained in:
Zeno Rogue 2017-12-21 17:07:21 +01:00
parent d5bca73757
commit d32232d9cb
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
polygons.cpp
View File

@ -439,8 +439,8 @@ double linewidthat(const hyperpoint& h, double minwidth) {
int mercator_coord; int mercator_coord;
int mercator_loop_min = 0, mercator_loop_max = 0; int mercator_loop_min = 0, mercator_loop_max = 0;
void fixMercator() { void fixMercator(bool tinf) {
ld period = 4 * vid.radius; ld period = 4 * vid.radius;
ld hperiod = period / 2; ld hperiod = period / 2;
@ -469,10 +469,15 @@ void fixMercator() {
maxcoord = max<ld>(maxcoord, glcoords[i][mercator_coord]); maxcoord = max<ld>(maxcoord, glcoords[i][mercator_coord]);
} }
if(abs(mincoord) > 50000 || abs(maxcoord) > 50000 || isnan(mincoord) || isnan(maxcoord)) {
mercator_loop_max--;
return;
}
ld last = first; ld last = first;
while(last < next - hperiod) last += period; while(last < next - hperiod) last += period;
while(last > next + hperiod) last -= period; while(last > next + hperiod) last -= period;
if(first == last) { if(first == last) {
while(mincoord > cmin) while(mincoord > cmin)
mercator_loop_min--, mincoord -= period; mercator_loop_min--, mincoord -= period;
@ -480,6 +485,10 @@ void fixMercator() {
mercator_loop_max++, maxcoord += period; mercator_loop_max++, maxcoord += period;
} }
else { else {
if(tinf) {
// this cannot work in Mercator
mercator_loop_max--; return;
}
if(last < first) { if(last < first) {
reverse(glcoords, glcoords+qglcoords); reverse(glcoords, glcoords+qglcoords);
swap(first, last); swap(first, last);
@ -572,7 +581,7 @@ void drawpolyline(polytodraw& p) {
mercator_loop_min = mercator_loop_max = 0; mercator_loop_min = mercator_loop_max = 0;
if(sphere && pmodel == mdBand) if(sphere && pmodel == mdBand)
fixMercator(); fixMercator(pp.tinf);
int poly_limit = max(vid.xres, vid.yres) * 2; int poly_limit = max(vid.xres, vid.yres) * 2;
@ -609,7 +618,6 @@ void drawpolyline(polytodraw& p) {
for(int l=mercator_loop_min; l <= mercator_loop_max; l++) { for(int l=mercator_loop_min; l <= mercator_loop_max; l++) {
if(l || lastl) { if(l || lastl) {
if(pp.tinf) return;
for(int i=0; i<qglcoords; i++) for(int i=0; i<qglcoords; i++)
glcoords[i][mercator_coord] += vid.radius * 4 * (l - lastl); glcoords[i][mercator_coord] += vid.radius * 4 * (l - lastl);
lastl = l; lastl = l;