mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-31 14:02:59 +00:00
Code Issues Releases Wiki Activity

Change eclectic_red for higher_contrast if set.

Browse Source
This commit is contained in:
Jacob Mandelson
2025-06-22 13:23:34 -07:00
parent 4d37090faa
commit e88d57787c
2 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
celldrawer.cpp
View File

@@ -116,7 +116,27 @@ void celldrawer::addaura() {
/* Eclectic City's version of Red Rock is of slightly different color, */
/* to make it different from hot cells */
void eclectic_red(color_t& col) {
if (!higher_contrast) {
part(col, 0) = part(col, 2) * 3 / 4;
} else {
auto d = (part(col, 0) + part(col, 1) + part(col, 2));
auto t = part(col, 0);
part(col, 0) = part(col, 1);
part(col, 1) = part(col, 2);
part(col, 2) = t + d/3;
//swap(part(col, 0), part(col, 1));
/* auto h = part(col, 0) / 2;
part(col, 0) -= h;
part(col, 1) += h;
part(col, 2) += h / 2; */
/* part(col, 0) += part(col, 0) / 4;
part(col, 1) += part(col, 1) + 16;
part(col, 2) += part(col, 2) / 2 + 8; */
/* part(col, 0) += d;
part(col, 1) += 3*d;
part(col, 2) += 2*d; */
}
}
constexpr ld spinspeed = .75 / M_PI;
@@ -716,7 +736,10 @@ int celldrawer::getSnakelevColor(int i, int last) {
if(c->land == laEclectic)
eclectic_red(col);
}
if (!higher_contrast)
return darkena(col, fd, 0xFF);
else
return darkena(col, 0, 0xFF);
}
void celldrawer::draw_wallshadow() {

14
colors.cpp
View File

@@ -55,6 +55,20 @@ EX int darkenedby(int c, int lev) {
return c;
}
EX color_t lightena3(color_t c, int lev, int a) {
return (lightenedby(c, lev) << 8) + a;
}
EX color_t lightena(color_t c, int lev, int a) {
return lightena3(c, lev, GDIM == 3 ? 255 : a);
}
EX int lightenedby(int c, int lev) {
for(int i=0; i<lev; i++)
c = ((c | 0x010101) << 1);
return c;
}
bool fading = false;
ld fadeout = 1;