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

product:: using in_h2xe() and in_s2xe() more consistently

Browse Source
This commit is contained in:
Zeno Rogue 2019-11-28 23:09:38 +01:00
parent d63b14da5c
commit 5add972bdd
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigstuff.cpp
View File

@ -185,7 +185,7 @@ void hrmap::generateAlts(heptagon *h, int levs, bool link_cdata) {
EX heptagon *createAlternateMap(cell *c, int rad, hstate firststate, int special IS(0)) { EX heptagon *createAlternateMap(cell *c, int rad, hstate firststate, int special IS(0)) {
if(hybri) { if(hybri) {
if(hybrid::over_sphere()) return NULL; if(hybrid::under_class() == gcSphere) return NULL;
c = hybrid::get_where(c).first; c = hybrid::get_where(c).first;
return PIU ( createAlternateMap(c, rad, firststate, special) ); return PIU ( createAlternateMap(c, rad, firststate, special) );
} }

2
game.cpp
View File

@ -7505,7 +7505,7 @@ EX bool in_full_game() {
if(euclid && isCrossroads(specialland)) return true; if(euclid && isCrossroads(specialland)) return true;
if(weirdhyperbolic && specialland == laCrossroads4) return true; if(weirdhyperbolic && specialland == laCrossroads4) return true;
if(cryst && isCrossroads(specialland)) return true; if(cryst && isCrossroads(specialland)) return true;
if((in_s2xe() || nonisotropic || (hybri && !hybrid::over_sphere())) && isCrossroads(specialland)) return true; if((in_s2xe() || nonisotropic || (hybri && hybrid::under_class() != gcSphere)) && isCrossroads(specialland)) return true;
if(geometry == gNormal && !NONSTDVAR) return true; if(geometry == gNormal && !NONSTDVAR) return true;
return false; return false;
} }

4
landgen.cpp
View File

@ -296,7 +296,7 @@ EX void giantLandSwitch(cell *c, int d, cell *from) {
c->wall = waPalace; c->wall = waPalace;
} }
if(d == 8 && (sphere || (hybri && hybrid::over_sphere()))) { if(d == 8 && (sphere || in_s2xe())) {
int gs = getHemisphere(c,0); int gs = getHemisphere(c,0);
if(NONSTDVAR) { if(NONSTDVAR) {
int v = 1; int v = 1;
@ -2715,7 +2715,7 @@ EX void setdist(cell *c, int d, cell *from) {
buildEquidistant(c); buildEquidistant(c);
} }
if(d <= 7 && (c->land == laGraveyard || c->land == laHauntedBorder) && !(hybri && hybrid::over_sphere())) { if(d <= 7 && (c->land == laGraveyard || c->land == laHauntedBorder) && !in_s2xe()) {
c->land = (c->landparam >= 1 && c->landparam <= HAUNTED_RADIUS) ? laHauntedBorder : laGraveyard; c->land = (c->landparam >= 1 && c->landparam <= HAUNTED_RADIUS) ? laHauntedBorder : laGraveyard;
} }

7
nonisotropic.cpp
View File

@ -973,15 +973,16 @@ EX void show_niltorus3() {
EX } EX }
EX bool in_s2xe() { return prod && hybrid::over_sphere(); } EX bool in_s2xe() { return prod && hybrid::under_class() == gcSphere; }
EX bool in_h2xe() { return prod && !hybrid::over_sphere(); } EX bool in_h2xe() { return prod && hybrid::under_class() == gcHyperbolic; }
EX bool in_e2xe() { return prod && hybrid::under_class() == gcEuclid; }
EX namespace hybrid { EX namespace hybrid {
EX eGeometry underlying; EX eGeometry underlying;
EX geometry_information *underlying_cgip; EX geometry_information *underlying_cgip;
EX bool over_sphere() { return ginf[hybrid::underlying].cclass == gcSphere; } EX eGeometryClass under_class() { return ginf[hybrid::underlying].cclass; }
EX void configure(eGeometry g) { EX void configure(eGeometry g) {
if(WDIM == 3) return; if(WDIM == 3) return;

4
shaders.cpp
View File

@ -197,7 +197,7 @@ shared_ptr<glhr::GLprogram> write_shader(flagtype shader_flags) {
break; break;
} }
} }
else if(geometry == gProduct && !hybrid::over_sphere() && pmodel == mdPerspective) { else if(in_h2xe() && pmodel == mdPerspective) {
shader_flags |= SF_PERS3 | SF_DIRECT; shader_flags |= SF_PERS3 | SF_DIRECT;
coordinator += coordinator +=
"float z = log(t[2] * t[2] - t[0] * t[0] - t[1] * t[1]) / 2.;\n" "float z = log(t[2] * t[2] - t[0] * t[0] - t[1] * t[1]) / 2.;\n"
@ -209,7 +209,7 @@ shared_ptr<glhr::GLprogram> write_shader(flagtype shader_flags) {
distfun = "sqrt(z*z+d*d)"; distfun = "sqrt(z*z+d*d)";
treset = true; treset = true;
} }
else if(geometry == gProduct && hybrid::over_sphere() && pmodel == mdPerspective) { else if(in_s2xe() && pmodel == mdPerspective) {
shader_flags |= SF_PERS3 | SF_DIRECT; shader_flags |= SF_PERS3 | SF_DIRECT;
distfun = "length(t.xyz)", treset = true; distfun = "length(t.xyz)", treset = true;
} }