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

apeirogonal color fixup

This commit is contained in:
Zeno Rogue 2022-04-28 08:24:13 +02:00
parent 51ea62977f
commit 84d48789c7
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.cpp
View File

@ -2985,6 +2985,9 @@ EX int read_color_args() {
else if(argis("-fillmodel")) { else if(argis("-fillmodel")) {
PHASEFROM(2); shift(); modelcolor = argcolor(32); PHASEFROM(2); shift(); modelcolor = argcolor(32);
} }
else if(argis("-apeirocolor")) {
PHASEFROM(2); shift(); patterns::apeirogonal_color = argcolor(32);
}
else if(argis("-ring")) { else if(argis("-ring")) {
PHASEFROM(2); shift(); ringcolor = argcolor(32); PHASEFROM(2); shift(); ringcolor = argcolor(32);
} }

5
pattern2.cpp
View File

@ -1752,7 +1752,9 @@ EX namespace patterns {
} }
EX hookset<int(cell*)> hooks_generate_canvas; EX hookset<int(cell*)> hooks_generate_canvas;
EX color_t apeirogonal_color = 0xFFFFFFFF;
EX int jhole = 0; EX int jhole = 0;
EX int jblock = 0; EX int jblock = 0;
EX int rwalls = 50; EX int rwalls = 50;
@ -1787,6 +1789,7 @@ EX namespace patterns {
if(arb::in()) return colortables['A'][shvid(c) + c->master->emeraldval * isize(arb::current.shapes)]; if(arb::in()) return colortables['A'][shvid(c) + c->master->emeraldval * isize(arb::current.shapes)];
return colortables['A'][shvid(c)]; return colortables['A'][shvid(c)];
case 'B': case 'B':
if(arb::is_apeirogonal(c)) return apeirogonal_color;
return colortables['B'][c->type & 15]; return colortables['B'][c->type & 15];
#if CAP_FIELD #if CAP_FIELD
case 'C': { case 'C': {