Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added eightfold. #735

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -260,4 +260,7 @@
[submodule "plugins/admiral"]
path = plugins/admiral
url = https://github.com/wapiflapi/admiral.git
[submodule "plugins/eightfold"]
path = plugins/eightfold
url = https://github.com/scanner-darkly/eightfold.git

1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ At the moment the following 3rd-party modules are provided:
- [dBiz](https://github.com/dBiz/dBiz)
- [DHE Modules](https://github.com/dhemery/DHE-Modules)
- [DrumKit](https://svmodular.com/plugin/vcv/drumkit.html)
- [eightfold](https://github.com/scanner-darkly/eightfold)
- [EnigmaCurry](https://github.com/EnigmaCurry/EnigmaCurry-vcv-pack)
- [E-Series](https://github.com/VCVRack/ESeries)
- [ExpertSleepers Encoders](https://expert-sleepers.co.uk/vcvrack_encoders.html)
Expand Down
1 change: 1 addition & 0 deletions docs/LICENSES.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ Below follows a list of all code licenses used in Cardinal and linked submodules
| dBiz | GPL-3.0-or-later | |
| DHE-Modules | MIT | |
| DrumKit | CC0-1.0 | |
| eightfold | GPL-3.0-or-later | |
| EnigmaCurry | GPL-3.0-or-later | |
| E-Series | GPL-3.0-or-later | |
| ExpertSleepers Encoders | MIT | |
Expand Down
18 changes: 18 additions & 0 deletions plugins/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,17 @@ PLUGIN_FILES += $(wildcard DrumKit/deps/SynthDevKit/src/*.cpp)
# modules/types which are present in other plugins
DRUMKIT_CUSTOM = ADSR Envelope LowFrequencyOscillator

# --------------------------------------------------------------
# eightfold

PLUGIN_FILES += $(filter-out eightfold/src/plugin.cpp,$(wildcard eightfold/src/*.cpp))
# modules/types which are present in other plugins
EIGHTFOLD_CUSTOM = Comparator comparator

# custom C++17 flags
rl2939 marked this conversation as resolved.
Show resolved Hide resolved
EIGHTFOLD_FLAGS = $(filter-out -std=gnu++11,$(BUILD_CXX_FLAGS))
EIGHTFOLD_FLAGS += -std=gnu++17

# --------------------------------------------------------------
# EnigmaCurry

Expand Down Expand Up @@ -2347,6 +2358,13 @@ $(BUILD_DIR)/DrumKit/%.cpp.o: DrumKit/%.cpp
-Dinit=init__DrumKit \
-Wno-sign-compare

$(BUILD_DIR)/eightfold/src/%.cpp.o: eightfold/src/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
$(SILENT)$(CXX) $< $(EIGHTFOLD_FLAGS) -c -o $@ \
$(foreach m,$(EIGHTFOLD_CUSTOM),$(call custom_module_names,$(m),eightfold)) \
-DpluginInstance=pluginInstance__eightfold

$(BUILD_DIR)/EnigmaCurry/src/%.cpp.o: EnigmaCurry/src/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
Expand Down
1 change: 1 addition & 0 deletions plugins/eightfold
Submodule eightfold added at a541c5
21 changes: 21 additions & 0 deletions plugins/plugins.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,9 @@ namespace xycloid { void init(Plugin*); }
#include "DrumKit/src/DrumKit.hpp"
void setupSamples();

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

// EnigmaCurry
#define modelPulse modelEnigmaCurryPulse
#include "EnigmaCurry/src/plugin.hpp"
Expand Down Expand Up @@ -948,6 +951,7 @@ Plugin* pluginInstance__CVfunk;
Plugin* pluginInstance__dBiz;
Plugin* pluginInstance__DHE;
extern Plugin* pluginInstance__DrumKit;
Plugin* pluginInstance__eightfold;
Plugin* pluginInstance__EnigmaCurry;
Plugin* pluginInstance__ESeries;
Plugin* pluginInstance__ExpertSleepersEncoders;
Expand Down Expand Up @@ -2151,6 +2155,22 @@ static void initStatic__DrumKit()
}
}

static void initStatic__eightfold()
{
Plugin* const p = new Plugin;
pluginInstance__eightfold = p;

const StaticPluginLoader spl(p, "eightfold");
if (spl.ok())
{
p->addModel(modelSDOrcasHeartV2);
p->addModel(modelSDFormation);
p->addModel(modelSDLines);
p->addModel(modelSDTransgate);
p->addModel(modelSDComparator);
}
}

static void initStatic__EnigmaCurry()
{
Plugin* const p = new Plugin;
Expand Down Expand Up @@ -3564,6 +3584,7 @@ void initStaticPlugins()
initStatic__dBiz();
initStatic__DHE();
initStatic__DrumKit();
initStatic__eightfold();
initStatic__EnigmaCurry();
initStatic__ESeries();
initStatic__ExpertSleepersEncoders();
Expand Down
Loading