From f49a422dc382615996cdc7364f4d126cd7bcfb12 Mon Sep 17 00:00:00 2001 From: TheGuyWho0 Date: Tue, 5 Jul 2022 16:57:03 +0200 Subject: [PATCH 01/11] Added the submodule to the project. --- .gitmodules | 3 +++ plugins/Mojo | 1 + 2 files changed, 4 insertions(+) create mode 160000 plugins/Mojo diff --git a/.gitmodules b/.gitmodules index 8ed60c2e..93420ae1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -209,3 +209,6 @@ [submodule "plugins/myth-modules"] path = plugins/myth-modules url = https://github.com/Ahineya/vcv-myth-plugin.git +[submodule "plugins/Mojo"] + path = plugins/Mojo + url = https://github.com/tomdasilva/Mojo diff --git a/plugins/Mojo b/plugins/Mojo new file mode 160000 index 00000000..3bcad57f --- /dev/null +++ b/plugins/Mojo @@ -0,0 +1 @@ +Subproject commit 3bcad57fb308e7d4783b191bc7c52d55c0740846 From 9f1ed703c29e384035bdd1f1367de49c0ed64db7 Mon Sep 17 00:00:00 2001 From: TheGuyWho0 Date: Tue, 5 Jul 2022 17:03:42 +0200 Subject: [PATCH 02/11] Added the submodule to the project. --- plugins/Makefile | 17 +++++++++++++++-- plugins/plugins.cpp | 19 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/plugins/Makefile b/plugins/Makefile index d787fe44..4f419307 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -222,8 +222,8 @@ ifneq ($(HEADLESS),true) PLUGIN_FILES += Cardinal/src/ImGuiWidget.cpp PLUGIN_FILES += Cardinal/src/ImGuiTextEditor.cpp PLUGIN_FILES += Cardinal/src/SassyScope.cpp -PLUGIN_FILES += Cardinal/src/DearImGui.cpp -PLUGIN_FILES += Cardinal/src/DearImGuiColorTextEditor.cpp +PLUGIN_FILES += $(wildcard Cardinal/src/DearImGui/*.cpp) +PLUGIN_FILES += $(wildcard Cardinal/src/DearImGuiColorTextEditor/*.cpp) endif ifeq ($(shell pkg-config --exists fftw3f && echo true),true) @@ -713,6 +713,11 @@ MOCKBAMODULAR_CUSTOM = Blank Comparator PLUGIN_FILES += Mog/src/Network.cpp PLUGIN_FILES += Mog/src/Nexus.cpp +# -------------------------------------------------------------- +# Mojo + +PLUGIN_FILES += $(filter-out Mojo/src/plugin.cpp,$(wildcard Mojo/src/*.cpp)) + # -------------------------------------------------------------- # mscHack @@ -1701,6 +1706,14 @@ $(BUILD_DIR)/Mog/%.cpp.o: Mog/%.cpp $(foreach m,$(MOG_CUSTOM),$(call custom_module_names,$(m),Mog)) \ -DpluginInstance=pluginInstance__Mog +$(BUILD_DIR)/Mojo/src/%.cpp.o: Mojo/src/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(CF_CUSTOM),$(call custom_module_names,$(m),Mojo)) \ + -DpluginInstance=pluginInstance__Mojo \ + -Wno-misleading-indentation + $(BUILD_DIR)/mscHack/%.cpp.o: mscHack/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 712fa889..5ce64096 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -561,6 +561,9 @@ std::string loadBack(int) { return "res/Empty_gray.svg"; } // Mog #include "Mog/src/plugin.hpp" +// Mojo +#include "Mojo/src/plugin.hpp" + // mscHack /* NOTE too much noise in original include, do this a different way // #include "mscHack/src/mscHack.hpp" @@ -760,6 +763,7 @@ extern Plugin* pluginInstance__MindMeld; Plugin* pluginInstance__ML; Plugin* pluginInstance__MockbaModular; Plugin* pluginInstance__Mog; +Plugin* pluginInstance__Mojo; extern Plugin* pluginInstance__mscHack; Plugin* pluginInstance__MSM; Plugin* pluginInstance__myth_modules; @@ -2265,6 +2269,20 @@ static void initStatic__Mog() } } +static void initStatic__Mojo() +{ + Plugin* const p = new Plugin; + pluginInstance__Mojo = p; + + const StaticPluginLoader spl(p, "Mojo"); + if (spl.ok()) + { + p->addModel(modeldogs); + p->addModel(modelpigs); + p->addModel(modelsheep); + } +} + static void initStatic__mscHack() { Plugin* const p = new Plugin; @@ -2741,6 +2759,7 @@ void initStaticPlugins() initStatic__ML(); initStatic__MockbaModular(); initStatic__Mog(); + initStatic__Mojo(); initStatic__mscHack(); initStatic__MSM(); initStatic__myth_modules(); From f332cf95ccaa130226747190c81f21c80945dcd8 Mon Sep 17 00:00:00 2001 From: TheGuyWho0 Date: Tue, 5 Jul 2022 17:06:29 +0200 Subject: [PATCH 03/11] Added mojo. --- plugins/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Makefile b/plugins/Makefile index 4f419307..fb4be93b 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -1710,7 +1710,7 @@ $(BUILD_DIR)/Mojo/src/%.cpp.o: Mojo/src/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ - $(foreach m,$(CF_CUSTOM),$(call custom_module_names,$(m),Mojo)) \ + $(foreach m,$(MOJO_CUSTOM),$(call custom_module_names,$(m),Mojo)) \ -DpluginInstance=pluginInstance__Mojo \ -Wno-misleading-indentation From 572ac8431776fbdd817d10af709427aa5f711daf Mon Sep 17 00:00:00 2001 From: TheGuyWho0 Date: Wed, 6 Jul 2022 01:15:50 +0200 Subject: [PATCH 04/11] Removed Mojo --- .gitmodules | 3 --- plugins/Mojo | 1 - 2 files changed, 4 deletions(-) delete mode 160000 plugins/Mojo diff --git a/.gitmodules b/.gitmodules index 93420ae1..8ed60c2e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -209,6 +209,3 @@ [submodule "plugins/myth-modules"] path = plugins/myth-modules url = https://github.com/Ahineya/vcv-myth-plugin.git -[submodule "plugins/Mojo"] - path = plugins/Mojo - url = https://github.com/tomdasilva/Mojo diff --git a/plugins/Mojo b/plugins/Mojo deleted file mode 160000 index 3bcad57f..00000000 --- a/plugins/Mojo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3bcad57fb308e7d4783b191bc7c52d55c0740846 From a224b1a4886810e94e3b8bdb780b2947432f37a3 Mon Sep 17 00:00:00 2001 From: TheGuyWho0 Date: Wed, 6 Jul 2022 01:29:58 +0200 Subject: [PATCH 05/11] dark panels --- .gitmodules | 3 +++ plugins/Mojo | 1 + 2 files changed, 4 insertions(+) create mode 160000 plugins/Mojo diff --git a/.gitmodules b/.gitmodules index 8ed60c2e..266ac2ce 100644 --- a/.gitmodules +++ b/.gitmodules @@ -209,3 +209,6 @@ [submodule "plugins/myth-modules"] path = plugins/myth-modules url = https://github.com/Ahineya/vcv-myth-plugin.git +[submodule "plugins/Mojo"] + path = plugins/Mojo + url = https://github.com/TheGuyWhoo/Mojo diff --git a/plugins/Mojo b/plugins/Mojo new file mode 160000 index 00000000..7b014625 --- /dev/null +++ b/plugins/Mojo @@ -0,0 +1 @@ +Subproject commit 7b014625cdc04b397cb57b450a578b30bca6ae6a From 5d99c23bd99401b2654dc428fb252966ae86c6d2 Mon Sep 17 00:00:00 2001 From: TheGuyWho0 Date: Wed, 6 Jul 2022 13:42:27 +0200 Subject: [PATCH 06/11] add atelier --- .gitmodules | 3 +++ plugins/Atelier | 1 + 2 files changed, 4 insertions(+) mode change 100644 => 100755 .gitmodules create mode 160000 plugins/Atelier diff --git a/.gitmodules b/.gitmodules old mode 100644 new mode 100755 index 266ac2ce..e62f9147 --- a/.gitmodules +++ b/.gitmodules @@ -212,3 +212,6 @@ [submodule "plugins/Mojo"] path = plugins/Mojo url = https://github.com/TheGuyWhoo/Mojo +[submodule "plugins/Atelier"] + path = plugins/Atelier + url = https://github.com/Xenakios/Atelier diff --git a/plugins/Atelier b/plugins/Atelier new file mode 160000 index 00000000..3fc4edfb --- /dev/null +++ b/plugins/Atelier @@ -0,0 +1 @@ +Subproject commit 3fc4edfb8903cefd4c2ff4afcfd9018e6c9a8d85 From e79ab31cbc10f788f63a1fdc1ad3e984e72e374d Mon Sep 17 00:00:00 2001 From: TheGuyWho0 Date: Wed, 6 Jul 2022 14:30:23 +0200 Subject: [PATCH 07/11] remove atelier --- .gitmodules | 3 --- plugins/Atelier | 1 - 2 files changed, 4 deletions(-) delete mode 160000 plugins/Atelier diff --git a/.gitmodules b/.gitmodules index e62f9147..266ac2ce 100755 --- a/.gitmodules +++ b/.gitmodules @@ -212,6 +212,3 @@ [submodule "plugins/Mojo"] path = plugins/Mojo url = https://github.com/TheGuyWhoo/Mojo -[submodule "plugins/Atelier"] - path = plugins/Atelier - url = https://github.com/Xenakios/Atelier diff --git a/plugins/Atelier b/plugins/Atelier deleted file mode 160000 index 3fc4edfb..00000000 --- a/plugins/Atelier +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3fc4edfb8903cefd4c2ff4afcfd9018e6c9a8d85 From a7849ff3431d762272edf57bf024a2d171b3a8df Mon Sep 17 00:00:00 2001 From: TheGuyWho0 Date: Wed, 6 Jul 2022 14:37:08 +0200 Subject: [PATCH 08/11] update submodule --- .gitmodules | 3 +++ plugins/Atelier | 1 + 2 files changed, 4 insertions(+) create mode 160000 plugins/Atelier diff --git a/.gitmodules b/.gitmodules index 266ac2ce..e62f9147 100755 --- a/.gitmodules +++ b/.gitmodules @@ -212,3 +212,6 @@ [submodule "plugins/Mojo"] path = plugins/Mojo url = https://github.com/TheGuyWhoo/Mojo +[submodule "plugins/Atelier"] + path = plugins/Atelier + url = https://github.com/Xenakios/Atelier diff --git a/plugins/Atelier b/plugins/Atelier new file mode 160000 index 00000000..2d670e2a --- /dev/null +++ b/plugins/Atelier @@ -0,0 +1 @@ +Subproject commit 2d670e2aa66f2d1228fdc180d6ca8b7a23888e9d From e01f012e581d7924af75e7fde69ef58463cac20b Mon Sep 17 00:00:00 2001 From: TheGuyWho0 Date: Wed, 6 Jul 2022 14:41:50 +0200 Subject: [PATCH 09/11] update submodule --- plugins/Atelier | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Atelier b/plugins/Atelier index 2d670e2a..b84dea41 160000 --- a/plugins/Atelier +++ b/plugins/Atelier @@ -1 +1 @@ -Subproject commit 2d670e2aa66f2d1228fdc180d6ca8b7a23888e9d +Subproject commit b84dea414c3a2bac231d1c5b837c3003d60a6446 From a7b404d8dc7b635a357ac6f45985a2da1ae8f074 Mon Sep 17 00:00:00 2001 From: TheGuyWho0 Date: Wed, 6 Jul 2022 19:41:28 +0200 Subject: [PATCH 10/11] remove atelier --- plugins/plugins.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 5ce64096..bf7f5d9f 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -2277,9 +2277,9 @@ static void initStatic__Mojo() const StaticPluginLoader spl(p, "Mojo"); if (spl.ok()) { - p->addModel(modeldogs); - p->addModel(modelpigs); - p->addModel(modelsheep); + p->addModel(modelDogs); + p->addModel(modelPigs); + p->addModel(modelSheep); } } From 010d4ac64bf455fabc10256175f181eaad0d60b7 Mon Sep 17 00:00:00 2001 From: TheGuyWho0 Date: Wed, 6 Jul 2022 19:45:36 +0200 Subject: [PATCH 11/11] Removed Atelier --- .gitmodules | 3 --- plugins/Atelier | 1 - 2 files changed, 4 deletions(-) delete mode 160000 plugins/Atelier diff --git a/.gitmodules b/.gitmodules index e62f9147..266ac2ce 100755 --- a/.gitmodules +++ b/.gitmodules @@ -212,6 +212,3 @@ [submodule "plugins/Mojo"] path = plugins/Mojo url = https://github.com/TheGuyWhoo/Mojo -[submodule "plugins/Atelier"] - path = plugins/Atelier - url = https://github.com/Xenakios/Atelier diff --git a/plugins/Atelier b/plugins/Atelier deleted file mode 160000 index b84dea41..00000000 --- a/plugins/Atelier +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b84dea414c3a2bac231d1c5b837c3003d60a6446