mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

refactored mdEqui

This commit is contained in:
Zeno Rogue 2017-11-13 11:26:21 +01:00
parent 19f12e3068
commit a19d4d568b
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conformal.cpp
View File

@ -637,7 +637,7 @@ namespace conformal {
switchagain: { switchagain: {
pmodel = eModel((pmodel + (shiftmul > 0 ? 1 : -1) + MODELCOUNT) % MODELCOUNT); pmodel = eModel((pmodel + (shiftmul > 0 ? 1 : -1) + MODELCOUNT) % MODELCOUNT);
if(pmodel != mdEquidistant && pmodel != mdDisk && pmodel != mdEquiarea && pmodel != mdPolynomial && pmodel != mdHyperboloid) { if(!mdEqui() && pmodel != mdDisk && pmodel != mdPolynomial && pmodel != mdHyperboloid) {
if(sphere && pmodel != mdBand) if(sphere && pmodel != mdBand)
goto switchagain; goto switchagain;
if(euclid && pmodel != mdHalfplane && pmodel != mdBall) if(euclid && pmodel != mdHalfplane && pmodel != mdBall)

8
graph.cpp
View File

@ -1937,7 +1937,7 @@ int aurac[AURA+1][4];
bool haveaura() { bool haveaura() {
if(!(vid.aurastr>0 && !svg::in && (auraNOGL || vid.usingGL))) return false; if(!(vid.aurastr>0 && !svg::in && (auraNOGL || vid.usingGL))) return false;
if(sphere && (pmodel == mdEquidistant || pmodel == mdEquiarea)) return true; if(sphere && mdEqui()) return true;
return pmodel == mdDisk && (!sphere || vid.alpha > 10) && !euclid; return pmodel == mdDisk && (!sphere || vid.alpha > 10) && !euclid;
} }
@ -1989,7 +1989,7 @@ void sumaura(int v) {
void drawaura() { void drawaura() {
if(!haveaura()) return; if(!haveaura()) return;
double rad = vid.radius; double rad = vid.radius;
if(sphere && pmodel != mdEquidistant && pmodel != mdEquiarea) rad /= sqrt(vid.alphax*vid.alphax - 1); if(sphere && !mdEqui()) rad /= sqrt(vid.alphax*vid.alphax - 1);
for(int v=0; v<4; v++) sumaura(v); for(int v=0; v<4; v++) sumaura(v);
for(auto& p: auraspecials) { for(auto& p: auraspecials) {
@ -5054,10 +5054,10 @@ void drawfullmap() {
ptds.clear(); ptds.clear();
if(!vid.goteyes && !euclid && (pmodel == mdDisk || pmodel == mdBall || (sphere && (pmodel == mdEquidistant || pmodel == mdEquiarea)))) { if(!vid.goteyes && !euclid && (pmodel == mdDisk || pmodel == mdBall || (sphere && mdEqui()))) {
double rad = vid.radius; double rad = vid.radius;
if(sphere) { if(sphere) {
if(pmodel == mdEquidistant || pmodel == mdEquiarea) if(mdEqui())
; ;
else if(!vid.grid && !elliptic) else if(!vid.grid && !elliptic)
rad = 0; rad = 0;

2
hyper.h
View File

@ -1297,6 +1297,8 @@ void drawShape(pair<ld,ld>* coords, int qty, int color);
extern eModel pmodel; extern eModel pmodel;
inline bool mdEqui() { return pmodel == mdEquidistant || pmodel == mdEquiarea; }
int darkena(int c, int lev, int a); int darkena(int c, int lev, int a);
#define SHSIZE 16 #define SHSIZE 16

3
hypgraph.cpp
View File

@ -150,7 +150,7 @@ void applymodel(hyperpoint H, hyperpoint& ret) {
H = H / zlev; H = H / zlev;
} }
if(pmodel == mdEquidistant || pmodel == mdEquiarea) { if(mdEqui()) {
ld rad = sqrt(H[0] * H[0] + H[1] * H[1]); ld rad = sqrt(H[0] * H[0] + H[1] * H[1]);
ld d = hdist0(H); ld d = hdist0(H);
@ -166,6 +166,7 @@ void applymodel(hyperpoint H, hyperpoint& ret) {
if(zlev != 1 && vid.goteyes) if(zlev != 1 && vid.goteyes)
ret[2] = geom3::factor_to_lev(zlev); ret[2] = geom3::factor_to_lev(zlev);
ghcheck(ret,H); ghcheck(ret,H);
return; return;
} }

4
polygons.cpp
View File

@ -521,7 +521,7 @@ void drawpolyline(polytodraw& p) {
return; // too large! return; // too large!
} }
if((spherespecial > 0 || pmodel == mdEquidistant || pmodel == mdEquiarea) && !(poly_flags & POLY_ISSIDE)) { if((spherespecial > 0 || (sphere && mdEqui())) && !(poly_flags & POLY_ISSIDE)) {
double rarea = 0; double rarea = 0;
for(int i=0; i<qglcoords-1; i++) for(int i=0; i<qglcoords-1; i++)
rarea += glcoords[i][0] * glcoords[i+1][1] - glcoords[i][1] * glcoords[i+1][0]; rarea += glcoords[i][0] * glcoords[i+1][1] - glcoords[i][1] * glcoords[i+1][0];
@ -551,7 +551,7 @@ void drawpolyline(polytodraw& p) {
lastl = l; lastl = l;
} }
if((pmodel == mdEquidistant || pmodel == mdEquiarea) && (poly_flags & POLY_INVERSE)) { if(mdEqui() && (poly_flags & POLY_INVERSE)) {
ld h = atan2(glcoords[0][0], glcoords[0][1]); ld h = atan2(glcoords[0][0], glcoords[0][1]);
for(int i=0; i<=360; i++) { for(int i=0; i<=360; i++) {
ld a = i * M_PI / 180 + h; ld a = i * M_PI / 180 + h;