add ngcft1 and plugin + update deps
This commit is contained in:
parent
90d37e2477
commit
34d86abe2c
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -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
|
||||
|
2
external/CMakeLists.txt
vendored
2
external/CMakeLists.txt
vendored
@ -12,5 +12,7 @@ add_subdirectory(./toxcore)
|
||||
add_subdirectory(./solanaceae_toxcore)
|
||||
add_subdirectory(./solanaceae_tox)
|
||||
|
||||
add_subdirectory(./solanaceae_ngc_ft1)
|
||||
|
||||
add_subdirectory(./solanaceae_zox)
|
||||
|
||||
|
1
external/solanaceae_ngc_ft1
vendored
Submodule
1
external/solanaceae_ngc_ft1
vendored
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit b28a0acca30d3fc03fc8ff0365700961e9ca6c21
|
2
external/solanaceae_tox
vendored
2
external/solanaceae_tox
vendored
@ -1 +1 @@
|
||||
Subproject commit 62de447fd220647d3e89a16bfc96ef3feb03920c
|
||||
Subproject commit dd596bdad8d71654ff21dd3a032d6eb2dd7139a8
|
2
external/solanaceae_toxcore
vendored
2
external/solanaceae_toxcore
vendored
@ -1 +1 @@
|
||||
Subproject commit b49db892f6f0069985c763f7c8598b57fc9810dd
|
||||
Subproject commit dfa5a501ec4b4d929f473dabd51fa39bc0550266
|
@ -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
|
||||
)
|
||||
|
107
plugins/plugin_ngcft1.cpp
Normal file
107
plugins/plugin_ngcft1.cpp
Normal file
@ -0,0 +1,107 @@
|
||||
#include <solanaceae/plugin/solana_plugin_v1.h>
|
||||
|
||||
#include <solanaceae/ngc_ext/ngcext.hpp>
|
||||
#include <solanaceae/ngc_ft1/ngcft1.hpp>
|
||||
#include <solanaceae/ngc_ft1_sha1/sha1_ngcft1.hpp>
|
||||
|
||||
#include <memory>
|
||||
#include <iostream>
|
||||
|
||||
#define RESOLVE_INSTANCE(x) static_cast<x*>(solana_api->resolveInstance(#x))
|
||||
#define PROVIDE_INSTANCE(x, p, v) solana_api->provideInstance(#x, p, static_cast<x*>(v))
|
||||
|
||||
static std::unique_ptr<NGCEXTEventProvider> g_ngcextep = nullptr;
|
||||
// TODO: make sep plug
|
||||
static std::unique_ptr<NGCFT1> g_ngcft1 = nullptr;
|
||||
static std::unique_ptr<SHA1_NGCFT1> 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<NGCEXTEventProvider>(*tox_event_provider_i);
|
||||
g_ngcft1 = std::make_unique<NGCFT1>(*tox_i, *tox_event_provider_i, *g_ngcextep.get());
|
||||
g_sha1_ngcft1 = std::make_unique<SHA1_NGCFT1>(*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
|
||||
|
Loading…
Reference in New Issue
Block a user