diff options
| author | heavydemon21 <nielsstunnebrink1@gmail.com> | 2024-12-17 13:31:34 +0100 |
|---|---|---|
| committer | heavydemon21 <nielsstunnebrink1@gmail.com> | 2024-12-17 13:31:34 +0100 |
| commit | 24578c9afb61ae65b300dd7fb645220e133089be (patch) | |
| tree | c6451ea01a56f0bde33a803ea37169f59d0fc41d /src/crepe/api/Text.cpp | |
| parent | bcaee968761c1d2e85c20925b237480c87da9747 (diff) | |
| parent | 707db8c94b6bb3921105f40658aab13511d8df07 (diff) | |
Merge branch 'wouter/text-component' into niels/UI
Diffstat (limited to 'src/crepe/api/Text.cpp')
| -rw-r--r-- | src/crepe/api/Text.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp index 07d1705..1620247 100644 --- a/src/crepe/api/Text.cpp +++ b/src/crepe/api/Text.cpp @@ -5,11 +5,11 @@ using namespace crepe; -Text::Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset, - const std::string & text, const std::string & font_family, const Data & data) +Text::Text(game_object_id_t id, const vec2 & dimensions,const vec2 & offset, const std::string & font_family, + const Data & data, const std::string & text, std::optional<Asset> font) : UIObject(id, dimensions, offset), text(text), data(data), - font(FontFacade::get_font_asset(font_family)) { - dbg_trace(); + font_family(font_family), + font(font) { } |