@@ -190,3 +190,6 @@ | |||||
[submodule "plugins/unless_modules"] | [submodule "plugins/unless_modules"] | ||||
path = plugins/unless_modules | path = plugins/unless_modules | ||||
url = https://gitlab.com/unlessgames/unless_modules.git | url = https://gitlab.com/unlessgames/unless_modules.git | ||||
[submodule "plugins/PinkTrombone"] | |||||
path = plugins/PinkTrombone | |||||
url = https://github.com/VegaDeftwing/PinkTromboneVCV.git |
@@ -155,6 +155,7 @@ At the moment the following 3rd-party modules are provided: | |||||
- Orbits | - Orbits | ||||
- Parable Instruments | - Parable Instruments | ||||
- Path Set | - Path Set | ||||
- PinkTrombone | |||||
- Prism | - Prism | ||||
- rackwindows | - rackwindows | ||||
- repelzen | - repelzen | ||||
@@ -61,6 +61,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | |||||
| 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 | | | ||||
| Path Set | GPL-3.0-or-later | | | | Path Set | GPL-3.0-or-later | | | ||||
| PinkTrombone | GPL-3.0-or-later | | | |||||
| Prism | BSD-3-Clause | | | | Prism | BSD-3-Clause | | | ||||
| Rackwindows | MIT | | | | Rackwindows | MIT | | | ||||
| repelzen | GPL-3.0-or-later | | | | 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 | | | | 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) | | | 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 | | | 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/* | CC-BY-SA-4.0 | | | ||||
| Prism/RobotoCondensed-Regular.ttf | Apache-2.0 | | | | Prism/RobotoCondensed-Regular.ttf | Apache-2.0 | | | ||||
| Rackwindows/* | MIT | [Same license as source code](https://github.com/n0jo/rackwindows/issues/15) | | | Rackwindows/* | MIT | [Same license as source code](https://github.com/n0jo/rackwindows/issues/15) | | ||||
@@ -730,6 +730,12 @@ PARABLE_CUSTOM = Clouds CustomPanel CloudsWidget FreezeLight clouds stmlib | |||||
PLUGIN_FILES += $(filter-out PathSet/src/plugin.cpp,$(wildcard PathSet/src/*.cpp)) | 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 | # Prism | ||||
@@ -1664,6 +1670,13 @@ $(BUILD_DIR)/PathSet/%.cpp.o: PathSet/%.cpp | |||||
$(foreach m,$(PATHSET_CUSTOM),$(call custom_module_names,$(m),PathSet)) \ | $(foreach m,$(PATHSET_CUSTOM),$(call custom_module_names,$(m),PathSet)) \ | ||||
-DpluginInstance=pluginInstance__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 | $(BUILD_DIR)/Prism/%.cpp.o: Prism/%.cpp | ||||
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" | -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" | ||||
@echo "Compiling $<" | @echo "Compiling $<" | ||||
@@ -0,0 +1 @@ | |||||
Subproject commit ea6ab0c6887102ebbf6e3534e0e891b867b130cc |
@@ -624,6 +624,9 @@ extern Model* modelBlankPanel; | |||||
// Path Set | // Path Set | ||||
#include "PathSet/src/plugin.hpp" | #include "PathSet/src/plugin.hpp" | ||||
// PinkTrombone | |||||
#include "PinkTrombone/src/plugin.hpp" | |||||
// Prism | // Prism | ||||
#include "Prism/src/plugin.hpp" | #include "Prism/src/plugin.hpp" | ||||
@@ -733,6 +736,7 @@ Plugin* pluginInstance__nonlinearcircuits; | |||||
Plugin* pluginInstance__Orbits; | Plugin* pluginInstance__Orbits; | ||||
Plugin* pluginInstance__ParableInstruments; | Plugin* pluginInstance__ParableInstruments; | ||||
Plugin* pluginInstance__PathSet; | Plugin* pluginInstance__PathSet; | ||||
Plugin* pluginInstance__PinkTrombone; | |||||
Plugin* pluginInstance__Prism; | Plugin* pluginInstance__Prism; | ||||
Plugin* pluginInstance__rackwindows; | Plugin* pluginInstance__rackwindows; | ||||
Plugin* pluginInstance__repelzen; | 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() | static void initStatic__Prism() | ||||
{ | { | ||||
Plugin* const p = new Plugin; | Plugin* const p = new Plugin; | ||||
@@ -2545,6 +2561,7 @@ void initStaticPlugins() | |||||
initStatic__Orbits(); | initStatic__Orbits(); | ||||
initStatic__ParableInstruments(); | initStatic__ParableInstruments(); | ||||
initStatic__PathSet(); | initStatic__PathSet(); | ||||
initStatic__PinkTrombone(); | |||||
initStatic__Prism(); | initStatic__Prism(); | ||||
initStatic__rackwindows(); | initStatic__rackwindows(); | ||||
initStatic__repelzen(); | initStatic__repelzen(); | ||||