From e88d57787c704e93d5c611c428e6eee7110c667f Mon Sep 17 00:00:00 2001 From: Jacob Mandelson Date: Sun, 22 Jun 2025 13:23:34 -0700 Subject: [PATCH 1/2] Change eclectic_red for higher_contrast if set. --- celldrawer.cpp | 27 +++++++++++++++++++++++++-- colors.cpp | 14 ++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/celldrawer.cpp b/celldrawer.cpp index 26fe7316..fa0ec0a0 100644 --- a/celldrawer.cpp +++ b/celldrawer.cpp @@ -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) { - part(col, 0) = part(col, 2) * 3 / 4; + 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); } - return darkena(col, fd, 0xFF); + if (!higher_contrast) + return darkena(col, fd, 0xFF); + else + return darkena(col, 0, 0xFF); } void celldrawer::draw_wallshadow() { diff --git a/colors.cpp b/colors.cpp index 89d7662a..23614793 100644 --- a/colors.cpp +++ b/colors.cpp @@ -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 Date: Sun, 22 Jun 2025 13:25:41 -0700 Subject: [PATCH 2/2] Remove unused WIP code. --- celldrawer.cpp | 16 ++-------------- colors.cpp | 14 -------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/celldrawer.cpp b/celldrawer.cpp index fa0ec0a0..bcd7d8ac 100644 --- a/celldrawer.cpp +++ b/celldrawer.cpp @@ -119,23 +119,11 @@ 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 v = 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; */ + part(col, 2) = t + v/3; } } diff --git a/colors.cpp b/colors.cpp index 23614793..89d7662a 100644 --- a/colors.cpp +++ b/colors.cpp @@ -55,20 +55,6 @@ 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