Skip to content

Commit 7f15ad2

Browse files
committed
Add Geodesics modules
Adding them was straightforward. A few symbols resulted in duplicates when linking, hence the extra "-D" hackery in the plugins Makefile.
1 parent 9d7bd15 commit 7f15ad2

File tree

6 files changed

+46
-3
lines changed

6 files changed

+46
-3
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,6 @@
130130
[submodule "plugins/ExpertSleepers-Encoders"]
131131
path = plugins/ExpertSleepers-Encoders
132132
url = https://github.com/expertsleepersltd/vcvrack-encoders.git
133+
[submodule "plugins/Geodesics"]
134+
path = plugins/Geodesics
135+
url = https://github.com/MarcBoule/Geodesics.git

doc/LICENSES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
3232
| Extratone | GPL-3.0-or-later | |
3333
| Fehler Fabrik | GPL-3.0-or-later | |
3434
| Fundamental | GPL-3.0-or-later | |
35+
| Geodesics | GPL-3.0-or-later | |
3536
| Glue the Giant | GPL-3.0-or-later | |
3637
| Grande | GPL-3.0-or-later | |
3738
| HetrickCV | CC0-1.0 | |

plugins/Geodesics

Submodule Geodesics added at ae163f9

plugins/Makefile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,11 @@ PLUGIN_FILES += Fundamental/src/dr_wav.c
451451
# modules/types which are present in other plugins
452452
FUNDAMENTAL_CUSTOM = $(DRWAV)
453453

454+
# --------------------------------------------------------------
455+
# Geodesics
456+
457+
PLUGIN_FILES += $(filter-out Geodesics/src/plugin.cpp,$(wildcard Geodesics/src/*.cpp))
458+
454459
# --------------------------------------------------------------
455460
# GlueTheGiant
456461

@@ -1074,6 +1079,16 @@ $(BUILD_DIR)/Fundamental/%.cpp.o: Fundamental/%.cpp
10741079
$(foreach m,$(FUNDAMENTAL_CUSTOM),$(call custom_module_names,$(m),Fundamental)) \
10751080
-DpluginInstance=pluginInstance__Fundamental
10761081

1082+
$(BUILD_DIR)/Geodesics/%.cpp.o: Geodesics/%.cpp
1083+
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
1084+
@echo "Compiling $<"
1085+
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
1086+
$(foreach m,$(GEODESICS_CUSTOM),$(call custom_module_names,$(m),Geodesics)) \
1087+
-DpluginInstance=pluginInstance__Geodesics \
1088+
-DsaveDarkAsDefault=saveDarkAsDefault__Geodesics \
1089+
-DisDark=isDark__Geodesics \
1090+
-Dinit=init__Geodesics
1091+
10771092
$(BUILD_DIR)/GlueTheGiant/%.cpp.o: GlueTheGiant/%.cpp
10781093
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
10791094
@echo "Compiling $<"

plugins/plugins.cpp

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,9 @@ void setupSamples();
268268
// Fundamental
269269
#include "Fundamental/src/plugin.hpp"
270270

271+
// Geodesics
272+
#include "Geodesics/src/Geodesics.hpp"
273+
271274
// GlueTheGiant
272275
#include "GlueTheGiant/src/plugin.hpp"
273276
bool audition_mixer = false;
@@ -516,6 +519,7 @@ Plugin* pluginInstance__ExpertSleepersEncoders;
516519
Plugin* pluginInstance__Extratone;
517520
Plugin* pluginInstance__FehlerFabrik;
518521
Plugin* pluginInstance__Fundamental;
522+
extern Plugin* pluginInstance__Geodesics;
519523
Plugin* pluginInstance__GrandeModular;
520524
Plugin* pluginInstance__GlueTheGiant;
521525
Plugin* pluginInstance__HetrickCV;
@@ -1381,6 +1385,27 @@ static void initStatic__Fundamental()
13811385
}
13821386
}
13831387

1388+
static void initStatic__Geodesics()
1389+
{
1390+
Plugin* const p = new Plugin;
1391+
pluginInstance__Geodesics = p;
1392+
1393+
const StaticPluginLoader spl(p, "Geodesics");
1394+
if (spl.ok())
1395+
{
1396+
p->addModel(modelBlackHoles);
1397+
p->addModel(modelPulsars);
1398+
p->addModel(modelBranes);
1399+
p->addModel(modelIons);
1400+
p->addModel(modelEntropia);
1401+
p->addModel(modelEnergy);
1402+
p->addModel(modelTorus);
1403+
p->addModel(modelFate);
1404+
p->addModel(modelBlankLogo);
1405+
p->addModel(modelBlankInfo);
1406+
}
1407+
}
1408+
13841409
static void initStatic__GlueTheGiant()
13851410
{
13861411
Plugin* const p = new Plugin;
@@ -1895,6 +1920,7 @@ void initStaticPlugins()
18951920
initStatic__Extratone();
18961921
initStatic__FehlerFabrik();
18971922
initStatic__Fundamental();
1923+
initStatic__Geodesics();
18981924
initStatic__GlueTheGiant();
18991925
initStatic__GrandeModular();
19001926
initStatic__HetrickCV();

plugins/todo.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ https://github.com/squinkylabs/SquinkyVCV
2222

2323
LindenbergResearch 43959.0 (not opensource?)
2424

25-
Geodesics 42761.0
26-
https://github.com/MarcBoule/Geodesics
27-
2825
Alikins 41798.0
2926
https://github.com/alikins/Alikins-rack-plugins
3027

0 commit comments

Comments
 (0)