diff --git a/include/AMI.h b/include/AMI.h index 7d68f17..052c645 100644 --- a/include/AMI.h +++ b/include/AMI.h @@ -11,11 +11,13 @@ class AMI final : public View { public: AMI(SDL_Renderer* renderer); + ~AMI(); void draw() override; private: TTF_Font* avenir; + TTF_Font* chinat; std::vector widgets; diff --git a/resources/CHINAT.ttf b/resources/CHINAT.ttf new file mode 100644 index 0000000..7cf1303 Binary files /dev/null and b/resources/CHINAT.ttf differ diff --git a/src/AMI.cpp b/src/AMI.cpp index e979db0..4a8d109 100644 --- a/src/AMI.cpp +++ b/src/AMI.cpp @@ -9,6 +9,8 @@ constexpr const char* FT_LOGO_PATH = "resources/Fasttube_Logo-white.bmp"; constexpr const char* AVENIR_FONT_PATH = "resources/Avenir-Book.ttf"; constexpr int AVENIR_PTS = 20; +constexpr const char* CHINAT_FONT_PATH = "resources/CHINAT.ttf"; +constexpr int CHINAT_PTS = 20; constexpr int FT_LOGO_HEIGHT = 40; constexpr int GAP = 5; constexpr int CHOOSE_Y = FT_LOGO_HEIGHT + GAP; @@ -20,6 +22,7 @@ constexpr std::array MISSIONS = {"ACCELERATION", "SKIDPAD", "AUTOCROSS", AMI::AMI(SDL_Renderer* renderer) : View{renderer}, avenir{util::load_font(AVENIR_FONT_PATH, AVENIR_PTS)}, + chinat{util::load_font(CHINAT_FONT_PATH, CHINAT_PTS)}, ft_logo{renderer, FT_LOGO_PATH}, choose{renderer, avenir, "Choose a mission:"}, missions_widget{renderer, MISSION_HEIGHT, Alignment::CENTER} { @@ -39,7 +42,7 @@ AMI::AMI(SDL_Renderer* renderer) missions_widget.set_width(SCREEN_WIDTH, false); missions_widget.set_height(missions_height, false); for (const auto mission : MISSIONS) { - missions.push_back(std::make_unique(renderer, avenir, mission)); + missions.push_back(std::make_unique(renderer, chinat, mission)); } for (const auto& mission : missions) { missions_widget.add_element(mission.get()); @@ -47,6 +50,11 @@ AMI::AMI(SDL_Renderer* renderer) widgets.push_back(&missions_widget); } +AMI::~AMI() { + TTF_CloseFont(avenir); + TTF_CloseFont(chinat); +} + void AMI::draw() { SDL_SetRenderDrawColor(renderer, 0x00, 0x00, 0x00, 0xFF); SDL_RenderClear(renderer);