Pcornat/BillySheet
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Reformat

Browse Source 
Reformat
This commit is contained in:
Pcornat 2024-02-29 12:04:09 +01:00
parent 371fbcb04d
commit 7ee5899e31
Signed by: Pcornat
GPG Key ID: E0326CC678A00BDD
9 changed files with 111 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -129,11 +129,8 @@ target_compile_definitions(BillySheet PRIVATE
$<$<CONFIG:Debug>:SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_DEBUG> $<$<CONFIG:Debug>:SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_DEBUG>
$<$<CONFIG:Release>:SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_ERROR>) $<$<CONFIG:Release>:SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_ERROR>)
target_compile_definitions(spdlog PRIVATE target_compile_definitions(spdlog PRIVATE $<$<CONFIG:Debug>:_GLIBCXX_DEBUG>)
$<$<CONFIG:Debug>:_GLIBCXX_DEBUG>) target_compile_definitions(glfw PRIVATE $<$<CONFIG:Debug>:_GLIBCXX_DEBUG>)
target_compile_definitions(glfw PRIVATE
$<$<CONFIG:Debug>:_GLIBCXX_DEBUG>)
target_compile_options(spdlog PRIVATE ${COMPILE_FLAGS}) target_compile_options(spdlog PRIVATE ${COMPILE_FLAGS})
target_compile_options(glfw PRIVATE ${COMPILE_FLAGS}) target_compile_options(glfw PRIVATE ${COMPILE_FLAGS})
@ -145,4 +142,11 @@ target_link_options(BillySheet PRIVATE ${LINKER_OPTIONS})
target_link_libraries(spdlog PRIVATE ${LINKER_FLAGS}) target_link_libraries(spdlog PRIVATE ${LINKER_FLAGS})
target_link_libraries(glfw PRIVATE ${LINKER_FLAGS}) target_link_libraries(glfw PRIVATE ${LINKER_FLAGS})
target_link_libraries(BillySheet glfw spdlog::spdlog_header_only OpenGL::OpenGL GLEW::GLEW nlohmann_json::nlohmann_json ${Boost_LIBRARIES} ${LINKER_FLAGS}) target_link_libraries(BillySheet glfw
spdlog::spdlog_header_only
OpenGL::OpenGL
GLEW::GLEW
nlohmann_json::nlohmann_json
${Boost_LIBRARIES}
${LINKER_FLAGS}
)

9
include/billy_objects.hpp
View File

@ -85,8 +85,7 @@ namespace character {
characteristic::Characteristic &localHabilete, characteristic::Characteristic &localHabilete,
characteristic::Characteristic &localAdresse, characteristic::Characteristic &localAdresse,
characteristic::Characteristic &localEndurance, characteristic::Characteristic &localEndurance,
const std::function<std::uint32_t(std::uint32_t, const std::function<std::uint32_t(std::uint32_t, std::uint32_t)> &operation) noexcept;
std::uint32_t)> &operation) noexcept;
static void change_carac_equipment(const equipments &arg, static void change_carac_equipment(const equipments &arg,
CharacterSheet &sheet, CharacterSheet &sheet,
@ -95,8 +94,7 @@ namespace character {
characteristic::Characteristic &localEndurance, characteristic::Characteristic &localEndurance,
characteristic::Characteristic &localChance, characteristic::Characteristic &localChance,
const std::function<std::uint32_t(std::uint32_t, std::uint32_t)> &primary, const std::function<std::uint32_t(std::uint32_t, std::uint32_t)> &primary,
const std::function<std::uint32_t(std::uint32_t, const std::function<std::uint32_t(std::uint32_t, std::uint32_t)> &complement) noexcept;
std::uint32_t)> &complement) noexcept;
static void change_carac_tools(const tools &arg, static void change_carac_tools(const tools &arg,
CharacterSheet &sheet, CharacterSheet &sheet,
@ -104,8 +102,7 @@ namespace character {
characteristic::Characteristic &localAdresse, characteristic::Characteristic &localAdresse,
characteristic::Characteristic &localEndurance, characteristic::Characteristic &localEndurance,
characteristic::Characteristic &localChance, characteristic::Characteristic &localChance,
const std::function<std::uint32_t(std::uint32_t, const std::function<std::uint32_t(std::uint32_t, std::uint32_t)> &operation) noexcept;
std::uint32_t)> &operation) noexcept;
}; };
} }

2
include/character_sheet.hpp
View File

@ -45,6 +45,8 @@ namespace character {
std::uint32_t damage{ 0 }; std::uint32_t damage{ 0 };
std::uint32_t critique{ 0 };
std::uint32_t glory{ 0 }; std::uint32_t glory{ 0 };
std::uint32_t money{ 0 }; std::uint32_t money{ 0 };

3
src/billy_objects.cpp
View File

@ -94,8 +94,7 @@ namespace character {
Characteristic &localAdresse, Characteristic &localAdresse,
Characteristic &localEndurance, Characteristic &localEndurance,
Characteristic &localChance, Characteristic &localChance,
const std::function<std::uint32_t(std::uint32_t, const std::function<std::uint32_t(std::uint32_t, std::uint32_t)> &operation) noexcept {
std::uint32_t)> &operation) noexcept {
switch (arg) { switch (arg) {
case tools::Fourche: case tools::Fourche:
localHabilete.materiel = operation(localHabilete.materiel, 1); localHabilete.materiel = operation(localHabilete.materiel, 1);

5
src/gui/gui.cpp
View File

@ -58,9 +58,10 @@ void gui::Gui::render_gui(const Controller &controller) {
for (std::size_t i = 0; i < GuiData::classes.size(); ++i) { for (std::size_t i = 0; i < GuiData::classes.size(); ++i) {
const bool is_selected = (data.billy.get_current_class() == static_cast<character::classe>(i)); const bool is_selected = (data.billy.get_current_class() == static_cast<character::classe>(i));
if (is_selected) if (is_selected) {
ImGui::SetItemDefaultFocus(); ImGui::SetItemDefaultFocus();
} }
}
ImGui::EndCombo(); ImGui::EndCombo();
} }
@ -161,7 +162,7 @@ void gui::Gui::chance_menu() noexcept {
ImVec2(ImGui::GetWindowWidth() / 3, ImGui::GetWindowHeight() * 0.2f), ImVec2(ImGui::GetWindowWidth() / 3, ImGui::GetWindowHeight() * 0.2f),
ImGuiChildFlags_Border); ImGuiChildFlags_Border);
ImGui::Text("Chance"); ImGui::Text("Chance");
characteristic_gui(static_cast<const Characteristic&>(data.billy.get_chance())); characteristic_gui(static_cast<const Characteristic &>(data.billy.get_chance()));
ImGui::EndChild(); ImGui::EndChild();
} }