diff --git a/.gitmodules b/.gitmodules index c310164..d1071ce 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,7 +21,7 @@ url = https://github.com/CardinalModules/AudibleInstruments.git [submodule "plugins/AnimatedCircuits"] path = plugins/AnimatedCircuits - url = https://github.com/CardinalModules/AnimatedCircuits.git + url = https://github.com/AnimatedCircuits/RackModules.git [submodule "plugins/ZetaCarinaeModules"] path = plugins/ZetaCarinaeModules url = https://github.com/mhampton/ZetaCarinaeModules.git diff --git a/doc/DIFFERENCES.md b/doc/DIFFERENCES.md index 8fcf381..61334dd 100644 --- a/doc/DIFFERENCES.md +++ b/doc/DIFFERENCES.md @@ -41,7 +41,6 @@ Bellow follows a list of features comparing the official plugin to Cardinal. Additionally, Cardinal contains the following built-in modules not present in the official plugin or standalone: - * Animated Circuits (never updated to v2) * Aria Salvatrice modules (except Arcane related modules, due to their online requirement) * Mog (never updated to v2) * mscHack (never updated to v2) diff --git a/doc/LICENSES.md b/doc/LICENSES.md index 4404fcb..1831646 100644 --- a/doc/LICENSES.md +++ b/doc/LICENSES.md @@ -16,7 +16,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | 21kHz | MIT | | | AS | MIT | | | Amalgamated Harmonics | BSD-3-Clause | | -| Animated Circuits | BSD-3-Clause | | +| Animated Circuits | GPL-3.0-or-later | | | Aria Salvatrice | GPL-3.0-or-later | | | Atelier | GPL-3.0-or-later | | | Audible Instruments | GPL-3.0-or-later | | @@ -75,7 +75,7 @@ Below is a list of artwork licenses from plugins | AmalgamatedHarmonics/DSEG*.ttf | OFL-1.1-RFN | | | AmalgamatedHarmonics/EurostileBold.ttf | ?? | https://github.com/jhoar/AmalgamatedHarmonics/issues/48 | | AmalgamatedHarmonics/Roboto-Light.ttf | Apache-2.0 | | -| AnimatedCircuits/* | BSD-3-Clause | No artwork specific license provided | +| AnimatedCircuits/* | CC-BY-NC-SA-4.0 | | | AriaModules/* | CC-BY-SA-4.0 | | | AriaModules/Arcane/* | CC-BY-NC-SA-3.0 | Unused in Cardinal | | AriaModules/components/* | WTFPL | | diff --git a/plugins/AnimatedCircuits b/plugins/AnimatedCircuits index 05706da..bd45fc5 160000 --- a/plugins/AnimatedCircuits +++ b/plugins/AnimatedCircuits @@ -1 +1 @@ -Subproject commit 05706da2d641708241642981ed56f2e623fb6a9f +Subproject commit bd45fc5e9b472182bcc74da264f865d1424a76be diff --git a/src/override/dep.cpp b/src/override/dep.cpp index cd08454..3f18415 100644 --- a/src/override/dep.cpp +++ b/src/override/dep.cpp @@ -497,6 +497,13 @@ static inline bool invertPaint(NSVGpaint& paint, const char* const svgFileToInve return true; } + // Special case for AnimatedCircuits logo + if (paint.color == 0xff303030 && svgFileToInvert != nullptr && std::strncmp(svgFileToInvert, "/AnimatedCircuits/", 18) == 0) + { + paint.color = 0xffefefef; + return true; + } + // Special case for JW-Modules colors if (svgFileToInvert != nullptr && std::strncmp(svgFileToInvert, "/JW-Modules/", 12) == 0) { @@ -561,6 +568,8 @@ static inline bool invertPaint(NSVGpaint& paint, const char* const svgFileToInve case 0xff0095fe: case 0xff4d9a4d: case 0xff4d4d9a: + // AnimatedCircuits FoldingLight.svg + case 0xffa0783c: return false; // pure black (convert to not quite pure white) case 0xff000000: