diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 68b4fc2..5fc7d6e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,6 +5,7 @@ add_library(solanaceae_message3 ./solanaceae/message3/file_w_file.hpp ./solanaceae/message3/file_rw_file.hpp + ./solanaceae/message3/message.hpp ./solanaceae/message3/components.hpp ./solanaceae/message3/components_id.inl diff --git a/src/solanaceae/message3/components.hpp b/src/solanaceae/message3/components.hpp index 4de3856..1d5ece3 100644 --- a/src/solanaceae/message3/components.hpp +++ b/src/solanaceae/message3/components.hpp @@ -2,6 +2,8 @@ #include +#include "./message.hpp" + //fwd struct FileI; @@ -14,11 +16,11 @@ struct FileI; namespace Message::Components { struct ContactFrom { - Contact3 c; + Contact3 c{entt::null}; }; struct ContactTo { - Contact3 c; + Contact3 c{entt::null}; }; // best guess as to how this should be displayed in the global order @@ -152,6 +154,21 @@ namespace Message::Components { } // Transfer + // points to the front/newer message + // together they define a range that is, + // eg the first(end) and last(begin) message being eg. rendered + // MFS requires there to be atleast one other fragment after/before, + // if not loaded fragment with fitting tsrange(direction) available + // uses fragmentAfter/Before() + // they can exist standalone (wip) + // if they are a pair, the inside is filled first + struct ViewCurserBegin { + Message3 curser_end{entt::null}; + }; + struct ViewCurserEnd { + Message3 curser_begin{entt::null}; + }; + } // Message::Components #include "./components_id.inl" diff --git a/src/solanaceae/message3/message.hpp b/src/solanaceae/message3/message.hpp new file mode 100644 index 0000000..6d203a8 --- /dev/null +++ b/src/solanaceae/message3/message.hpp @@ -0,0 +1,7 @@ +#pragma once + +#include + +// strong typing +enum class Message3 : uint32_t {}; + diff --git a/src/solanaceae/message3/registry_message_model.hpp b/src/solanaceae/message3/registry_message_model.hpp index fe3d49c..59582c6 100644 --- a/src/solanaceae/message3/registry_message_model.hpp +++ b/src/solanaceae/message3/registry_message_model.hpp @@ -2,6 +2,7 @@ #include +#include "./message.hpp" #include "./message_model3.hpp" #include @@ -10,8 +11,6 @@ #include -// strong typing -enum class Message3 : uint32_t {}; using Message3Registry = entt::basic_registry; using Message3Handle = entt::basic_handle;