Update SDL2 header usage

MartinHelmut · Apr 1, 2024 · 464fdfc · 464fdfc
1 parent c1c660c
commit 464fdfc
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 16 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -49,3 +49,4 @@ CheckOptions:
  - { key: readability-identifier-length.MinimumVariableNameLength, value: 2 }
  - { key: readability-identifier-length.MinimumParameterNameLength, value: 2 }
  - { key: cppcoreguidelines-explicit-virtual-functions.IgnoreDestructors, value: '1' }
+ - { key: misc-include-cleaner.IgnoreHeaders, value: "SDL2/SDL\.h" }
diff --git a/src/core/Core/Application.cpp b/src/core/Core/Application.cpp
@@ -1,10 +1,6 @@
 #include "Application.hpp"
 
-#include <SDL.h>
-#include <SDL_error.h>
-#include <SDL_events.h>
-#include <SDL_filesystem.h>
-#include <SDL_video.h>
+#include <SDL2/SDL.h>
 #include <backends/imgui_impl_opengl3.h>
 #include <backends/imgui_impl_sdl2.h>
 #include <glad/glad.h>
@@ -180,10 +176,14 @@ ExitStatus App::Application::run() {
 }
 
 void App::Application::stop() {
+ APP_PROFILE_FUNCTION();
+
  m_running = false;
 }
 
 void Application::on_event(const SDL_WindowEvent& event) {
+ APP_PROFILE_FUNCTION();
+
  switch (event.event) {
  case SDL_WINDOWEVENT_CLOSE:
  return on_close();
@@ -198,14 +198,20 @@ void Application::on_event(const SDL_WindowEvent& event) {
 }
 
 void Application::on_minimize() {
+ APP_PROFILE_FUNCTION();
+
  m_minimized = true;
 }
 
 void Application::on_shown() {
+ APP_PROFILE_FUNCTION();
+
  m_minimized = false;
 }
 
 void Application::on_close() {
+ APP_PROFILE_FUNCTION();
+
  stop();
 }
 

diff --git a/src/core/Core/Application.hpp b/src/core/Core/Application.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <SDL.h>
+#include <SDL2/SDL.h>
 
 #include <memory>
 #include <string>
@@ -10,7 +10,7 @@
 
 namespace App {
 
-enum class ExitStatus : int { SUCCESS = 0, FAILURE = 1 };
+enum class ExitStatus : std::uint8_t { SUCCESS = 0, FAILURE = 1 };
 
 class Application {
  public:

diff --git a/src/core/Core/DPIHandler.hpp b/src/core/Core/DPIHandler.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <imgui.h>
 
 #include "Core/Window.hpp"

diff --git a/src/core/Core/Window.cpp b/src/core/Core/Window.cpp
@@ -1,6 +1,6 @@
 #include "Window.hpp"
 
-#include <SDL_video.h>
+#include <SDL2/SDL.h>
 #include <glad/glad.h>
 
 #include "Core/DPIHandler.hpp"
@@ -49,10 +49,14 @@ Window::~Window() {
 }
 
 SDL_Window* Window::get_native_window() const {
+ APP_PROFILE_FUNCTION();
+
  return m_window;
 }
 
 SDL_GLContext Window::get_native_context() const {
+ APP_PROFILE_FUNCTION();
+
  return m_gl_context;
 }
 

diff --git a/src/core/Core/Window.hpp b/src/core/Core/Window.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <SDL.h>
+#include <SDL2/SDL.h>
 
 #include <string>
 

diff --git a/src/core/Platform/Linux/DPIHandler.cpp b/src/core/Platform/Linux/DPIHandler.cpp
@@ -1,6 +1,6 @@
 #include "Core/DPIHandler.hpp"
 
-#include <SDL_video.h>
+#include <SDL2/SDL.h>
 #include <imgui.h>
 
 #include "Core/Debug/Instrumentor.hpp"

diff --git a/src/core/Platform/Linux/Resources.cpp b/src/core/Platform/Linux/Resources.cpp
@@ -1,23 +1,29 @@
 #include "Core/Resources.hpp"
 
-#include <SDL_filesystem.h>
+#include <SDL2/SDL.h>
 
 #include <filesystem>
 #include <string>
 #include <string_view>
 
+#include "Core/Debug/Instrumentor.hpp"
+
 namespace App {
 
 static const std::string BASE_PATH{SDL_GetBasePath()};
 
 std::filesystem::path Resources::resource_path(const std::filesystem::path& file_path) {
+ APP_PROFILE_FUNCTION();
+
  std::filesystem::path font_path{BASE_PATH};
  font_path /= "../share";
  font_path /= "fonts" / file_path;
  return font_path;
 }
 
 std::filesystem::path Resources::font_path(const std::string_view& font_file) {
+ APP_PROFILE_FUNCTION();
+
  return resource_path(font_file);
 }
 

diff --git a/src/core/Platform/Mac/DPIHandler.cpp b/src/core/Platform/Mac/DPIHandler.cpp
@@ -1,6 +1,6 @@
 #include "Core/DPIHandler.hpp"
 
-#include <SDL_video.h>
+#include <SDL2/SDL.h>
 #include <imgui.h>
 
 #include <cmath>

diff --git a/src/core/Platform/Mac/Resources.cpp b/src/core/Platform/Mac/Resources.cpp
@@ -1,22 +1,28 @@
 #include "Core/Resources.hpp"
 
-#include <SDL_filesystem.h>
+#include <SDL2/SDL.h>
 
 #include <filesystem>
 #include <string>
 #include <string_view>
 
+#include "Core/Debug/Instrumentor.hpp"
+
 namespace App {
 
 static const std::string BASE_PATH{SDL_GetBasePath()};
 
 std::filesystem::path Resources::resource_path(const std::filesystem::path& file_path) {
+ APP_PROFILE_FUNCTION();
+
  std::filesystem::path font_path{BASE_PATH};
  font_path /= file_path;
  return font_path;
 }
 
 std::filesystem::path Resources::font_path(const std::string_view& font_file) {
+ APP_PROFILE_FUNCTION();
+
  return resource_path(font_file);
 }
 

diff --git a/src/core/Platform/Windows/DPIHandler.cpp b/src/core/Platform/Windows/DPIHandler.cpp
@@ -1,6 +1,6 @@
 #include "Core/DPIHandler.hpp"
 
-#include <SDL_video.h>
+#include <SDL2/SDL.h>
 #include <imgui.h>
 
 #include "Core/Debug/Instrumentor.hpp"

diff --git a/src/core/Platform/Windows/Resources.cpp b/src/core/Platform/Windows/Resources.cpp
@@ -1,22 +1,28 @@
 #include "Core/Resources.hpp"
 
-#include <SDL_filesystem.h>
+#include <SDL2/SDL.h>
 
 #include <filesystem>
 #include <string>
 #include <string_view>
 
+#include "Core/Debug/Instrumentor.hpp"
+
 namespace App {
 
 static const std::string BASE_PATH{SDL_GetBasePath()};
 
 std::filesystem::path Resources::resource_path(const std::filesystem::path& file_path) {
+ APP_PROFILE_FUNCTION();
+
  std::filesystem::path font_path{BASE_PATH};
  font_path /= "../share" / file_path;
  return font_path;
 }
 
 std::filesystem::path Resources::font_path(const std::string_view& font_file) {
+ APP_PROFILE_FUNCTION();
+
  return resource_path("fonts") / font_file;
 }