diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5612019..a0b9c41 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: push: env: - CACHE_VERSION: 22 + CACHE_VERSION: 23 DEBIAN_FRONTEND: noninteractive HOMEBREW_NO_AUTO_UPDATE: 1 LIBGL_ALWAYS_SOFTWARE: 'true' diff --git a/deps/PawPaw b/deps/PawPaw index dbdcdb3..6c11b17 160000 --- a/deps/PawPaw +++ b/deps/PawPaw @@ -1 +1 @@ -Subproject commit dbdcdb38a1cfe1487fb7f1a072cba24e4270ee43 +Subproject commit 6c11b17d5f794c224fd0ee8aa872c54e36279123 diff --git a/plugins/AudibleInstruments b/plugins/AudibleInstruments index fec73bc..6833ade 160000 --- a/plugins/AudibleInstruments +++ b/plugins/AudibleInstruments @@ -1 +1 @@ -Subproject commit fec73bc29fc3771d23e6ea03132597774f61c92e +Subproject commit 6833adeb7141a06151c9ee7059cc43d3c854c96d diff --git a/src/custom/dep.cpp b/src/custom/dep.cpp index 7f7375f..25f67a6 100644 --- a/src/custom/dep.cpp +++ b/src/custom/dep.cpp @@ -451,56 +451,75 @@ static inline bool invertPaint(NSVGshape* const shape, NSVGpaint& paint, const c // Special case for PathSet colors if (svgFileToInvert != nullptr && std::strncmp(svgFileToInvert, "/PathSet/", 9) == 0) { - switch (paint.color) + // only invert main colors for Nudge.svg + if (std::strcmp(svgFileToInvert, "/PathSet/res/Nudge.svg") == 0) { - // main blue tone - case 0xffdf7a1a: - if (shape->opacity == 0.5f && std::strcmp(svgFileToInvert, "/PathSet/res/AstroVibe.svg") == 0) + switch (paint.color) { - shape->opacity = 0.2f; + case 0xffe6e6e6: + paint.color = 0xff191919; + return true; + case 0xff000000: + paint.color = 0xffffffff; return true; + default: + return false; } - if (shape->opacity == 0.25f) - shape->opacity = 0.75f; - return false; - // bottom logo stuff, set to full white - case 0xff000000: - if (shape->stroke.type != NSVG_PAINT_NONE) + } + // everything else + else + { + switch (paint.color) { - paint.color = 0xffffffff; + // main blue tone + case 0xffdf7a1a: + if (shape->opacity == 0.5f && std::strcmp(svgFileToInvert, "/PathSet/res/AstroVibe.svg") == 0) + { + shape->opacity = 0.2f; + return true; + } + if (shape->opacity == 0.25f) + shape->opacity = 0.75f; + return false; + // bottom logo stuff, set to full white + case 0xff000000: + if (shape->stroke.type != NSVG_PAINT_NONE) + { + paint.color = 0xffffffff; + return true; + } + break; + // pink step 2 (pink with 50% opacity on bg) + case 0xffef73ea: + paint.color = 0xff812d7d; + return true; + // pink step 3 (pink with 33.3% opacity on bg) + case 0xfff49ff0: + paint.color = 0xff4d234c; + return true; + // pink and orange + case 0xffe941e2: + case 0xff698efb: + return false; + // blue darker 1 (blue with 50% opacity on bg) + case 0xffde944f: + case 0xffe3b080: + case 0xffe4cbb3: + case 0xfff5c99f: + case 0xfff6d1b0: + paint.color = 0xff7c4919; + return true; + // blue darker 2 (blue with 33.3% opacity on bg) + case 0xffe5d9cd: + case 0xfff8dcc2: + case 0xffe1a265: + paint.color = 0xff5b3a1a; + return true; + // blue darker 3 (blue with 25% opacity on bg) + case 0xffe5cbb3: + paint.color = 0xff4b321a; return true; } - break; - // pink step 2 (pink with 50% opacity on bg) - case 0xffef73ea: - paint.color = 0xff812d7d; - return true; - // pink step 3 (pink with 33.3% opacity on bg) - case 0xfff49ff0: - paint.color = 0xff4d234c; - return true; - // pink and orange - case 0xffe941e2: - case 0xff698efb: - return false; - // blue darker 1 (blue with 50% opacity on bg) - case 0xffde944f: - case 0xffe3b080: - case 0xffe4cbb3: - case 0xfff5c99f: - case 0xfff6d1b0: - paint.color = 0xff7c4919; - return true; - // blue darker 2 (blue with 33.3% opacity on bg) - case 0xffe5d9cd: - case 0xfff8dcc2: - case 0xffe1a265: - paint.color = 0xff5b3a1a; - return true; - // blue darker 3 (blue with 25% opacity on bg) - case 0xffe5cbb3: - paint.color = 0xff4b321a; - return true; } }