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

disabled run in non-hyperbolic, implemented in weird hyperbolic, disabled PMC in non-hyperbolic

Browse Source
This commit is contained in:
Zeno Rogue 2017-10-30 10:01:49 +01:00
parent 48361cc5e4
commit d2fc8b41ba
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menus.cpp
View File

@ -390,7 +390,7 @@ void showDisplayMode() {
#if CAP_MODEL #if CAP_MODEL
else if(xuni == 'n') else if(xuni == 'n')
pushScreen(netgen::show); netgen::run();
#endif #endif
else gmodekeys(sym, uni); else gmodekeys(sym, uni);

8
netgen.cpp
View File

@ -705,5 +705,13 @@ namespace netgen {
}; };
} }
void run() {
if(euclid)
addMessage("Useless in Euclidean geometry.");
else if(sphere)
addMessage("Not implemented for spherical geometry.");
else
pushScreen(show);
}
} }
#endif #endif

19
rug.cpp
View File

@ -155,7 +155,7 @@ void buildRug() {
cell *c3 = c->mov[(j+1) % c->type]; cell *c3 = c->mov[(j+1) % c->type];
rugpoint *w2 = vptr[c3]; rugpoint *w2 = vptr[c3];
if(!w2) continue; if(!w2) continue;
if(c->type == 7) addTriangle(v, w, w2); if(ctof(c)) addTriangle(v, w, w2);
} }
} }
@ -660,9 +660,16 @@ hyperpoint gethyper(ld x, ld y) {
void show() { void show() {
dialog::init(XLAT("hypersian rug mode"), iinf[itPalace].color, 150, 100); dialog::init(XLAT("hypersian rug mode"), iinf[itPalace].color, 150, 100);
if(euclid || sphere) {
dialog::addInfo("This makes sense only in hyperbolic geometry.");
dialog::addBreak(50);
}
dialog::addItem(XLAT("what's this?"), 'h'); dialog::addItem(XLAT("what's this?"), 'h');
dialog::addItem(XLAT("take me back"), 'q'); dialog::addItem(XLAT("take me back"), 'q');
dialog::addItem(XLAT("enable the Hypersian Rug mode"), 'u'); dialog::addItem(XLAT("enable the Hypersian Rug mode"), 'u');
dialog::addBoolItem(XLAT("render the texture only once"), (renderonce), 'o'); dialog::addBoolItem(XLAT("render the texture only once"), (renderonce), 'o');
dialog::addBoolItem(XLAT("render texture without OpenGL"), (rendernogl), 'g'); dialog::addBoolItem(XLAT("render texture without OpenGL"), (rendernogl), 'g');
dialog::addSelItem(XLAT("texture size"), its(texturesize)+"x"+its(texturesize), 's'); dialog::addSelItem(XLAT("texture size"), its(texturesize)+"x"+its(texturesize), 's');
@ -683,10 +690,12 @@ void show() {
"Use arrow keys to rotate, Page Up/Down to zoom." "Use arrow keys to rotate, Page Up/Down to zoom."
); );
else if(uni == 'u') { else if(uni == 'u') {
if(sphere) restartGame('E'); if(euclid || sphere)
if(euclid) restartGame('e'); addMessage("This makes sense only in hyperbolic geometry.");
rug::init(); else {
popScreen(); rug::init();
popScreen();
}
} }
else if(uni == 'o') else if(uni == 'o')
renderonce = !renderonce; renderonce = !renderonce;