forked from Green-Sky/tomato
add object store and expose to plugins
This commit is contained in:
parent
b38a1a2507
commit
195a87b8ab
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -20,3 +20,6 @@
|
|||||||
[submodule "external/solanaceae_plugin"]
|
[submodule "external/solanaceae_plugin"]
|
||||||
path = external/solanaceae_plugin
|
path = external/solanaceae_plugin
|
||||||
url = https://github.com/Green-Sky/solanaceae_plugin.git
|
url = https://github.com/Green-Sky/solanaceae_plugin.git
|
||||||
|
[submodule "external/solanaceae_object_store"]
|
||||||
|
path = external/solanaceae_object_store
|
||||||
|
url = https://github.com/Green-Sky/solanaceae_object_store.git
|
||||||
|
2
external/CMakeLists.txt
vendored
2
external/CMakeLists.txt
vendored
@ -12,6 +12,8 @@ add_subdirectory(./toxcore)
|
|||||||
add_subdirectory(./solanaceae_toxcore)
|
add_subdirectory(./solanaceae_toxcore)
|
||||||
add_subdirectory(./solanaceae_tox)
|
add_subdirectory(./solanaceae_tox)
|
||||||
|
|
||||||
|
add_subdirectory(./solanaceae_object_store)
|
||||||
|
|
||||||
add_subdirectory(./sdl)
|
add_subdirectory(./sdl)
|
||||||
add_subdirectory(./imgui)
|
add_subdirectory(./imgui)
|
||||||
|
|
||||||
|
1
external/solanaceae_object_store
vendored
Submodule
1
external/solanaceae_object_store
vendored
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 4d3ffb8192623740f6e170855ee1cffd428b78da
|
@ -82,6 +82,8 @@ target_link_libraries(tomato PUBLIC
|
|||||||
solanaceae_tox_contacts
|
solanaceae_tox_contacts
|
||||||
solanaceae_tox_messages
|
solanaceae_tox_messages
|
||||||
|
|
||||||
|
solanaceae_object_store
|
||||||
|
|
||||||
SDL3::SDL3
|
SDL3::SDL3
|
||||||
|
|
||||||
imgui
|
imgui
|
||||||
|
@ -49,6 +49,8 @@ MainScreen::MainScreen(SDL_Renderer* renderer_, std::string save_path, std::stri
|
|||||||
std::cout << "own address: " << tc.toxSelfGetAddressStr() << "\n";
|
std::cout << "own address: " << tc.toxSelfGetAddressStr() << "\n";
|
||||||
|
|
||||||
{ // setup plugin instances
|
{ // setup plugin instances
|
||||||
|
g_provideInstance<ObjectStore2>("ObjectStore2", "host", &os);
|
||||||
|
|
||||||
g_provideInstance<ConfigModelI>("ConfigModelI", "host", &conf);
|
g_provideInstance<ConfigModelI>("ConfigModelI", "host", &conf);
|
||||||
g_provideInstance<Contact3Registry>("Contact3Registry", "1", "host", &cr);
|
g_provideInstance<Contact3Registry>("Contact3Registry", "1", "host", &cr);
|
||||||
g_provideInstance<RegistryMessageModel>("RegistryMessageModel", "host", &rmm);
|
g_provideInstance<RegistryMessageModel>("RegistryMessageModel", "host", &rmm);
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
#include "./screen.hpp"
|
#include "./screen.hpp"
|
||||||
|
|
||||||
|
#include <solanaceae/object_store/object_store.hpp>
|
||||||
#include <solanaceae/util/simple_config_model.hpp>
|
#include <solanaceae/util/simple_config_model.hpp>
|
||||||
#include <solanaceae/contact/contact_model3.hpp>
|
#include <solanaceae/contact/contact_model3.hpp>
|
||||||
#include <solanaceae/message3/registry_message_model.hpp>
|
#include <solanaceae/message3/registry_message_model.hpp>
|
||||||
@ -43,6 +44,8 @@ extern "C" {
|
|||||||
struct MainScreen final : public Screen {
|
struct MainScreen final : public Screen {
|
||||||
SDL_Renderer* renderer;
|
SDL_Renderer* renderer;
|
||||||
|
|
||||||
|
ObjectStore2 os;
|
||||||
|
|
||||||
SimpleConfigModel conf;
|
SimpleConfigModel conf;
|
||||||
Contact3Registry cr;
|
Contact3Registry cr;
|
||||||
RegistryMessageModel rmm;
|
RegistryMessageModel rmm;
|
||||||
|
Loading…
Reference in New Issue
Block a user