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

color by sides; canvas coloring selectable from the texture menu

Browse Source
This commit is contained in:
Zeno Rogue 2018-08-20 15:49:17 +02:00
parent cd91148459
commit a4ced4a504
4 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
archimedean.cpp
View File

@ -844,13 +844,23 @@ void show() {
});
if(archimedean) {
dialog::addItem(XLAT("colored tiling"), 't');
dialog::addItem(XLAT("color by symmetries"), 't');
dialog::add_action([] () {
specialland = laCanvas;
firstland = specialland = laCanvas;
patterns::whichCanvas = 'A';
restart_game();
});
}
else dialog::addBreak(100);
if(true) {
dialog::addItem(XLAT("color by sides"), 'u');
dialog::add_action([] () {
firstland = specialland = laCanvas;
patterns::whichCanvas = 'B';
restart_game();
});
}
}
dialog::addHelp();

2
geom-exp.cpp
View File

@ -507,8 +507,8 @@ void showEuclideanMenu() {
else if(lid >= 0 && lid < isize(landlist)) {
eLand nland = landlist[lid];
if(landvisited[nland]) {
firstland = specialland = nland;
stop_game_and_switch_mode(tactic::on ? rg::tactic : rg::nothing);
firstland = specialland = nland;
start_game();
}
}

24
pattern2.cpp
View File

@ -1241,8 +1241,26 @@ namespace patterns {
char whichCanvas = 0;
int generateCanvas(cell *c) {
if(whichCanvas == 'A' && archimedean)
return distcolors[arcm::current.tilegroup[arcm::id_of(c->master)] & 7];
if(whichCanvas == 'A' && archimedean) {
int gcolors[16] = {
0xF04040, 0x40F040, 0x4040F0,
0xD0D000, 0xD000D0, 0x00D0D0,
0xC0C0C0, 0x404040, 0x808080,
0xF08040, 0xF04080, 0x40F080,
0x4080F0, 0x8040F0, 0x80F040,
0xFFD500 };
return gcolors[arcm::current.tilegroup[arcm::id_of(c->master)] & 15];
}
if(whichCanvas == 'B') {
int gcolors[16] = {
// trying to get colors as in Wikipedia [ https://en.wikipedia.org/wiki/Euclidean_tilings_by_convex_regular_polygons#k-uniform_tilings ]
0, 0, 0xFFFFFF, 0xFFFF00,
0xFF0000, 0xC000C0 /* unknown5 */, 0x00FF00, 0x00C0C0 /* unknown7 */, 0xFF8000,
0xFFFF80, 0xC040C0, 0xFFD500, 0x000080,
0x404040, 0x606060, 0x808080
};
return gcolors[c->type & 15];
}
if(whichCanvas == 'C' && hyperbolic) {
using namespace fieldpattern;
int z = currfp.getdist(fieldval(c), make_pair(0,false));
@ -1421,6 +1439,8 @@ namespace patterns {
if(archimedean)
dialog::addSelItem(XLAT("Archimedean"), "Archimedean", 'A');
dialog::addSelItem(XLAT("sides"), "sides", 'B');
dialog::addBreak(100);
dialog::addBoolItem(XLATN(winf[waInvisibleFloor].name), canvas_invisible, 'i');

14
textures.cpp
View File

@ -1059,6 +1059,20 @@ void showMenu() {
dialog::addItem(XLAT("paint a new texture"), 'n');
#endif
dialog::addSelItem(XLAT("precision"), its(config.gsplits), 'P');
dialog::addBoolItem(XLAT("Canvas"), specialland == laCanvas, 'X');
dialog::add_action([] () {
bool inwhite = specialland == laCanvas && patterns::whichCanvas == 'g' && patterns::canvasback == 0xFFFFFF;
if(inwhite)
pushScreen(patterns::showPrePattern);
else {
stop_game();
firstland = specialland = laCanvas;
patterns::whichCanvas = 'g';
patterns::canvasback = 0xFFFFFF;
start_game();
}
});
}
if(config.tstate == tsAdjusting) {