From b2fcde5f2edb39789e1f2403768a084b6ace04be Mon Sep 17 00:00:00 2001 From: dreamer Date: Fri, 29 Apr 2022 02:06:51 +0200 Subject: [PATCH] adding PinkTrombone --- .gitmodules | 3 +++ README.md | 1 + docs/LICENSES.md | 2 ++ plugins/Makefile | 13 +++++++++++++ plugins/PinkTrombone | 1 + plugins/plugins.cpp | 17 +++++++++++++++++ 6 files changed, 37 insertions(+) create mode 160000 plugins/PinkTrombone diff --git a/.gitmodules b/.gitmodules index 6ecf1ba..bde711c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -190,3 +190,6 @@ [submodule "plugins/unless_modules"] path = plugins/unless_modules url = https://gitlab.com/unlessgames/unless_modules.git +[submodule "plugins/PinkTrombone"] + path = plugins/PinkTrombone + url = https://github.com/VegaDeftwing/PinkTromboneVCV.git diff --git a/README.md b/README.md index dcee0fb..21c9fda 100644 --- a/README.md +++ b/README.md @@ -155,6 +155,7 @@ At the moment the following 3rd-party modules are provided: - Orbits - Parable Instruments - Path Set +- PinkTrombone - Prism - rackwindows - repelzen diff --git a/docs/LICENSES.md b/docs/LICENSES.md index c8ccce1..bcbf781 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -61,6 +61,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | Orbits | GPL-3.0-or-later | | | Parable Instruments | GPL-3.0-or-later | | | Path Set | GPL-3.0-or-later | | +| PinkTrombone | GPL-3.0-or-later | | | Prism | BSD-3-Clause | | | Rackwindows | MIT | | | repelzen | GPL-3.0-or-later | | @@ -180,6 +181,7 @@ Below is a list of artwork licenses from plugins | Orbits/fonts/ShareTechMono-Regular.ttf | OFL-1.1-RFN | | | ParableInstruments/* | Custom | Copyright © Alex Brandt, [used and distributed with permission](https://github.com/adbrant/ArableInstruments/issues/21) | | PathSet/* | GPL-3.0-or-later | No artwork specific license provided | +| PinkTrombone/* | GPL-3.0-or-later | No artwork specific license provided | | 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 f398e45..5ddce85 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -730,6 +730,12 @@ PARABLE_CUSTOM = Clouds CustomPanel CloudsWidget FreezeLight clouds stmlib PLUGIN_FILES += $(filter-out PathSet/src/plugin.cpp,$(wildcard PathSet/src/*.cpp)) +# -------------------------------------------------------------- +# PinkTrombone + +PLUGIN_FILES += $(filter-out PinkTrombone/src/plugin.cpp,$(wildcard PinkTrombone/src/*.cpp)) +PLUGIN_FILES += $(wildcard PinkTrombone/src/PinkTrombone/*.cpp) + # -------------------------------------------------------------- # Prism @@ -1664,6 +1670,13 @@ $(BUILD_DIR)/PathSet/%.cpp.o: PathSet/%.cpp $(foreach m,$(PATHSET_CUSTOM),$(call custom_module_names,$(m),PathSet)) \ -DpluginInstance=pluginInstance__PathSet +$(BUILD_DIR)/PinkTrombone/%.cpp.o: PinkTrombone/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(PINKTROMBONE_CUSTOM),$(call custom_module_names,$(m),PinkTrombone)) \ + -DpluginInstance=pluginInstance__PinkTrombone + $(BUILD_DIR)/Prism/%.cpp.o: Prism/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/PinkTrombone b/plugins/PinkTrombone new file mode 160000 index 0000000..ea6ab0c --- /dev/null +++ b/plugins/PinkTrombone @@ -0,0 +1 @@ +Subproject commit ea6ab0c6887102ebbf6e3534e0e891b867b130cc diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index df7bafc..b71f89c 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -624,6 +624,9 @@ extern Model* modelBlankPanel; // Path Set #include "PathSet/src/plugin.hpp" +// PinkTrombone +#include "PinkTrombone/src/plugin.hpp" + // Prism #include "Prism/src/plugin.hpp" @@ -733,6 +736,7 @@ Plugin* pluginInstance__nonlinearcircuits; Plugin* pluginInstance__Orbits; Plugin* pluginInstance__ParableInstruments; Plugin* pluginInstance__PathSet; +Plugin* pluginInstance__PinkTrombone; Plugin* pluginInstance__Prism; Plugin* pluginInstance__rackwindows; Plugin* pluginInstance__repelzen; @@ -2257,6 +2261,18 @@ static void initStatic__PathSet() } } +static void initStatic__PinkTrombone() +{ + Plugin* const p = new Plugin; + pluginInstance__PinkTrombone = p; + + const StaticPluginLoader spl(p, "PinkTrombone"); + if (spl.ok()) + { + p->addModel(modelPinkTrombone); + } +} + static void initStatic__Prism() { Plugin* const p = new Plugin; @@ -2545,6 +2561,7 @@ void initStaticPlugins() initStatic__Orbits(); initStatic__ParableInstruments(); initStatic__PathSet(); + initStatic__PinkTrombone(); initStatic__Prism(); initStatic__rackwindows(); initStatic__repelzen();