Browse Source

adding alef's bits

pull/348/head
dreamer 3 years ago
parent
commit
a53baa175c
8 changed files with 77 additions and 9 deletions
  1. +0
    -4
      .github/workflows/build.yml
  2. +3
    -0
      .gitmodules
  3. +1
    -0
      README.md
  4. +2
    -0
      docs/LICENSES.md
  5. +16
    -1
      plugins/Makefile
  6. +1
    -0
      plugins/alefsbits
  7. +36
    -0
      plugins/plugins.cpp
  8. +18
    -4
      src/custom/dep.cpp

+ 0
- 4
.github/workflows/build.yml View File

@@ -697,10 +697,6 @@ jobs:
src/Rack/dep/speexdsp-SpeexDSP-1.2rc3
src/Rack/dep/zstd-1.4.5
key: wasm-v${{ env.CACHE_VERSION }}
- name: Enable extra swap
uses: pierotofy/set-swap-space@master
with:
swap-size-gb: 12
- name: Set up dependencies
run: |
[ -e ~/PawPawBuilds/emsdk ] || git clone https://github.com/emscripten-core/emsdk.git ~/PawPawBuilds/emsdk


+ 3
- 0
.gitmodules View File

@@ -209,3 +209,6 @@
[submodule "plugins/myth-modules"]
path = plugins/myth-modules
url = https://github.com/Ahineya/vcv-myth-plugin.git
[submodule "plugins/alefsbits"]
path = plugins/alefsbits
url = https://github.com/alefnull/alefsbits.git

+ 1
- 0
README.md View File

@@ -110,6 +110,7 @@ At the moment the following 3rd-party modules are provided:
- 21kHz
- 8Mode
- Aaron Static
- alef's bits
- AlgoritmArte
- Amalgamated Harmonics
- Animated Circuits


+ 2
- 0
docs/LICENSES.md View File

