Reformat.
This commit is contained in:
parent
7d1a0473ff
commit
2755f4827e
24 changed files with 6352 additions and 6041 deletions
|
|
@ -1,2 +1,3 @@
|
||||||
#define CATCH_CONFIG_MAIN
|
#define CATCH_CONFIG_MAIN
|
||||||
|
|
||||||
#include <catch2/catch.hpp>
|
#include <catch2/catch.hpp>
|
||||||
|
|
@ -12,7 +12,7 @@ namespace gui {
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace character {
|
namespace character {
|
||||||
enum class classe : std::uint32_t {
|
enum class classe : std::uint8_t {
|
||||||
Guerrier = 0,
|
Guerrier = 0,
|
||||||
Prudent = 1,
|
Prudent = 1,
|
||||||
Paysan = 2,
|
Paysan = 2,
|
||||||
|
|
@ -51,6 +51,14 @@ namespace character {
|
||||||
public:
|
public:
|
||||||
CharacterSheet() = default;
|
CharacterSheet() = default;
|
||||||
|
|
||||||
|
CharacterSheet(const CharacterSheet &sheet) noexcept = default;
|
||||||
|
|
||||||
|
CharacterSheet(CharacterSheet &&sheet) noexcept = default;
|
||||||
|
|
||||||
|
CharacterSheet &operator=(const CharacterSheet &characterSheet) noexcept = default;
|
||||||
|
|
||||||
|
CharacterSheet &operator=(CharacterSheet &&characterSheet) noexcept = default;
|
||||||
|
|
||||||
~CharacterSheet() noexcept = default;
|
~CharacterSheet() noexcept = default;
|
||||||
|
|
||||||
[[nodiscard]] const std::string &get_caractere() const { return caractere; }
|
[[nodiscard]] const std::string &get_caractere() const { return caractere; }
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,10 @@ namespace character::characteristic {
|
||||||
public:
|
public:
|
||||||
Characteristic() noexcept = default;
|
Characteristic() noexcept = default;
|
||||||
|
|
||||||
Characteristic(const std::uint32_t base, const std::uint32_t carac, const std::uint32_t materiel, const std::uint32_t additional) noexcept:
|
Characteristic(const std::uint32_t base,
|
||||||
|
const std::uint32_t carac,
|
||||||
|
const std::uint32_t materiel,
|
||||||
|
const std::uint32_t additional) noexcept:
|
||||||
base(base), carac(carac), materiel(materiel), additional(additional) {}
|
base(base), carac(carac), materiel(materiel), additional(additional) {}
|
||||||
|
|
||||||
Characteristic(const Characteristic &charac) noexcept = default;
|
Characteristic(const Characteristic &charac) noexcept = default;
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,8 @@ private:
|
||||||
public:
|
public:
|
||||||
Controller() = delete;
|
Controller() = delete;
|
||||||
|
|
||||||
explicit Controller(character::CharacterSheet &sheet, gui::menu::MenuData &menuData) : sheet(sheet), menu_data(menuData) {}
|
explicit Controller(character::CharacterSheet &sheet, gui::menu::MenuData &menuData) :
|
||||||
|
sheet(sheet), menu_data(menuData) {}
|
||||||
|
|
||||||
~Controller() noexcept = default;
|
~Controller() noexcept = default;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -36,9 +36,11 @@ namespace gui::menu {
|
||||||
|
|
||||||
[[nodiscard]] bool is_edit_mode() const { return edit_mode; }
|
[[nodiscard]] bool is_edit_mode() const { return edit_mode; }
|
||||||
|
|
||||||
void set_save_path([[maybe_unused]] const Controller &controller, const fs::path &savePath) const { save_path = savePath; }
|
void set_save_path([[maybe_unused]] const Controller &controller,
|
||||||
|
const fs::path &savePath) const { save_path = savePath; }
|
||||||
|
|
||||||
void set_filename([[maybe_unused]] const Controller &controller, const std::string &fileName) const { filename = fileName; }
|
void set_filename([[maybe_unused]] const Controller &controller,
|
||||||
|
const std::string &fileName) const { filename = fileName; }
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,8 @@ namespace gui {
|
||||||
|
|
||||||
~Window() noexcept = default;
|
~Window() noexcept = default;
|
||||||
|
|
||||||
[[nodiscard]] const std::unique_ptr<GLFWwindow, decltype(&delete_glfw_window)> &get_window() const { return wwindow; }
|
[[nodiscard]] const std::unique_ptr<GLFWwindow, decltype(&delete_glfw_window)> &
|
||||||
|
get_window() const { return wwindow; }
|
||||||
|
|
||||||
[[nodiscard]] bool should_close() const noexcept;
|
[[nodiscard]] bool should_close() const noexcept;
|
||||||
|
|
||||||
|
|
|
||||||
1541
include/stb_image.h
1541
include/stb_image.h
File diff suppressed because it is too large
Load diff
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue