Update AnimatedCircuits and its license situation

Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2021-12-30 00:35:30 +00:00
parent 4e695f3a13
commit 6d8a4e0f15
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
5 changed files with 13 additions and 5 deletions

2
.gitmodules vendored
View file

@ -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

View file

@ -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)

View file

@ -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 | |

@ -1 +1 @@
Subproject commit 05706da2d641708241642981ed56f2e623fb6a9f
Subproject commit bd45fc5e9b472182bcc74da264f865d1424a76be

View file

@ -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: