@@ -206,3 +206,6 @@ | |||||
[submodule "plugins/forsitan-modulare"] | [submodule "plugins/forsitan-modulare"] | ||||
path = plugins/forsitan-modulare | path = plugins/forsitan-modulare | ||||
url = https://github.com/gosub/forsitan-modulare.git | url = https://github.com/gosub/forsitan-modulare.git | ||||
[submodule "plugins/myth-modules"] | |||||
path = plugins/myth-modules | |||||
url = https://github.com/Ahineya/vcv-myth-plugin.git |
@@ -154,6 +154,7 @@ At the moment the following 3rd-party modules are provided: | |||||
- Mog | - Mog | ||||
- mscHack | - mscHack | ||||
- MSM | - MSM | ||||
- Myth | |||||
- Nonlinear Circuits | - Nonlinear Circuits | ||||
- Orbits | - Orbits | ||||
- Parable Instruments | - Parable Instruments | ||||
@@ -60,6 +60,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | |||||
| Mog | CC0-1.0 | | | | Mog | CC0-1.0 | | | ||||
| mscHack | BSD-3-Clause | | | | mscHack | BSD-3-Clause | | | ||||
| MSM | MIT | Repo's [LICENSE-dist.md](https://github.com/netboy3/MSM-vcvrack-plugin/issues/10) includes wrong information | | | MSM | MIT | Repo's [LICENSE-dist.md](https://github.com/netboy3/MSM-vcvrack-plugin/issues/10) includes wrong information | | ||||
| Myth | GPL-3.0-or-later | | | |||||
| Nonlinear Circuits | CC0-1.0 | | | | Nonlinear Circuits | CC0-1.0 | | | ||||
| Orbits | GPL-3.0-or-later | | | | Orbits | GPL-3.0-or-later | | | ||||
| Parable Instruments | GPL-3.0-or-later | | | | Parable Instruments | GPL-3.0-or-later | | | ||||
@@ -187,6 +188,7 @@ Below is a list of artwork licenses from plugins | |||||
| MSM/Fonts/DejaVuSansMono.ttf | Bitstream-Vera | | | | MSM/Fonts/DejaVuSansMono.ttf | Bitstream-Vera | | | ||||
| MSM/Fonts/Segment7Standard.ttf | OFL-1.1-RFN | | | | MSM/Fonts/Segment7Standard.ttf | OFL-1.1-RFN | | | ||||
| MSM/Fonts/Sudo.ttf | OFL-1.1-no-RFN | | | | MSM/Fonts/Sudo.ttf | OFL-1.1-no-RFN | | | ||||
| Myth/* | GPL-3.0-or-later | No artwork specific license provided | | |||||
| nonlinearcircuits/* | CC0-1.0 | No artwork specific license provided | | | nonlinearcircuits/* | CC0-1.0 | No artwork specific license provided | | ||||
| nonlinearcircuits/Audiowide-Regular.ttf | OFL-1.1-RFN | | | | nonlinearcircuits/Audiowide-Regular.ttf | OFL-1.1-RFN | | | ||||
| Orbits/* | CC-BY-NC-ND-4.0 | | | | Orbits/* | CC-BY-NC-ND-4.0 | | | ||||
@@ -727,6 +727,11 @@ PLUGIN_FILES += $(filter-out MSM/src/MSM.cpp,$(wildcard MSM/src/*.cpp)) | |||||
# modules/types which are present in other plugins | # modules/types which are present in other plugins | ||||
MSM_CUSTOM = ADSR BlankPanel Delay LFO LowFrequencyOscillator Mult Noise OP VCA VCO sawTable triTable | MSM_CUSTOM = ADSR BlankPanel Delay LFO LowFrequencyOscillator Mult Noise OP VCA VCO sawTable triTable | ||||
# -------------------------------------------------------------- | |||||
# myth-modules | |||||
PLUGIN_FILES += $(filter-out myth-modules/src/plugin.cpp,$(wildcard myth-modules/src/*.cpp)) | |||||
# -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
# Nonlinear Circuits | # Nonlinear Circuits | ||||
@@ -1709,6 +1714,13 @@ $(BUILD_DIR)/MSM/%.cpp.o: MSM/%.cpp | |||||
-DpluginInstance=pluginInstance__MSM \ | -DpluginInstance=pluginInstance__MSM \ | ||||
-DDARKTHEME | -DDARKTHEME | ||||
$(BUILD_DIR)/myth-modules/%.cpp.o: myth-modules/%.cpp | |||||
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" | |||||
@echo "Compiling $<" | |||||
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ | |||||
$(foreach m,$(MYTH_MODULES_CUSTOM),$(call custom_module_names,$(m),myth_modules)) \ | |||||
-DpluginInstance=pluginInstance__myth_modules | |||||
$(BUILD_DIR)/nonlinearcircuits/%.cpp.o: nonlinearcircuits/%.cpp | $(BUILD_DIR)/nonlinearcircuits/%.cpp.o: nonlinearcircuits/%.cpp | ||||
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" | -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" | ||||
@echo "Compiling $<" | @echo "Compiling $<" | ||||
@@ -0,0 +1 @@ | |||||
Subproject commit e511dd95eca830ee74fef23bddc195696603125f |
@@ -631,6 +631,9 @@ extern Model* modelBlankPanel; | |||||
#undef modelVCA | #undef modelVCA | ||||
#undef modelVCO | #undef modelVCO | ||||
// myth-modules | |||||
#include "myth-modules/src/plugin.hpp" | |||||
// Nonlinear Circuits | // Nonlinear Circuits | ||||
#include "nonlinearcircuits/src/NLC.hpp" | #include "nonlinearcircuits/src/NLC.hpp" | ||||
@@ -759,6 +762,7 @@ Plugin* pluginInstance__MockbaModular; | |||||
Plugin* pluginInstance__Mog; | Plugin* pluginInstance__Mog; | ||||
extern Plugin* pluginInstance__mscHack; | extern Plugin* pluginInstance__mscHack; | ||||
Plugin* pluginInstance__MSM; | Plugin* pluginInstance__MSM; | ||||
Plugin* pluginInstance__myth_modules; | |||||
Plugin* pluginInstance__nonlinearcircuits; | Plugin* pluginInstance__nonlinearcircuits; | ||||
Plugin* pluginInstance__Orbits; | Plugin* pluginInstance__Orbits; | ||||
Plugin* pluginInstance__ParableInstruments; | Plugin* pluginInstance__ParableInstruments; | ||||
@@ -2343,6 +2347,19 @@ static void initStatic__MSM() | |||||
} | } | ||||
} | } | ||||
static void initStatic__myth_modules() | |||||
{ | |||||
Plugin* const p = new Plugin; | |||||
pluginInstance__myth_modules = p; | |||||
const StaticPluginLoader spl(p, "myth-modules"); | |||||
if (spl.ok()) | |||||
{ | |||||
p->addModel(modelMavka); | |||||
p->addModel(modelMolphar); | |||||
} | |||||
} | |||||
static void initStatic__nonlinearcircuits() | static void initStatic__nonlinearcircuits() | ||||
{ | { | ||||
Plugin* const p = new Plugin; | Plugin* const p = new Plugin; | ||||
@@ -2726,6 +2743,7 @@ void initStaticPlugins() | |||||
initStatic__Mog(); | initStatic__Mog(); | ||||
initStatic__mscHack(); | initStatic__mscHack(); | ||||
initStatic__MSM(); | initStatic__MSM(); | ||||
initStatic__myth_modules(); | |||||
initStatic__nonlinearcircuits(); | initStatic__nonlinearcircuits(); | ||||
initStatic__Orbits(); | initStatic__Orbits(); | ||||
initStatic__ParableInstruments(); | initStatic__ParableInstruments(); | ||||
@@ -1,6 +1,6 @@ | |||||
/* | /* | ||||
* DISTRHO Cardinal Plugin | * DISTRHO Cardinal Plugin | ||||
* Copyright (C) 2021 Filipe Coelho <falktx@falktx.com> | |||||
* Copyright (C) 2021-2022 Filipe Coelho <falktx@falktx.com> | |||||
* | * | ||||
* This program is free software; you can redistribute it and/or | * This program is free software; you can redistribute it and/or | ||||
* modify it under the terms of the GNU General Public License as | * modify it under the terms of the GNU General Public License as | ||||
@@ -268,6 +268,9 @@ static const struct { | |||||
{ "/kocmoc/res/SKF.svg", {}, -1 }, | { "/kocmoc/res/SKF.svg", {}, -1 }, | ||||
{ "/kocmoc/res/SVF.svg", {}, -1 }, | { "/kocmoc/res/SVF.svg", {}, -1 }, | ||||
{ "/kocmoc/res/TRG.svg", {}, -1 }, | { "/kocmoc/res/TRG.svg", {}, -1 }, | ||||
// GPL-3.0-or-later | |||||
{ "/myth-modules/res/Mavka.svg", {}, -1 }, | |||||
{ "/myth-modules/res/Molphar.svg", {}, -1 }, | |||||
// CC0-1.0 | // CC0-1.0 | ||||
{ "/nonlinearcircuits/res/BOOLs2.svg", {}, -1 }, | { "/nonlinearcircuits/res/BOOLs2.svg", {}, -1 }, | ||||
{ "/nonlinearcircuits/res/DoubleNeuronRef.svg", {}, -1 }, | { "/nonlinearcircuits/res/DoubleNeuronRef.svg", {}, -1 }, | ||||
@@ -549,6 +552,7 @@ static inline bool invertPaint(NSVGshape* const shape, NSVGpaint& paint, const c | |||||
{ | { | ||||
// scopes or other special things (do nothing) | // scopes or other special things (do nothing) | ||||
case 0x40ffffff: | case 0x40ffffff: | ||||
case 0xff0000aa: | |||||
case 0xff004200: | case 0xff004200: | ||||
case 0xff2b281e: | case 0xff2b281e: | ||||
case 0xff2d2827: | case 0xff2d2827: | ||||