Optimised project structure

Created debug flags to use/not use separate parts of project
Need to not include not using parts
Optimised includes, many changes in them
Changed loaders structure

Author: kolyaka32

src/data/app.hpp

@@ -5,11 +5,11 @@
 
 #pragma once
 
-#include "libraries.hpp"
-#include "initFile.hpp"
 #include "preloaded/sounds.hpp"
 #include "preloaded/music.hpp"
 #include "window.hpp"
+#include "mouse.hpp"
+#include "macroses.hpp"
 
 
 // Class of whole current application

src/data/exceptions.hpp

@@ -19,11 +19,11 @@ class LoadException : public std::exception {
     const char* message;
 
  public:
-    LoadException() : message("Unknown error\n") {}
-    LoadException(const std::string _message) : message(_message.std::string::c_str()) {}
-    ~LoadException() {}
-    const char* what() const noexcept override {
+    LoadException() : LoadException("Unknown error\n") {}
+    LoadException(const std::string _message) : message(_message.std::string::c_str()) {
         logImportant(message);
+    }
+    const char* what() const noexcept override {
         return message;
     };
 };
@@ -32,11 +32,8 @@ class LoadException : public std::exception {
 class LibararyLoadException : LoadException {
  public:
     LibararyLoadException(const std::string _library = "")
-        : LoadException("Error with loading library: " + _library + '\n') {
-        SDL_LogCritical(SDL_LOG_PRIORITY_CRITICAL, "%s", message);
-    }
+        : LoadException("Error with loading library: " + _library + '\n') {}
     const char* what() const noexcept override {
-        SDL_LogCritical(SDL_LOG_PRIORITY_CRITICAL, "%s", message);
         return message;
     }
 };
@@ -45,11 +42,8 @@ class LibararyLoadException : LoadException {
 class DataLoadException : LoadException {
  public:
     DataLoadException(const std::string _dataType = "")
-        : LoadException("Error with load file: " + _dataType + '\n') {
-        SDL_LogError(SDL_LOG_PRIORITY_ERROR, "%s", message);
-    }
+        : LoadException("Error with load file: " + _dataType + '\n') {}
     const char* what() const noexcept override {
-        SDL_LogError(SDL_LOG_PRIORITY_ERROR, "%s", message);
         return message;
     }
 };

src/data/initFile.cpp

@@ -6,6 +6,9 @@
 #include "initFile.hpp"
 
 
+// Check if has initfile
+#if USE_SETTING_FILE
+
 InitFile::InitFile() {
     loadSettings();
 }
@@ -21,3 +24,5 @@ const std::string InitFile::getText(const std::string _line) const {
 const unsigned InitFile::getValue(const std::string _line) const {
     return std::stoi(_line.substr(_line.rfind('=') + 2));
 }
+
+#endif  // USE_SETTING_FILE

src/data/initFile.hpp

@@ -10,6 +10,9 @@
 #include "exceptions.hpp"
 
 
+// Check if has initfile
+#if USE_SETTING_FILE
+
 // Class for load/save settings to/from game
 class InitFile {
  private:
@@ -22,3 +25,5 @@ class InitFile {
     void loadSettings();
     void saveSettings();
 };
+
+#endif  // USE_SETTING_FILE

src/data/libraries.cpp

@@ -7,20 +7,24 @@
 #include <SDL3_mixer/SDL_mixer.h>
 #include <SDL3_ttf/SDL_ttf.h>
 #include "libraries.hpp"
+#include "exceptions.hpp"
 
 
 Libraries::Libraries() {
-    // Load depend on teting
+    // Load depend on testing
     #if CHECK_CORRECTION
     // Initialasing main library
     if (!SDL_Init(SDL_INIT_AUDIO | SDL_INIT_VIDEO)) {
         throw LibararyLoadException("Main library: " + std::string(SDL_GetError()));
     }
     // Initialasing font library
+    #if USE_SDL_FONT
     if (!TTF_Init()) {
         throw LibararyLoadException("Font library: " + std::string(SDL_GetError()));
     }
+    #endif
     // Initialasing audio library
+    #if USE_SDL_MIXER
     if (!Mix_Init(MIX_INIT_MP3 | MIX_INIT_WAVPACK)) {
         throw LibararyLoadException("Mixer library: " + std::string(SDL_GetError()));
     }
@@ -33,23 +37,34 @@ Libraries::Libraries() {
     if (!Mix_OpenAudio(audioDeviceID, NULL)) {
         throw LibararyLoadException("Couldn't initialase audio chanel: " + std::string(SDL_GetError()));
     }
+    #endif
     logAdditional("Libraries load correctly");
-    #else
+    #else  // CHECK_CORRECTION
     SDL_Init(SDL_INIT_AUDIO | SDL_INIT_VIDEO);
+    #if USE_SDL_FONT
     TTF_Init();
+    #endif
+    #if USE_SDL_MIXER
     Mix_Init(MIX_INIT_MP3 | MIX_INIT_WAVPACK);
     audioDeviceID = SDL_OpenAudioDevice(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, NULL);
     Mix_OpenAudio(audioDeviceID, NULL);
     #endif
+    #endif  // CHECK_CORRECTION
 }
 
 Libraries::~Libraries() noexcept {
     // Closing audio device
+    #if USE_SDL_MIXER
     Mix_CloseAudio();
     SDL_CloseAudioDevice(audioDeviceID);
+    #endif
 
     // Closing all library reversed
+    #if USE_SDL_MIXER
     Mix_CloseAudio();
+    #endif
+    #if USE_SDL_FONT
     TTF_Quit();
+    #endif
     SDL_Quit();
 }

src/data/libraries.hpp

@@ -6,7 +6,6 @@
 #pragma once
 
 #include <SDL3/SDL_audio.h>
-#include "exceptions.hpp"
 
 
 // Class for load and close needed libraries

src/data/logger.hpp

@@ -6,7 +6,7 @@
 #pragma once
 
 #include <SDL3/SDL_log.h>
-#include "../testing.hpp"
+#include "../define.hpp"
 
 
 // Function for log important information

src/data/mouse.cpp

@@ -5,7 +5,6 @@
 
 #include <SDL3/SDL_mouse.h>
 #include "mouse.hpp"
-#include "macroses.hpp"
 
 
 Mouse::Mouse() {
@@ -21,7 +20,7 @@ bool Mouse::in(SDL_FRect _rect) const {
 }
 
 bool Mouse::near(float _x, float _y) const {
-    return (sqr(_x-position.x)+sqr(_y-position.y)) < sqr(5);
+    return ((_x-position.x)*(_x-position.x)+(_y-position.y)*(_y-position.y)) < 25;
 }
 
 float Mouse::getX() const {

src/data/preloaded/fonts.cpp

@@ -5,6 +5,12 @@
 
 #include "fonts.hpp"
 
+// Check, if use fonts and preload it
+#if USE_SDL_FONT && PRELOAD_FONTS
+
+#include "loader/loader.hpp"
+#include "../exceptions.hpp"
+
 
 FontsData::FontsData() {
     // Resetting fonts array
@@ -53,3 +59,5 @@ void FontsData::loadFont(Fonts _index, const char* _fileName) {
 TTF_Font* FontsData::operator[](Fonts _index) const {
     return fonts[unsigned(_index)];
 }
+
+#endif  // USE_SDL_FONT && PRELOAD_FONTS

src/data/preloaded/fonts.hpp

@@ -5,10 +5,13 @@
 
 #pragma once
 
-#include <SDL3_ttf/SDL_ttf.h>
-#include "loader/loader.hpp"
 #include "../../fontsNames.hpp"
 
+// Check, if use fonts and preload it
+#if USE_SDL_FONT && PRELOAD_FONTS
+
+#include <SDL3_ttf/SDL_ttf.h>
+
 
 // Class for get font with need height
 class FontsData {
@@ -21,3 +24,5 @@ class FontsData {
     ~FontsData();
     TTF_Font* operator[](Fonts index) const;
 };
+
+#endif  // USE_SDL_FONT && PRELOAD_FONTS