diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2023-06-25 16:10:57 +1000 |
---|---|---|
committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2023-06-25 16:10:57 +1000 |
commit | e2424b7dcf60d18b277b092eb7f2a947fff27415 (patch) | |
tree | 1887d34419f16a6720405182d16829a97463e6df /source/core/StarJsonExtra.hpp | |
parent | f7d5ff8debbbc1d80e8cd892d1184cb5aeb5bca4 (diff) |
Fix up new Object directives handling, more directives rendering improvements, fix chat bubbles and nametags only moving every 2px
Diffstat (limited to 'source/core/StarJsonExtra.hpp')
-rw-r--r-- | source/core/StarJsonExtra.hpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/core/StarJsonExtra.hpp b/source/core/StarJsonExtra.hpp index 3bf5b9c..cfe7efb 100644 --- a/source/core/StarJsonExtra.hpp +++ b/source/core/StarJsonExtra.hpp @@ -6,6 +6,7 @@ #include "StarColor.hpp" #include "StarSet.hpp" #include "StarWeightedPool.hpp" +#include "StarDirectives.hpp" namespace Star { @@ -81,6 +82,8 @@ List<Vec2U> jsonToVec2UList(Json const& v); List<Vec2F> jsonToVec2FList(Json const& v); List<Vec4B> jsonToVec4BList(Json const& v); List<Color> jsonToColorList(Json const& v); +List<Directives> jsonToDirectivesList(Json const& v); +Json jsonFromDirectivesList(List<Directives> const& v); Json weightedChoiceFromJson(Json const& source, Json const& default_); |