From 7ad235cbdd26d1375bbb6338ff87abb171014959 Mon Sep 17 00:00:00 2001 From: dreamer Date: Thu, 24 Feb 2022 20:27:34 +0100 Subject: [PATCH] adding Orbits --- .gitmodules | 3 +++ README.md | 1 + docs/LICENSES.md | 3 +++ plugins/Makefile | 12 ++++++++++++ plugins/Orbits | 1 + plugins/plugins.cpp | 18 ++++++++++++++++++ 6 files changed, 38 insertions(+) create mode 160000 plugins/Orbits diff --git a/.gitmodules b/.gitmodules index 6ad5006..75badf8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -151,3 +151,6 @@ [submodule "plugins/ML_modules"] path = plugins/ML_modules url = https://github.com/martin-lueders/ML_modules.git +[submodule "plugins/Orbits"] + path = plugins/Orbits + url = git@github.com:RareBreeds/Orbits.git diff --git a/README.md b/README.md index 6cde881..f0730c6 100644 --- a/README.md +++ b/README.md @@ -138,6 +138,7 @@ At the moment the following 3rd-party modules are provided: - Mockba Modular - Mog - mscHack +- Orbits - Prism - rackwindows - repelzen diff --git a/docs/LICENSES.md b/docs/LICENSES.md index 3a519c2..791056b 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -49,6 +49,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | Mockba Modular | MIT | | | Mog | CC0-1.0 | | | mscHack | BSD-3-Clause | | +| Orbits | GPL-3.0-or-later | | | Prism | BSD-3-Clause | | | Rackwindows | MIT | | | repelzen | GPL-3.0-or-later | | @@ -145,6 +146,8 @@ Below is a list of artwork licenses from plugins | Mog/components/* | CC-BY-NC-4.0 | | | Mog/Exo2-BoldItalic.ttf | OFL-1.1-RFN | | | mscHack/* | BSD-3-Clause | No artwork specific license provided, see [mschack#108](https://github.com/mschack/VCV-Rack-Plugins/issues/108) | +| Orbits/* | CC-BY-NC-ND-4.0 | | +| Orbits/fonts/ShareTechMono-Regular.ttf | OFL-1.1-RFN | | | Prism/* | CC-BY-SA-4.0 | | | Prism/RobotoCondensed-Regular.ttf | Apache-2.0 | | | Rackwindows/* | MIT | [Same license as source code](https://github.com/n0jo/rackwindows/issues/15) | diff --git a/plugins/Makefile b/plugins/Makefile index dfd9917..c84ce10 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -635,6 +635,11 @@ PLUGIN_FILES += $(wildcard mscHack/src/*.cpp) # modules/types which are present in other plugins MSCHACK_CUSTOM_PER_FILE = MAIN_SYNC_CLOCK FILTER_STRUCT FILTER_PARAM_STRUCT OSC_PARAM_STRUCT PHRASE_CHANGE_STRUCT +# -------------------------------------------------------------- +# Orbits + +PLUGIN_FILES += $(wildcard Orbits/src/*.cpp) + # -------------------------------------------------------------- # Prism @@ -1460,6 +1465,13 @@ $(BUILD_DIR)/mscHack/%.cpp.o: mscHack/%.cpp -Wno-non-c-typedef-for-linkage \ -Wno-unused-but-set-variable +$(BUILD_DIR)/Orbits/%.cpp.o: Orbits/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(ORBITS_CUSTOM),$(call custom_module_names,$(m),Orbits)) \ + -DpluginInstance=pluginInstance__Orbits + $(BUILD_DIR)/Prism/%.cpp.o: Prism/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/Orbits b/plugins/Orbits new file mode 160000 index 0000000..ff0c007 --- /dev/null +++ b/plugins/Orbits @@ -0,0 +1 @@ +Subproject commit ff0c007feb9ed1de57ea246f86e8b2b68572f5e6 diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index a6305ef..2754356 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -546,6 +546,9 @@ extern Model* modelAlienz; extern Model* modelOSC_WaveMorph_3; extern Model* modelMaude_221; +// Orbits +#include "Orbits/src/plugin.hpp" + // Prism # include "Prism/src/plugin.hpp" @@ -655,6 +658,7 @@ Plugin* pluginInstance__ML; Plugin* pluginInstance__MockbaModular; Plugin* pluginInstance__Mog; extern Plugin* pluginInstance__mscHack; +Plugin* pluginInstance__Orbits; Plugin* pluginInstance__Prism; Plugin* pluginInstance__rackwindows; Plugin* pluginInstance__repelzen; @@ -1977,6 +1981,19 @@ static void initStatic__mscHack() } } +static void initStatic__Orbits() +{ + Plugin* const p = new Plugin; + pluginInstance__Orbits = p; + + const StaticPluginLoader spl(p, "Orbits"); + if (spl.ok()) + { + p->addModel(modelRareBreeds_Orbits_Eugene); + p->addModel(modelRareBreeds_Orbits_Polygene); + } +} + static void initStatic__Prism() { Plugin* const p = new Plugin; @@ -2208,6 +2225,7 @@ void initStaticPlugins() initStatic__MockbaModular(); initStatic__Mog(); initStatic__mscHack(); + initStatic__Orbits(); initStatic__Prism(); initStatic__rackwindows(); initStatic__repelzen();