@@ -16,6 +16,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
| 21kHz | MIT | |
| 8Mode | BSD-3-Clause | |
| Aaron Static | MIT | |
| alef's bits | GPL-3.0-or-later | |
| AlgoritmArte | GPL-3.0-or-later | |
| Amalgamated Harmonics | BSD-3-Clause | |
| Animated Circuits | GPL-3.0-or-later | |
@@ -98,6 +99,7 @@ Below is a list of artwork licenses from plugins
| 8Mode | BSD-3-Clause | No artwork specific license provided |
| AaronStatic/* | MIT | No artwork specific license provided |
| AaronStatic/fonts/PixelOperator.ttf | CC0-1.0 | |
| alefsbits/* | GPL-3.0-or-later | No artwork specific license provided |
| Algoritmarte/* | GPL-3.0-or-later | No artwork specific license provided |
| Algoritmarte/LEDSliderGreenHandle.svg | CC-BY-NC-4.0 | |
| AmalgamatedHarmonics/* | BSD-3-Clause | No artwork specific license provided |


+ 16
- 1
plugins/Makefile View File

@@ -308,6 +308,14 @@ PLUGIN_FILES += $(filter-out 21kHz/src/21kHz.cpp,$(wildcard 21kHz/src/*.cpp))

PLUGIN_FILES += $(filter-out 8Mode/src/8mode.cpp,$(wildcard 8Mode/src/*.cpp))

# --------------------------------------------------------------
# alefsbits

PLUGIN_FILES += $(filter-out alefsbits/src/plugin.cpp,$(wildcard alefsbits/src/*.cpp))

# modules/types which are present in other plugins
ALEFSBITS_CUSTOM = Steps Logic

# --------------------------------------------------------------
# AlgoritmArte

@@ -1076,7 +1084,7 @@ endif

BUILD_C_FLAGS += -std=gnu11
BUILD_C_FLAGS += -fno-finite-math-only -fno-strict-aliasing
BUILD_CXX_FLAGS += -fno-finite-math-only -fno-strict-aliasing
BUILD_CXX_FLAGS += -fno-finite-math-only -fno-strict-aliasing

ifneq ($(MACOS),true)
BUILD_CXX_FLAGS += -faligned-new -Wno-abi
@@ -1387,6 +1395,13 @@ $(BUILD_DIR)/AaronStatic/%.cpp.o: AaronStatic/%.cpp
-DpluginInstance=pluginInstance__AaronStatic \
-Dinit=init__AaronStatic

$(BUILD_DIR)/alefsbits/%.cpp.o: alefsbits/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(ALEFSBITS_CUSTOM),$(call custom_module_names,$(m),alefsbits)) \
-DpluginInstance=pluginInstance__alefsbits

$(BUILD_DIR)/Algoritmarte/%.cpp.o: Algoritmarte/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"


+ 1
- 0
plugins/alefsbits

@@ -0,0 +1 @@
Subproject commit 2421aa2bd9f8eb41d1c89d48d4b17ce83e40f34a

+ 36
- 0
plugins/plugins.cpp View File

@@ -39,6 +39,13 @@
// Aaron Static
#include "AaronStatic/src/plugin.hpp"

// Alef's Bits
#define modelSteps modelalefsbitsSteps
#define modelLogic modelalefsbitsLogic
#include "alefsbits/src/plugin.hpp"
#undef modelSteps
#undef modelLogic

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

@@ -723,6 +730,7 @@ Plugin* pluginInstance__ZamAudio;
Plugin* pluginInstance__21kHz;
Plugin* pluginInstance__8Mode;
extern Plugin* pluginInstance__AaronStatic;
Plugin* pluginInstance__alefsbits;
Plugin* pluginInstance__Algoritmarte;
Plugin* pluginInstance__AmalgamatedHarmonics;
Plugin* pluginInstance__ArableInstruments;
@@ -1044,6 +1052,33 @@ static void initStatic__AaronStatic()
}
}

static void initStatic__alefsbits()
{
Plugin* const p = new Plugin;
pluginInstance__alefsbits = p;

const StaticPluginLoader spl(p, "alefsbits");
if (spl.ok())
{
#define modelSteps modelalefsbitsSteps
#define modelLogic modelalefsbitsLogic
p->addModel(modelSimplexandhold);
p->addModel(modelBlank6hp);
p->addModel(modelPolyrand);
p->addModel(modelNoize);
p->addModel(modelSteps);
p->addModel(modelFibb);
p->addModel(modelOctsclr);
p->addModel(modelShift);
p->addModel(modelMlt);
p->addModel(modelMath);
p->addModel(modelLogic);
p->addModel(modelSswitch);
#undef modelSteps
#undef modelLogic
}
}

static void initStatic__Algoritmarte()
{
Plugin* const p = new Plugin;
@@ -2724,6 +2759,7 @@ void initStaticPlugins()
initStatic__21kHz();
initStatic__8Mode();
initStatic__AaronStatic();
initStatic__alefsbits();
initStatic__Algoritmarte();
initStatic__AmalgamatedHarmonics();
initStatic__AnimatedCircuits();


+ 18
- 4
src/custom/dep.cpp View File

@@ -67,10 +67,24 @@ static const struct {
{ "/21kHz/res/Panels/PalmLoop.svg", {}, -1 },
{ "/21kHz/res/Panels/TachyonEntangler.svg", {}, -1 },
// MIT
{"/AaronStatic/res/ChordCV.svg", {}, -1 },
{"/AaronStatic/res/DiatonicCV.svg", {}, -1 },
{"/AaronStatic/res/RandomNoteCV.svg", {}, -1 },
{"/AaronStatic/res/ScaleCV.svg", {}, -1 },
{ "/AaronStatic/res/ChordCV.svg", {}, -1 },
{ "/AaronStatic/res/DiatonicCV.svg", {}, -1 },
{ "/AaronStatic/res/RandomNoteCV.svg", {}, -1 },
{ "/AaronStatic/res/ScaleCV.svg", {}, -1 },
// GPL3.0-or-later
{ "/alefsbits/res/blank6hp.svg", {}, -1 },
{ "/alefsbits/res/fibb.svg", {}, -1 },
{ "/alefsbits/res/logic.svg", {}, -1 },
{ "/alefsbits/res/math.svg", {}, -1 },
{ "/alefsbits/res/mlt.svg", {}, -1 },
{ "/alefsbits/res/noize.svg", {}, -1 },
{ "/alefsbits/res/octsclr.svg", {}, -1 },
{ "/alefsbits/res/polyrand.svg", {}, -1 },
{ "/alefsbits/res/shift.svg", {}, -1 },
{ "/alefsbits/res/simplexandhold.svg", {}, -1 },
{ "/alefsbits/res/simplexvco.svg", {}, -1 },
{ "/alefsbits/res/steps.svg", {}, -1 },
{ "/alefsbits/res/switch.svg", {}, -1 },
// GPL3.0-or-later
{ "/Algoritmarte/res/Clockkky.svg", {}, -1 },
{ "/Algoritmarte/res/CyclicCA.svg", {}, -1 },


Loading…
Cancel
Save