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

cleanup of mercator_fix

Browse Source
This commit is contained in:
Zeno Rogue 2019-08-14 18:58:42 +02:00
parent 9d573ebd07
commit 2c073c1ec1
3 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drawing.cpp
View File

@ -718,8 +718,6 @@ void fixMercator(bool tinf) {
for(int i = 0; i<isize(glcoords); i++) for(int i = 0; i<isize(glcoords); i++)
glcoords[i][mercator_coord] *= mercator_period / period_at(glcoords[i][1-mercator_coord]); glcoords[i][mercator_coord] *= mercator_period / period_at(glcoords[i][1-mercator_coord]);
ld hperiod = mercator_period / 2;
mercator_coord = 0; mercator_coord = 0;
auto dist = [] (ld a, ld b) { return max(b, a-b); }; auto dist = [] (ld a, ld b) { return max(b, a-b); };
@ -737,10 +735,7 @@ void fixMercator(bool tinf) {
if(pmodel == mdBandEquiarea) if(pmodel == mdBandEquiarea)
dmin = -vid.stretch * current_display->radius / M_PI, dmax = vid.stretch * current_display->radius / M_PI; dmin = -vid.stretch * current_display->radius / M_PI, dmax = vid.stretch * current_display->radius / M_PI;
// for(int i = 0; i<isize(glcoords); i++) { glcoords[0][mercator_coord] -= round_nearest(glcoords[0][mercator_coord], mercator_period);
while(glcoords[0][mercator_coord] < hperiod) glcoords[0][mercator_coord] += mercator_period;
while(glcoords[0][mercator_coord] > hperiod) glcoords[0][mercator_coord] -= mercator_period;
// }
ld first = glcoords[0][mercator_coord]; ld first = glcoords[0][mercator_coord];
ld next = first; ld next = first;
@ -748,10 +743,7 @@ void fixMercator(bool tinf) {
ld mincoord = first, maxcoord = first; ld mincoord = first, maxcoord = first;
for(int i = 0; i<isize(glcoords); i++) { for(int i = 0; i<isize(glcoords); i++) {
while(glcoords[i][mercator_coord] < next - hperiod) glcoords[i][mercator_coord] -= round_nearest(glcoords[i][mercator_coord]-next, mercator_period);
glcoords[i][mercator_coord] += mercator_period;
while(glcoords[i][mercator_coord] > next + hperiod)
glcoords[i][mercator_coord] -= mercator_period;
next = glcoords[i][mercator_coord]; next = glcoords[i][mercator_coord];
mincoord = min<ld>(mincoord, glcoords[i][mercator_coord]); mincoord = min<ld>(mincoord, glcoords[i][mercator_coord]);
maxcoord = max<ld>(maxcoord, glcoords[i][mercator_coord]); maxcoord = max<ld>(maxcoord, glcoords[i][mercator_coord]);
@ -762,14 +754,12 @@ void fixMercator(bool tinf) {
return; return;
} }
ld last = first; ld last = first - round_nearest(first-next, mercator_period);
while(last < next - hperiod) last += mercator_period;
while(last > next + hperiod) last -= mercator_period;
if(first == last) { if(abs(first - last) < 1e-6) {
while(mincoord > cmin) while(mincoord > cmin && mercator_loop_min > -100)
mercator_loop_min--, mincoord -= mercator_period; mercator_loop_min--, mincoord -= mercator_period;
while(maxcoord < cmax) while(maxcoord < cmax && mercator_loop_max < +100)
mercator_loop_max++, maxcoord += mercator_period; mercator_loop_max++, maxcoord += mercator_period;
if(mdPseudocylindrical()) if(mdPseudocylindrical())
for(int i = 0; i<isize(glcoords); i++) for(int i = 0; i<isize(glcoords); i++)
@ -787,10 +777,11 @@ void fixMercator(bool tinf) {
reverse(glcoords.begin(), glcoords.end()); reverse(glcoords.begin(), glcoords.end());
swap(first, last); swap(first, last);
} }
while(maxcoord > cmin) { int steps = floor((maxcoord - cmin) / mercator_period);
for(int i=0; i<isize(glcoords); i++) glcoords[i][mercator_coord] -= mercator_period; if(steps) {
first -= mercator_period; last -= mercator_period; for(int i=0; i<isize(glcoords); i++) glcoords[i][mercator_coord] -= mercator_period * steps;
mincoord -= mercator_period; maxcoord -= mercator_period; first -= mercator_period * steps; last -= mercator_period * steps;
mincoord -= mercator_period * steps; maxcoord -= mercator_period * steps;
} }
int base = isize(glcoords); int base = isize(glcoords);
int minto = mincoord; int minto = mincoord;

2
hyper.h
View File

@ -316,6 +316,8 @@ struct videopar {
ld eye; ld eye;
bool auto_eye; bool auto_eye;
ld collignon_parameter; bool collignon_reflected;
}; };
extern videopar vid; extern videopar vid;

3
util.cpp
View File

@ -28,6 +28,9 @@ int SDL_GetTicks() {
EX long double sqr(long double x) { return x*x; } EX long double sqr(long double x) { return x*x; }
EX ld round_nearest(ld x) { if(x > 0) return int(x+.5); else return -int(.5-x); }
EX ld round_nearest(ld x, ld multiple_of) { return multiple_of * round_nearest(x / multiple_of); }
EX int gcd(int i, int j) { EX int gcd(int i, int j) {
return i ? gcd(j%i, i) : j; return i ? gcd(j%i, i) : j;
} }