FaSTTUBe/steering-wheel-rpi
51
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use Chinat font for mission list

Browse Source
This commit is contained in:
Jasper Blanckenburg
2022-05-20 14:52:15 +02:00
parent c0b56f9f76
commit 0b34bac5bc
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/AMI.h
View File

@ -11,11 +11,13 @@
class AMI final : public View { class AMI final : public View {
public: public:
AMI(SDL_Renderer* renderer); AMI(SDL_Renderer* renderer);
~AMI();
void draw() override; void draw() override;
private: private:
TTF_Font* avenir; TTF_Font* avenir;
TTF_Font* chinat;
std::vector<Widget*> widgets; std::vector<Widget*> widgets;

BIN
resources/CHINAT.ttf Normal file
View File

Binary file not shown.

10
src/AMI.cpp
View File

@ -9,6 +9,8 @@
constexpr const char* FT_LOGO_PATH = "resources/Fasttube_Logo-white.bmp"; constexpr const char* FT_LOGO_PATH = "resources/Fasttube_Logo-white.bmp";
constexpr const char* AVENIR_FONT_PATH = "resources/Avenir-Book.ttf"; constexpr const char* AVENIR_FONT_PATH = "resources/Avenir-Book.ttf";
constexpr int AVENIR_PTS = 20; 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 FT_LOGO_HEIGHT = 40;
constexpr int GAP = 5; constexpr int GAP = 5;
constexpr int CHOOSE_Y = FT_LOGO_HEIGHT + GAP; constexpr int CHOOSE_Y = FT_LOGO_HEIGHT + GAP;
@ -20,6 +22,7 @@ constexpr std::array MISSIONS = {"ACCELERATION", "SKIDPAD", "AUTOCROSS",
AMI::AMI(SDL_Renderer* renderer) AMI::AMI(SDL_Renderer* renderer)
: View{renderer}, avenir{util::load_font(AVENIR_FONT_PATH, AVENIR_PTS)}, : 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, ft_logo{renderer, FT_LOGO_PATH}, choose{renderer, avenir,
"Choose a mission:"}, "Choose a mission:"},
missions_widget{renderer, MISSION_HEIGHT, Alignment::CENTER} { 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_width(SCREEN_WIDTH, false);
missions_widget.set_height(missions_height, false); missions_widget.set_height(missions_height, false);
for (const auto mission : MISSIONS) { for (const auto mission : MISSIONS) {
missions.push_back(std::make_unique<TextWidget>(renderer, avenir, mission)); missions.push_back(std::make_unique<TextWidget>(renderer, chinat, mission));
} }
for (const auto& mission : missions) { for (const auto& mission : missions) {
missions_widget.add_element(mission.get()); missions_widget.add_element(mission.get());
@ -47,6 +50,11 @@ AMI::AMI(SDL_Renderer* renderer)
widgets.push_back(&missions_widget); widgets.push_back(&missions_widget);
} }
AMI::~AMI() {
TTF_CloseFont(avenir);
TTF_CloseFont(chinat);
}
void AMI::draw() { void AMI::draw() {
SDL_SetRenderDrawColor(renderer, 0x00, 0x00, 0x00, 0xFF); SDL_SetRenderDrawColor(renderer, 0x00, 0x00, 0x00, 0xFF);
SDL_RenderClear(renderer); SDL_RenderClear(renderer);