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

mdPseudocylindrical flag

Browse Source
This commit is contained in:
Zeno Rogue 2019-08-14 15:28:55 +02:00
parent 7f967ba30d
commit 9e79872780
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drawing.cpp
View File

@ -711,7 +711,7 @@ void fixMercator(bool tinf) {
for(auto& g: glcoords) for(auto& g: glcoords)
models::apply_orientation(g[0], g[1]); models::apply_orientation(g[0], g[1]);
if(among(pmodel, mdSinusoidal, mdMollweide)) if(mdPseudocylindrical())
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]);
@ -768,7 +768,7 @@ void fixMercator(bool tinf) {
mercator_loop_min--, mincoord -= mercator_period; mercator_loop_min--, mincoord -= mercator_period;
while(maxcoord < cmax) while(maxcoord < cmax)
mercator_loop_max++, maxcoord += mercator_period; mercator_loop_max++, maxcoord += mercator_period;
if(among(pmodel, mdSinusoidal, mdMollweide)) if(mdPseudocylindrical())
for(int i = 0; i<isize(glcoords); i++) for(int i = 0; i<isize(glcoords); i++)
glcoords[i][mercator_coord] *= period_at(glcoords[i][1-mercator_coord]) / mercator_period; glcoords[i][mercator_coord] *= period_at(glcoords[i][1-mercator_coord]) / mercator_period;
if(!models::model_straight) if(!models::model_straight)
@ -798,7 +798,7 @@ void fixMercator(bool tinf) {
} }
minto += mercator_period; minto += mercator_period;
} }
if(among(pmodel, mdSinusoidal, mdMollweide)) if(mdPseudocylindrical())
for(int i = 0; i<isize(glcoords); i++) for(int i = 0; i<isize(glcoords); i++)
glcoords[i][mercator_coord] *= period_at(glcoords[i][1-mercator_coord]) / mercator_period; glcoords[i][mercator_coord] *= period_at(glcoords[i][1-mercator_coord]) / mercator_period;
@ -1107,7 +1107,7 @@ void dqi_poly::draw() {
if(l || lastl) { if(l || lastl) {
for(int i=0; i<isize(glcoords); i++) { for(int i=0; i<isize(glcoords); i++) {
if(among(pmodel, mdSinusoidal, mdMollweide)) { if(mdPseudocylindrical()) {
ld y = glcoords[i][1], x = glcoords[i][0]; ld y = glcoords[i][1], x = glcoords[i][0];
models::apply_orientation(x, y); models::apply_orientation(x, y);
mercator_period = period_at(y); mercator_period = period_at(y);

1
models.cpp
View File

@ -109,6 +109,7 @@ EX namespace polygonal {
#if HDR #if HDR
inline bool mdAzimuthalEqui() { return among(pmodel, mdEquidistant, mdEquiarea, mdEquivolume); } inline bool mdAzimuthalEqui() { return among(pmodel, mdEquidistant, mdEquiarea, mdEquivolume); }
inline bool mdBandAny() { return mdinf[pmodel].flags & mf::pseudoband; } inline bool mdBandAny() { return mdinf[pmodel].flags & mf::pseudoband; }
inline bool mdPseudocylindrical() { return mdBandAny() && !(mdinf[pmodel].flags & mf::cylindrical); }
#endif #endif
EX namespace models { EX namespace models {