From 34d86abe2c7b7f5fc535af6c9a8497b3b80b2632 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Sat, 19 Aug 2023 22:56:44 +0200 Subject: [PATCH] add ngcft1 and plugin + update deps --- .gitmodules | 3 + external/CMakeLists.txt | 2 + external/solanaceae_ngc_ft1 | 1 + external/solanaceae_tox | 2 +- external/solanaceae_toxcore | 2 +- plugins/CMakeLists.txt | 13 +++++ plugins/plugin_ngcft1.cpp | 107 ++++++++++++++++++++++++++++++++++++ 7 files changed, 128 insertions(+), 2 deletions(-) create mode 160000 external/solanaceae_ngc_ft1 create mode 100644 plugins/plugin_ngcft1.cpp diff --git a/.gitmodules b/.gitmodules index 99d7bbf..c1725f4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,3 +26,6 @@ [submodule "external/solanaceae_zox"] path = external/solanaceae_zox url = https://github.com/Green-Sky/solanaceae_zox.git +[submodule "external/solanaceae_ngc_ft1"] + path = external/solanaceae_ngc_ft1 + url = https://github.com/Green-Sky/solanaceae_ngc_ft1.git diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index a52e2c7..99a05db 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -12,5 +12,7 @@ add_subdirectory(./toxcore) add_subdirectory(./solanaceae_toxcore) add_subdirectory(./solanaceae_tox) +add_subdirectory(./solanaceae_ngc_ft1) + add_subdirectory(./solanaceae_zox) diff --git a/external/solanaceae_ngc_ft1 b/external/solanaceae_ngc_ft1 new file mode 160000 index 0000000..b28a0ac --- /dev/null +++ b/external/solanaceae_ngc_ft1 @@ -0,0 +1 @@ +Subproject commit b28a0acca30d3fc03fc8ff0365700961e9ca6c21 diff --git a/external/solanaceae_tox b/external/solanaceae_tox index 62de447..dd596bd 160000 --- a/external/solanaceae_tox +++ b/external/solanaceae_tox @@ -1 +1 @@ -Subproject commit 62de447fd220647d3e89a16bfc96ef3feb03920c +Subproject commit dd596bdad8d71654ff21dd3a032d6eb2dd7139a8 diff --git a/external/solanaceae_toxcore b/external/solanaceae_toxcore index b49db89..dfa5a50 160000 --- a/external/solanaceae_toxcore +++ b/external/solanaceae_toxcore @@ -1 +1 @@ -Subproject commit b49db892f6f0069985c763f7c8598b57fc9810dd +Subproject commit dfa5a501ec4b4d929f473dabd51fa39bc0550266 diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index eb5be15..9b6d253 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -1,5 +1,18 @@ cmake_minimum_required(VERSION 3.9 FATAL_ERROR) +add_library(plugin_ngcft1 SHARED + ./plugin_ngcft1.cpp +) + +target_link_libraries(plugin_ngcft1 PUBLIC + solanaceae_plugin + solanaceae_ngcext + solanaceae_ngcft1 + solanaceae_sha1_ngcft1 +) + +######################################## + add_library(plugin_zox_ngc SHARED ./plugin_zox_ngc.cpp ) diff --git a/plugins/plugin_ngcft1.cpp b/plugins/plugin_ngcft1.cpp new file mode 100644 index 0000000..d8d4997 --- /dev/null +++ b/plugins/plugin_ngcft1.cpp @@ -0,0 +1,107 @@ +#include + +#include +#include +#include + +#include +#include + +#define RESOLVE_INSTANCE(x) static_cast(solana_api->resolveInstance(#x)) +#define PROVIDE_INSTANCE(x, p, v) solana_api->provideInstance(#x, p, static_cast(v)) + +static std::unique_ptr g_ngcextep = nullptr; +// TODO: make sep plug +static std::unique_ptr g_ngcft1 = nullptr; +static std::unique_ptr g_sha1_ngcft1 = nullptr; + +extern "C" { + +SOLANA_PLUGIN_EXPORT const char* solana_plugin_get_name(void) { + return "NGCEXT"; +} + +SOLANA_PLUGIN_EXPORT uint32_t solana_plugin_get_version(void) { + return SOLANA_PLUGIN_VERSION; +} + +SOLANA_PLUGIN_EXPORT uint32_t solana_plugin_start(struct SolanaAPI* solana_api) { + std::cout << "PLUGIN NGCEXT START()\n"; + + if (solana_api == nullptr) { + return 1; + } + + ToxI* tox_i = nullptr; + ToxEventProviderI* tox_event_provider_i = nullptr; + Contact3Registry* cr = nullptr; + RegistryMessageModel* rmm = nullptr; + ToxContactModel2* tcm = nullptr; + + { // make sure required types are loaded + tox_i = RESOLVE_INSTANCE(ToxI); + tox_event_provider_i = RESOLVE_INSTANCE(ToxEventProviderI); + cr = RESOLVE_INSTANCE(Contact3Registry); + rmm = RESOLVE_INSTANCE(RegistryMessageModel); + tcm = RESOLVE_INSTANCE(ToxContactModel2); + + if (tox_i == nullptr) { + std::cerr << "PLUGIN NGCEXT missing ToxI\n"; + return 2; + } + + if (tox_event_provider_i == nullptr) { + std::cerr << "PLUGIN NGCEXT missing ToxEventProviderI\n"; + return 2; + } + + if (cr == nullptr) { + std::cerr << "PLUGIN NGCEXT missing Contact3Registry\n"; + return 2; + } + + if (rmm == nullptr) { + std::cerr << "PLUGIN NGCEXT missing RegistryMessageModel\n"; + return 2; + } + + if (tcm == nullptr) { + std::cerr << "PLUGIN NGCEXT missing ToxContactModel2\n"; + return 2; + } + } + + // static store, could be anywhere tho + // construct with fetched dependencies + g_ngcextep = std::make_unique(*tox_event_provider_i); + g_ngcft1 = std::make_unique(*tox_i, *tox_event_provider_i, *g_ngcextep.get()); + g_sha1_ngcft1 = std::make_unique(*cr, *rmm, *g_ngcft1.get(), *tcm); + + // register types + PROVIDE_INSTANCE(NGCEXTEventProviderI, "NGCEXT", g_ngcextep.get()); + + PROVIDE_INSTANCE(NGCFT1EventProviderI, "NGCEXT", g_ngcft1.get()); + PROVIDE_INSTANCE(NGCFT1, "NGCEXT", g_ngcft1.get()); + + PROVIDE_INSTANCE(SHA1_NGCFT1, "NGCEXT", g_sha1_ngcft1.get()); + + return 0; +} + +SOLANA_PLUGIN_EXPORT void solana_plugin_stop(void) { + std::cout << "PLUGIN NGCEXT STOP()\n"; + + g_sha1_ngcft1.reset(); + g_ngcft1.reset(); + g_ngcextep.reset(); +} + +SOLANA_PLUGIN_EXPORT void solana_plugin_tick(float delta) { + //std::cout << "PLUGIN NGCEXT TICK()\n"; + + g_ngcft1->iterate(delta); + g_sha1_ngcft1->iterate(delta); +} + +} // extern C +