AMI -> MissionSelect

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
 )

include/App.h

@@ -1,13 +1,13 @@
 #pragma once
 
-#include "AMI.h"
+#include "MissionSelect.h"
 #include "defines.h"
 
 #include <SDL2/SDL.h>
 
 #include <memory>
 
-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> ami;
+  std::unique_ptr<MissionSelect> mission_select;
 
   bool running;
   AppView view;

include/MissionSelect.h

@@ -10,10 +10,10 @@
 #include <queue>
 #include <vector>
 
-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<Event>& events) override;

src/App.cpp

@@ -1,6 +1,6 @@
 #include "App.h"
 
-#include "AMI.h"
+#include "MissionSelect.h"
 #include "events.h"
 
 #include <SDL2/SDL.h>
@@ -12,7 +12,7 @@
 #include <queue>
 #include <stdexcept>
 
-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<AMI>(renderer);
+  mission_select = std::make_unique<MissionSelect>(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));

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<ImageWidget>(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<Event>& events) {
+void MissionSelect::handle_events(std::queue<Event>& events) {
   while (!events.empty()) {
     Event e = events.front();
     events.pop();