diff options
| author | Clyne Sullivan <clyne@bitgloo.com> | 2019-09-12 14:24:39 -0400 |
|---|---|---|
| committer | Clyne Sullivan <clyne@bitgloo.com> | 2019-09-12 14:24:39 -0400 |
| commit | 331e858d2dd0155b54b4bf9edfbbb84d3d5a8145 (patch) | |
| tree | 2263a6ac7e75524157bd180bcc99d11a39dd82cd /src | |
| parent | 889543e9862e5c6f4adb5c07112bdfd23fe55833 (diff) | |
add font name to Text component
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/Text.hpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/components/Text.hpp b/src/components/Text.hpp index 002d19a..9566499 100644 --- a/src/components/Text.hpp +++ b/src/components/Text.hpp @@ -26,20 +26,22 @@ struct Text : Component<Text> { public: - // TODO include font info? - + std::string font; std::string text; double offsetX, offsetY; - Text(const std::string& _text) : - text(_text), offsetX(0), offsetY(0) {} - Text(const std::string& _text, double _x, double _y) : - text(_text), x(_x), y(_y) {} + Text(const std::string& _font, const std::string& _text) : + font(_font), text(_text), offsetX(0), offsetY(0) {} + Text(const std::string& _font, const std::string& _text, + double _x, double _y) : + font(_font), text(_text), x(_x), y(_y) {} Text FromLua(sol::object ref) { if (ref.get_type() == sol::type::table) { sol::table tab = ref; + if (tab["font"] != nullptr) + this->font = tab["font"]; if (tab["text"] != nullptr) this->text = tab["text"]; if (tab["x"] != nullptr) @@ -53,11 +55,11 @@ public: } void serialize(cereal::JSONOutputArchive& ar) final { - ar(CEREAL_NVP(text), CEREAL_NVP(x), CEREAL_NVP(y)); + ar(CEREAL_NVP(font), CEREAL_NVP(text), CEREAL_NVP(x), CEREAL_NVP(y)); } void serialize(cereal::JSONInputArchive& ar) final { - ar(CEREAL_NVP(text), CEREAL_NVP(x), CEREAL_NVP(y)); + ar(CEREAL_NVP(font), CEREAL_NVP(text), CEREAL_NVP(x), CEREAL_NVP(y)); } std::string serializeName(void) const final { |