Browse Source

add Prism (#75)

* add Prism

* add _CUSTOM types
tags/22.02
dreamer GitHub 4 years ago
parent
commit
b16f955802
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 41 additions and 3 deletions
  1. +3
    -0
      .gitmodules
  2. +1
    -0
      doc/LICENSES.md
  3. +16
    -0
      plugins/Makefile
  4. +1
    -0
      plugins/Prism
  5. +19
    -0
      plugins/plugins.cpp
  6. +1
    -0
      plugins/res/Prism
  7. +0
    -3
      plugins/todo.txt

+ 3
- 0
.gitmodules View File

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

+ 1
- 0
doc/LICENSES.md 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 | |
| Mog | CC0-1.0 | |
| mscHack | BSD-3-Clause | |
| Prism | BSD-3-Clause | |
| Rackwindows | MIT | |
| repelzen | GPL-3.0-or-later | |
| Sonus Modular | GPL-3.0-or-later | |


+ 16
- 0
plugins/Makefile View File

@@ -517,6 +517,15 @@ 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

# --------------------------------------------------------------
# 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

@@ -1123,6 +1132,13 @@ $(BUILD_DIR)/mscHack/%.cpp.o: mscHack/%.cpp
-Wno-non-c-typedef-for-linkage \
-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
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"


+ 1
- 0
plugins/Prism

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

+ 19
- 0
plugins/plugins.cpp View File

@@ -419,6 +419,9 @@ extern Model *modelAlienz;
extern Model *modelOSC_WaveMorph_3;
extern Model *modelMaude_221;

// Prism
# include "Prism/src/plugin.hpp"

// rackwindows
#include "rackwindows/src/plugin.hpp"

@@ -489,6 +492,7 @@ Plugin* pluginInstance__Lyrae;
extern Plugin* pluginInstance__MindMeld;
Plugin* pluginInstance__Mog;
extern Plugin* pluginInstance__mscHack;
Plugin* pluginInstance__Prism;
Plugin* pluginInstance__rackwindows;
Plugin* pluginInstance__repelzen;
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()
{
Plugin* const p = new Plugin;
@@ -1751,6 +1769,7 @@ void initStaticPlugins()
initStatic__MindMeld();
initStatic__Mog();
initStatic__mscHack();
initStatic__Prism();
initStatic__rackwindows();
initStatic__repelzen();
initStatic__sonusmodular();


+ 1
- 0
plugins/res/Prism View File

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

+ 0
- 3
plugins/todo.txt View File

@@ -25,9 +25,6 @@ LindenbergResearch 43959.0 (not opensource?)
Geodesics 42761.0
https://github.com/MarcBoule/Geodesics

HetrickCV 42077.0
https://github.com/mhetrick/hetrickcv

Alikins 41798.0
https://github.com/alikins/Alikins-rack-plugins



Loading…
Cancel
Save