add Prism (#75)

* add Prism

* add _CUSTOM types
This commit is contained in:
dreamer 2021-12-09 00:46:38 +01:00 committed by GitHub
parent c8dea01ab9
commit b16f955802
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 41 additions and 3 deletions

3
.gitmodules vendored
View file

@ -109,3 +109,6 @@
[submodule "plugins/LittleUtils"] [submodule "plugins/LittleUtils"]
path = plugins/LittleUtils path = plugins/LittleUtils
url = https://github.com/CardinalModules/Little-Utils.git url = https://github.com/CardinalModules/Little-Utils.git
[submodule "plugins/Prism"]
path = plugins/Prism
url = https://github.com/SteveRussell33/Prism.git

View file

@ -39,6 +39,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
| MindMeld | GPL-3.0-or-later | | | MindMeld | GPL-3.0-or-later | |
| Mog | CC0-1.0 | | | Mog | CC0-1.0 | |
| mscHack | BSD-3-Clause | | | mscHack | BSD-3-Clause | |
| Prism | BSD-3-Clause | |
| Rackwindows | MIT | | | Rackwindows | MIT | |
| repelzen | GPL-3.0-or-later | | | repelzen | GPL-3.0-or-later | |
| Sonus Modular | GPL-3.0-or-later | | | Sonus Modular | GPL-3.0-or-later | |

View file

@ -517,6 +517,15 @@ PLUGIN_FILES += $(wildcard mscHack/src/*.cpp)
# modules/types which are present in other plugins # 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 MSCHACK_CUSTOM_PER_FILE = MAIN_SYNC_CLOCK FILTER_STRUCT FILTER_PARAM_STRUCT OSC_PARAM_STRUCT PHRASE_CHANGE_STRUCT
# --------------------------------------------------------------
# Prism
PLUGIN_FILES += $(filter-out Prism/src/plugin.cpp, $(wildcard Prism/src/*.cpp))
PLUGIN_FILES += $(wildcard Prism/src/scales/*.cpp)
# modules/types which are present in other plugins
PRISM_CUSTOM = bogaudio Scale FilterSetting
# -------------------------------------------------------------- # --------------------------------------------------------------
# rackwindows # rackwindows
@ -1123,6 +1132,13 @@ $(BUILD_DIR)/mscHack/%.cpp.o: mscHack/%.cpp
-Wno-non-c-typedef-for-linkage \ -Wno-non-c-typedef-for-linkage \
-Wno-unused-but-set-variable -Wno-unused-but-set-variable
$(BUILD_DIR)/Prism/%.cpp.o: Prism/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(PRISM_CUSTOM),$(call custom_module_names,$(m),Prism)) \
-DpluginInstance=pluginInstance__Prism \
$(BUILD_DIR)/rackwindows/%.cpp.o: rackwindows/%.cpp $(BUILD_DIR)/rackwindows/%.cpp.o: rackwindows/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<" @echo "Compiling $<"

1
plugins/Prism Submodule

@ -0,0 +1 @@
Subproject commit 6b2510c601db8bd3b57cd5eef8c2924cb8badfc7

View file

@ -419,6 +419,9 @@ extern Model *modelAlienz;
extern Model *modelOSC_WaveMorph_3; extern Model *modelOSC_WaveMorph_3;
extern Model *modelMaude_221; extern Model *modelMaude_221;
// Prism
# include "Prism/src/plugin.hpp"
// rackwindows // rackwindows
#include "rackwindows/src/plugin.hpp" #include "rackwindows/src/plugin.hpp"
@ -489,6 +492,7 @@ Plugin* pluginInstance__Lyrae;
extern Plugin* pluginInstance__MindMeld; extern Plugin* pluginInstance__MindMeld;
Plugin* pluginInstance__Mog; Plugin* pluginInstance__Mog;
extern Plugin* pluginInstance__mscHack; extern Plugin* pluginInstance__mscHack;
Plugin* pluginInstance__Prism;
Plugin* pluginInstance__rackwindows; Plugin* pluginInstance__rackwindows;
Plugin* pluginInstance__repelzen; Plugin* pluginInstance__repelzen;
Plugin* pluginInstance__sonusmodular; Plugin* pluginInstance__sonusmodular;
@ -1568,6 +1572,20 @@ static void initStatic__mscHack()
} }
} }
static void initStatic__Prism()
{
Plugin* const p = new Plugin;
pluginInstance__Prism = p;
const StaticPluginLoader spl(p, "Prism");
if (spl.ok())
{
p->addModel(modelRainbow);
p->addModel(modelRainbowScaleExpander);
p->addModel(modelDroplet);
}
}
static void initStatic__rackwindows() static void initStatic__rackwindows()
{ {
Plugin* const p = new Plugin; Plugin* const p = new Plugin;
@ -1751,6 +1769,7 @@ void initStaticPlugins()
initStatic__MindMeld(); initStatic__MindMeld();
initStatic__Mog(); initStatic__Mog();
initStatic__mscHack(); initStatic__mscHack();
initStatic__Prism();
initStatic__rackwindows(); initStatic__rackwindows();
initStatic__repelzen(); initStatic__repelzen();
initStatic__sonusmodular(); initStatic__sonusmodular();

1
plugins/res/Prism Symbolic link
View file

@ -0,0 +1 @@
../Prism/res/

View file

@ -25,9 +25,6 @@ LindenbergResearch 43959.0 (not opensource?)
Geodesics 42761.0 Geodesics 42761.0
https://github.com/MarcBoule/Geodesics https://github.com/MarcBoule/Geodesics
HetrickCV 42077.0
https://github.com/mhetrick/hetrickcv
Alikins 41798.0 Alikins 41798.0
https://github.com/alikins/Alikins-rack-plugins https://github.com/alikins/Alikins-rack-plugins