Fix PathSet Nudge colors; Import AudibleInstruments fixes

Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-05-14 20:29:25 +01:00
parent 4a2cc44f65
commit e91ad350b4
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
4 changed files with 66 additions and 47 deletions

View file

@ -4,7 +4,7 @@ on:
push: push:
env: env:
CACHE_VERSION: 22 CACHE_VERSION: 23
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
HOMEBREW_NO_AUTO_UPDATE: 1 HOMEBREW_NO_AUTO_UPDATE: 1
LIBGL_ALWAYS_SOFTWARE: 'true' LIBGL_ALWAYS_SOFTWARE: 'true'

2
deps/PawPaw vendored

@ -1 +1 @@
Subproject commit dbdcdb38a1cfe1487fb7f1a072cba24e4270ee43 Subproject commit 6c11b17d5f794c224fd0ee8aa872c54e36279123

@ -1 +1 @@
Subproject commit fec73bc29fc3771d23e6ea03132597774f61c92e Subproject commit 6833adeb7141a06151c9ee7059cc43d3c854c96d

View file

@ -450,6 +450,24 @@ static inline bool invertPaint(NSVGshape* const shape, NSVGpaint& paint, const c
// Special case for PathSet colors // Special case for PathSet colors
if (svgFileToInvert != nullptr && std::strncmp(svgFileToInvert, "/PathSet/", 9) == 0) if (svgFileToInvert != nullptr && std::strncmp(svgFileToInvert, "/PathSet/", 9) == 0)
{
// only invert main colors for Nudge.svg
if (std::strcmp(svgFileToInvert, "/PathSet/res/Nudge.svg") == 0)
{
switch (paint.color)
{
case 0xffe6e6e6:
paint.color = 0xff191919;
return true;
case 0xff000000:
paint.color = 0xffffffff;
return true;
default:
return false;
}
}
// everything else
else
{ {
switch (paint.color) switch (paint.color)
{ {
@ -503,6 +521,7 @@ static inline bool invertPaint(NSVGshape* const shape, NSVGpaint& paint, const c
return true; return true;
} }
} }
}
// Special case for voxglitch colors // Special case for voxglitch colors
if (svgFileToInvert != nullptr && std::strncmp(svgFileToInvert, "/voxglitch/", 11) == 0) if (svgFileToInvert != nullptr && std::strncmp(svgFileToInvert, "/voxglitch/", 11) == 0)