mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-06-14 01:16:50 +00:00
asonov:: changed direct checking of gArnoldCat to asonov::in()
This commit is contained in:
parent
9cb2a753de
commit
add037d4e8
|
@ -15,6 +15,8 @@ namespace hr {
|
||||||
|
|
||||||
EX namespace asonov {
|
EX namespace asonov {
|
||||||
|
|
||||||
|
EX bool in() { return geometry == gArnoldCat; }
|
||||||
|
|
||||||
EX hyperpoint tx, ty, tz;
|
EX hyperpoint tx, ty, tz;
|
||||||
|
|
||||||
EX int period_xy = 8;
|
EX int period_xy = 8;
|
||||||
|
|
2
cell.cpp
2
cell.cpp
|
@ -234,7 +234,7 @@ EX void initcells() {
|
||||||
|
|
||||||
hrmap* res = callhandlers((hrmap*)nullptr, hooks_newmap);
|
hrmap* res = callhandlers((hrmap*)nullptr, hooks_newmap);
|
||||||
if(res) currentmap = res;
|
if(res) currentmap = res;
|
||||||
else if(geometry == gArnoldCat) currentmap = asonov::new_map();
|
else if(asonov::in()) currentmap = asonov::new_map();
|
||||||
else if(nonisotropic || hybri) currentmap = nisot::new_map();
|
else if(nonisotropic || hybri) currentmap = nisot::new_map();
|
||||||
#if CAP_CRYSTAL
|
#if CAP_CRYSTAL
|
||||||
else if(cryst) currentmap = crystal::new_map();
|
else if(cryst) currentmap = crystal::new_map();
|
||||||
|
|
|
@ -1529,7 +1529,7 @@ void celldrawer::draw_features_and_walls_3d() {
|
||||||
else if(a < 2 && among(geometry, gHoroRec) && celldistAlt(c) >= celldistAlt(viewcenter())) continue;
|
else if(a < 2 && among(geometry, gHoroRec) && celldistAlt(c) >= celldistAlt(viewcenter())) continue;
|
||||||
else if(c->move(a)->master->distance > c->master->distance && c->master->distance > viewctr.at->distance && !quotient) continue;
|
else if(c->move(a)->master->distance > c->master->distance && c->master->distance > viewctr.at->distance && !quotient) continue;
|
||||||
}
|
}
|
||||||
else if(sol && in_perspective() && !nih && geometry != gArnoldCat) {
|
else if(sol && in_perspective() && !nih && !asonov::in()) {
|
||||||
ld b = vid.binary_width * log(2) / 2;
|
ld b = vid.binary_width * log(2) / 2;
|
||||||
const ld l = log(2) / 2;
|
const ld l = log(2) / 2;
|
||||||
switch(a) {
|
switch(a) {
|
||||||
|
|
|
@ -779,7 +779,7 @@ EX void showEuclideanMenu() {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
else if(euwrap || geometry == gFieldQuotient || cryst || archimedean || (euclid && WDIM == 3) || nil || geometry == gArnoldCat) {
|
else if(euwrap || geometry == gFieldQuotient || cryst || archimedean || (euclid && WDIM == 3) || nil || asonov::in()) {
|
||||||
dialog::addItem(XLAT("advanced parameters"), '4');
|
dialog::addItem(XLAT("advanced parameters"), '4');
|
||||||
dialog::add_action([] {
|
dialog::add_action([] {
|
||||||
if(0);
|
if(0);
|
||||||
|
@ -798,7 +798,7 @@ EX void showEuclideanMenu() {
|
||||||
else if(nil)
|
else if(nil)
|
||||||
nilv::prepare_niltorus3(),
|
nilv::prepare_niltorus3(),
|
||||||
pushScreen(nilv::show_niltorus3);
|
pushScreen(nilv::show_niltorus3);
|
||||||
else if(geometry == gArnoldCat)
|
else if(asonov::in())
|
||||||
asonov::prepare_config(),
|
asonov::prepare_config(),
|
||||||
pushScreen(asonov::show_config);
|
pushScreen(asonov::show_config);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -3562,7 +3562,7 @@ EX int get_darkval(cell *c, int d) {
|
||||||
const int darkval_hh[14] = {0,0,0,1,1,1,2,2,2,3,3,3,1,0};
|
const int darkval_hh[14] = {0,0,0,1,1,1,2,2,2,3,3,3,1,0};
|
||||||
const int darkval_hrec[7] = {0,0,2,4,2,4,0};
|
const int darkval_hrec[7] = {0,0,2,4,2,4,0};
|
||||||
const int darkval_sol[8] = {0,2,4,4,0,2,4,4};
|
const int darkval_sol[8] = {0,2,4,4,0,2,4,4};
|
||||||
const int darkval_asonov[12] = {0,2,0,2,4,5,0,2,0,2,4,5};
|
const int darkval_arnold[12] = {0,2,0,2,4,5,0,2,0,2,4,5};
|
||||||
const int darkval_penrose[12] = {0, 2, 0, 2, 4, 4, 6, 6, 6, 6, 6, 6};
|
const int darkval_penrose[12] = {0, 2, 0, 2, 4, 4, 6, 6, 6, 6, 6, 6};
|
||||||
const int darkval_nil[8] = {6,6,0,3,6,6,0,3};
|
const int darkval_nil[8] = {6,6,0,3,6,6,0,3};
|
||||||
const int darkval_nih[11] = {0,2,0,2,4,6,6,6,6,6,6};
|
const int darkval_nih[11] = {0,2,0,2,4,6,6,6,6,6,6};
|
||||||
|
@ -3573,7 +3573,7 @@ EX int get_darkval(cell *c, int d) {
|
||||||
if(geometry == gHoroHex) return darkval_hh[d];
|
if(geometry == gHoroHex) return darkval_hh[d];
|
||||||
if(geometry == gHoroRec) return darkval_hrec[d];
|
if(geometry == gHoroRec) return darkval_hrec[d];
|
||||||
if(penrose) return darkval_penrose[d];
|
if(penrose) return darkval_penrose[d];
|
||||||
if(geometry == gArnoldCat) return darkval_asonov[d];
|
if(geometry == gArnoldCat) return darkval_arnold[d];
|
||||||
if(sol) return darkval_sol[d];
|
if(sol) return darkval_sol[d];
|
||||||
if(nih) return darkval_nih[d];
|
if(nih) return darkval_nih[d];
|
||||||
if(binarytiling) return darkval_hbt[d];
|
if(binarytiling) return darkval_hbt[d];
|
||||||
|
|
|
@ -48,12 +48,8 @@ EX namespace nisot {
|
||||||
EX namespace solnihv {
|
EX namespace solnihv {
|
||||||
|
|
||||||
EX eGeometry geom() {
|
EX eGeometry geom() {
|
||||||
switch(geometry) {
|
if(asonov::in()) return gSol;
|
||||||
case gSol: case gArnoldCat:
|
else return geometry;
|
||||||
return gSol;
|
|
||||||
default:
|
|
||||||
return geometry;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if HDR
|
#if HDR
|
||||||
|
|
|
@ -132,7 +132,7 @@ void enable_raycaster() {
|
||||||
last_geometry = geometry;
|
last_geometry = geometry;
|
||||||
deg = S7; if(prod) deg += 2;
|
deg = S7; if(prod) deg += 2;
|
||||||
if(!our_raycaster) {
|
if(!our_raycaster) {
|
||||||
bool asonov = geometry == gArnoldCat;
|
bool asonov = hr::asonov::in();
|
||||||
bool use_reflect = reflect_val && !nil && !levellines && !asonov;
|
bool use_reflect = reflect_val && !nil && !levellines && !asonov;
|
||||||
|
|
||||||
string vsh =
|
string vsh =
|
||||||
|
|
Loading…
Reference in New Issue
Block a user