From 153608dea4067bfa07275932160c22e9b87e78ea Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Mon, 6 Dec 2021 20:26:52 +0000
Subject: [PATCH] Add LyraeModules

Signed-off-by: falkTX <falktx@falktx.com>
---
 .gitmodules              |  3 +++
 README.md                |  1 +
 plugins/LyraeModules     |  1 +
 plugins/Makefile         | 15 +++++++++++++++
 plugins/plugins.cpp      | 34 ++++++++++++++++++++++++++++++++++
 plugins/res/LyraeModules |  1 +
 6 files changed, 55 insertions(+)
 create mode 160000 plugins/LyraeModules
 create mode 120000 plugins/res/LyraeModules

diff --git a/.gitmodules b/.gitmodules
index bce4d7c..39f699f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -103,3 +103,6 @@
 [submodule "plugins/HetrickCV"]
 	path = plugins/HetrickCV
 	url = https://github.com/mhetrick/hetrickcv.git
+[submodule "plugins/LyraeModules"]
+	path = plugins/LyraeModules
+	url = https://github.com/VegaDeftwing/LyraeModules.git
diff --git a/README.md b/README.md
index 879e1ea..ebd5fb8 100644
--- a/README.md
+++ b/README.md
@@ -94,6 +94,7 @@ At the moment the following 3rd-party modules are provided:
 - HetrickCV
 - Impromptu
 - JW-Modules
+- LyraeModules
 - MindMeld
 - Mog
 - mscHack
diff --git a/plugins/LyraeModules b/plugins/LyraeModules
new file mode 160000
index 0000000..1c32b02
--- /dev/null
+++ b/plugins/LyraeModules
@@ -0,0 +1 @@
+Subproject commit 1c32b02bd11a549d28da0620719541ac6f966652
diff --git a/plugins/Makefile b/plugins/Makefile
index ae6e575..ed5ccff 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -473,6 +473,14 @@ endif
 # modules/types which are present in other plugins
 JW_CUSTOM = PlayHead Quantizer
 
+# --------------------------------------------------------------
+# LyraeModules
+
+PLUGIN_FILES += $(filter-out LyraeModules/src/plugin.cpp,$(wildcard LyraeModules/src/*.cpp))
+
+# modules/types which are present in other plugins
+LYRAE_CUSTOM = Delta
+
 # --------------------------------------------------------------
 # MindMeld
 
@@ -1045,6 +1053,13 @@ $(BUILD_DIR)/JW-Modules/%.cpp.o: JW-Modules/%.cpp
 		-Wno-unused-but-set-variable \
 		-Wno-unused-result
 
+$(BUILD_DIR)/LyraeModules/%.cpp.o: LyraeModules/%.cpp
+	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
+	@echo "Compiling $<"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
+		$(foreach m,$(LYRAE_CUSTOM),$(call custom_module_names,$(m),Lyrae)) \
+		-DpluginInstance=pluginInstance__Lyrae
+
 $(BUILD_DIR)/MindMeldModular/MindMeldModular.cpp.o: MindMeldModular/src/MindMeldModular.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp
index a7e532d..38541c3 100644
--- a/plugins/plugins.cpp
+++ b/plugins/plugins.cpp
@@ -356,6 +356,19 @@ extern Model *modelXYToPolar;
 #include "JW-Modules/src/JWModules.hpp"
 #undef modelQuantizer
 
+// LyraeModules
+/* NOTE too much noise in original include, do this a different way
+// #include "LyraeModules/src/plugin.hpp"
+*/
+#define modelDelta modelLyraeDelta
+extern Model* modelSulafat;
+extern Model* modelGamma;
+extern Model* modelDelta;
+extern Model* modelVega;
+extern Model* modelBD383238;
+extern Model* modelZeta;
+#undef modelDelta
+
 // MindMeldModular
 /* NOTE too much noise in original include, do this a different way
 // #include "MindMeldModular/src/MindMeldModular.hpp"
@@ -468,6 +481,7 @@ Plugin* pluginInstance__GlueTheGiant;
 Plugin* pluginInstance__HetrickCV;
 extern Plugin* pluginInstance__ImpromptuModular;
 Plugin* pluginInstance__JW;
+Plugin* pluginInstance__Lyrae;
 extern Plugin* pluginInstance__MindMeld;
 Plugin* pluginInstance__Mog;
 extern Plugin* pluginInstance__mscHack;
@@ -1445,6 +1459,25 @@ static void initStatic__JW()
     }
 }
 
+static void initStatic__Lyrae()
+{
+    Plugin* const p = new Plugin;
+    pluginInstance__Lyrae = p;
+
+    const StaticPluginLoader spl(p, "LyraeModules");
+    if (spl.ok())
+    {
+#define modelDelta modelLyraeDelta
+        p->addModel(modelSulafat);
+        p->addModel(modelGamma);
+        p->addModel(modelDelta);
+        p->addModel(modelVega);
+        p->addModel(modelBD383238);
+        p->addModel(modelZeta);
+#undef modelDelta
+    }
+}
+
 static void initStatic__MindMeld()
 {
     Plugin* const p = new Plugin;
@@ -1692,6 +1725,7 @@ void initStaticPlugins()
     initStatic__HetrickCV();
     initStatic__ImpromptuModular();
     initStatic__JW();
+    initStatic__Lyrae();
     initStatic__MindMeld();
     initStatic__Mog();
     initStatic__mscHack();
diff --git a/plugins/res/LyraeModules b/plugins/res/LyraeModules
new file mode 120000
index 0000000..408dfad
--- /dev/null
+++ b/plugins/res/LyraeModules
@@ -0,0 +1 @@
+../LyraeModules/res
\ No newline at end of file