From 2e76523bf4e8d6e876d2e36249e8f15eb43439cb Mon Sep 17 00:00:00 2001 From: Jasper Date: Sun, 22 May 2022 14:30:42 +0200 Subject: [PATCH] AMI -> MissionSelect --- CMakeLists.txt | 2 +- include/App.h | 6 +++--- include/{AMI.h => MissionSelect.h} | 6 +++--- src/App.cpp | 14 +++++++------- src/{AMI.cpp => MissionSelect.cpp} | 10 +++++----- 5 files changed, 19 insertions(+), 19 deletions(-) rename include/{AMI.h => MissionSelect.h} (82%) rename src/{AMI.cpp => MissionSelect.cpp} (92%) diff --git a/CMakeLists.txt b/CMakeLists.txt index a47a7f3..6ee311f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ add_executable( src/main.cpp src/App.cpp src/View.cpp - src/AMI.cpp + src/MissionSelect.cpp src/widgets.cpp src/util.cpp ) diff --git a/include/App.h b/include/App.h index 4b8af6e..8424f78 100644 --- a/include/App.h +++ b/include/App.h @@ -1,13 +1,13 @@ #pragma once -#include "AMI.h" +#include "MissionSelect.h" #include "defines.h" #include #include -enum class AppView { AMI, DRIVER, TESTING }; +enum class AppView { MISSION_SELECT, AMI, DRIVER, TESTING }; class SDLManager { public: @@ -33,7 +33,7 @@ private: // others and its destructor is called after the others. SDLManager sdl_manager; - std::unique_ptr ami; + std::unique_ptr mission_select; bool running; AppView view; diff --git a/include/AMI.h b/include/MissionSelect.h similarity index 82% rename from include/AMI.h rename to include/MissionSelect.h index 3e8f913..616d315 100644 --- a/include/AMI.h +++ b/include/MissionSelect.h @@ -10,10 +10,10 @@ #include #include -class AMI final : public View { +class MissionSelect final : public View { public: - AMI(SDL_Renderer* renderer); - ~AMI(); + MissionSelect(SDL_Renderer* renderer); + ~MissionSelect(); void draw() override; void handle_events(std::queue& events) override; diff --git a/src/App.cpp b/src/App.cpp index cf61cce..e9d16ab 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -1,6 +1,6 @@ #include "App.h" -#include "AMI.h" +#include "MissionSelect.h" #include "events.h" #include @@ -12,7 +12,7 @@ #include #include -App::App() : view{AppView::AMI} { init_sdl(); } +App::App() : view{AppView::MISSION_SELECT} { init_sdl(); } App::~App() { // Destroy window @@ -38,7 +38,7 @@ void App::init_sdl() { } int App::run() { - ami = std::make_unique(renderer); + mission_select = std::make_unique(renderer); running = true; @@ -77,8 +77,8 @@ void App::handle_events() { } switch (view) { - case AppView::AMI: - ami->handle_events(events); + case AppView::MISSION_SELECT: + mission_select->handle_events(events); break; default: throw std::runtime_error(fmt::format("Unknown view: {}", (int)view)); @@ -87,8 +87,8 @@ void App::handle_events() { void App::render() { switch (view) { - case AppView::AMI: - ami->draw(); + case AppView::MISSION_SELECT: + mission_select->draw(); break; default: throw std::runtime_error(fmt::format("Unknown view: {}", (int)view)); diff --git a/src/AMI.cpp b/src/MissionSelect.cpp similarity index 92% rename from src/AMI.cpp rename to src/MissionSelect.cpp index cf68804..c379707 100644 --- a/src/AMI.cpp +++ b/src/MissionSelect.cpp @@ -1,4 +1,4 @@ -#include "AMI.h" +#include "MissionSelect.h" #include "defines.h" #include "events.h" @@ -24,7 +24,7 @@ constexpr std::array MISSIONS = {"ACCELERATION", "SKIDPAD", "AUTOCROSS", "TRACKDRIVE", "EBS TEST", "INSPECTION", "MANUAL DRIVING"}; -AMI::AMI(SDL_Renderer* renderer) +MissionSelect::MissionSelect(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 = std::make_unique(renderer, FT_LOGO_PATH); @@ -55,12 +55,12 @@ AMI::AMI(SDL_Renderer* renderer) widgets.push_back(missions_widget.get()); } -AMI::~AMI() { +MissionSelect::~MissionSelect() { TTF_CloseFont(avenir); TTF_CloseFont(chinat); } -void AMI::draw() { +void MissionSelect::draw() { SDL_SetRenderDrawColor(renderer, 0x00, 0x00, 0x00, 0xFF); SDL_RenderClear(renderer); for (const auto& widget : widgets) { @@ -68,7 +68,7 @@ void AMI::draw() { } } -void AMI::handle_events(std::queue& events) { +void MissionSelect::handle_events(std::queue& events) { while (!events.empty()) { Event e = events.front(); events.pop();