Add back AnimatedCircuits, dark mode now on plugin side

README.md

@@ -104,6 +104,7 @@ At the moment the following 3rd-party modules are provided:
 
 - 21kHz
 - Amalgamated Harmonics
+- Animated Circuits
 - Aria Salvatrice
 - Audible Instruments
 - Autinn

docs/LICENSES.md

@@ -15,6 +15,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
 | Rack                    | GPL-3.0-or-later      | The actual Rack code, internal dependencies are compatible with GPLv3+ |
 | 21kHz                   | MIT                   | |
 | Amalgamated Harmonics   | BSD-3-Clause          | |
+| Animated Circuits       | GPL-3.0-or-later      | |
 | Aria Salvatrice         | GPL-3.0-or-later      | |
 | Audible Instruments     | GPL-3.0-or-later      | |
 | Autinn                  | GPL-3.0-or-later      | |
@@ -69,6 +70,7 @@ Below is a list of artwork licenses from plugins
 | AmalgamatedHarmonics/*                  | BSD-3-Clause     | No artwork specific license provided |
 | AmalgamatedHarmonics/DSEG*.ttf          | OFL-1.1-RFN      | |
 | AmalgamatedHarmonics/Roboto*.ttf        | Apache-2.0       | |
+| 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            | |

plugins/AnimatedCircuits

@@ -0,0 +1 @@
+Subproject commit 76c2912fd6ebdd7c3e33fca88096bea9c67209a1

plugins/Makefile

@@ -240,8 +240,8 @@ AMALGAMATEDHARMONICS_CUSTOM += bogaudio
 # --------------------------------------------------------------
 # AnimatedCircuits
 
-# PLUGIN_FILES += $(wildcard AnimatedCircuits/src/Folding/*.cpp)
-# PLUGIN_FILES += $(wildcard AnimatedCircuits/src/LFold/*.cpp)
+PLUGIN_FILES += $(wildcard AnimatedCircuits/src/Folding/*.cpp)
+PLUGIN_FILES += $(wildcard AnimatedCircuits/src/LFold/*.cpp)
 
 # --------------------------------------------------------------
 # Aria

plugins/plugins.cpp

@@ -30,10 +30,8 @@
 // AmalgamatedHarmonics
 #include "AmalgamatedHarmonics/src/AH.hpp"
 
-/*
 // AnimatedCircuits
 #include "AnimatedCircuits/src/plugin.hpp"
-*/
 
 // Aria
 /* NOTE too much noise in original include, do this a different way
@@ -524,7 +522,7 @@ Plugin* pluginInstance__Cardinal;
 #ifndef NOPLUGINS
 Plugin* pluginInstance__21kHz;
 Plugin* pluginInstance__AmalgamatedHarmonics;
-// Plugin* pluginInstance__AnimatedCircuits;
+Plugin* pluginInstance__AnimatedCircuits;
 Plugin* pluginInstance__Aria;
 Plugin* pluginInstance__AudibleInstruments;
 extern Plugin* pluginInstance__Autinn;
@@ -749,7 +747,6 @@ static void initStatic__AmalgamatedHarmonics()
     }
 }
 
-/*
 static void initStatic__AnimatedCircuits()
 {
     Plugin* const p = new Plugin;
@@ -762,7 +759,6 @@ static void initStatic__AnimatedCircuits()
         p->addModel(model_AC_LFold);
     }
 }
-*/
 
 static void initStatic__Aria()
 {
@@ -1853,7 +1849,7 @@ void initStaticPlugins()
 #ifndef NOPLUGINS
     initStatic__21kHz();
     initStatic__AmalgamatedHarmonics();
-    // initStatic__AnimatedCircuits();
+    initStatic__AnimatedCircuits();
     initStatic__Aria();
     initStatic__AudibleInstruments();
     initStatic__Autinn();

src/custom/dep.cpp

@@ -56,12 +56,6 @@ static const struct {
     { "/21kHz/res/Panels/D_Inf.svg", {}, -1 },
     { "/21kHz/res/Panels/PalmLoop.svg", {}, -1 },
     { "/21kHz/res/Panels/TachyonEntangler.svg", {}, -1 },
-    // CC-BY-NC-SA-4.0, logo is meant to be removed and name changed on derivative works
-    /* Pending https://github.com/AnimatedCircuits/RackModules/issues/7
-    { "/AnimatedCircuits/res/FoldingLight.svg", {}, -1 },
-    { "/AnimatedCircuits/res/LFoldLight.svg", {}, -1 },
-    { "/AnimatedCircuits/res/Knob_Black_Light_21.svg", {}, -1 },
-    */
     // Custom, runtime dark mode used with permission
     { "/AudibleInstruments/res/Blinds.svg", {}, -1 },
     { "/AudibleInstruments/res/Braids.svg", {}, -1 },
@@ -271,13 +265,6 @@ 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)
     {
@@ -342,8 +329,6 @@ 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: