GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Added ryml to linker list, loading EngineConfiguration from a file(if exists)' (#30) from make_engineconfiguration_loadable into master

Browse Source 
Reviewed-on: https://git.madvoxel.net/OpenVulkano/OpenVulkano/pulls/30
Reviewed-by: TymurStrelchyk <tymur.strelchyk.ext@madvoxel.com>
Reviewed-by: Georg Hagen <georg.hagen@madvoxel.com>
This commit is contained in:
Vladyslav_Baranovskyi_EXT
2024-06-04 10:59:06 +02:00
parent d1f1d208b1 0692e52bb9
commit 9c225dc52a
3 changed files with 72 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -94,7 +94,7 @@ endif()
list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/deps/INSTALL) list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/deps/INSTALL)
target_link_libraries(openVulkanoCpp PRIVATE magic_enum yaml-cpp fmt spdlog glm pugixml stb eigen utf8cpp imgui_internal TracyClient stud-uuid) target_link_libraries(openVulkanoCpp PRIVATE magic_enum yaml-cpp fmt spdlog glm pugixml stb eigen utf8cpp imgui_internal TracyClient stud-uuid ryml)
add_compile_definitions(LIBARCHIVE_STATIC) add_compile_definitions(LIBARCHIVE_STATIC)
add_compile_definitions(NOMINMAX) add_compile_definitions(NOMINMAX)

60
openVulkanoCpp/Base/EngineConfiguration.cpp Normal file
View File

@@ -0,0 +1,60 @@
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
#include <fstream>
#include <string>
#include <ryml.hpp>
#include <ryml_std.hpp>
#include "EngineConfiguration.hpp"
#include "IO/AppFolders.hpp"
#include "Utils.hpp"
namespace OpenVulkano
{
namespace
{
const char *NUM_THREADS_STR = "num_threads";
const char *FRAMEBUFFER_CLEAR_COLOR_STR = "framebuffer_clear_color";
const char *PREFER_FRAMEBUFFER_FORMAT_SRGB_STR = "prefer_framebuffer_format_srgb";
}
EngineConfiguration::EngineConfiguration()
{
const std::string filePath = (AppFolders::GetAppConfigHomeDir() / "EngineConfig.yml").string();
Array<char> fileContents = Utils::ReadFile(filePath, true);
if(fileContents.Size() == 0)
return;
ryml::Tree tree = ryml::parse_in_arena(ryml::to_csubstr(fileContents.Data()));
ryml::NodeRef root = tree.rootref();
if (root.has_child(NUM_THREADS_STR) && root[NUM_THREADS_STR].val().is_integer())
{
root[NUM_THREADS_STR] >> m_numThreads;
}
if (root.has_child(FRAMEBUFFER_CLEAR_COLOR_STR) && root[FRAMEBUFFER_CLEAR_COLOR_STR].is_seq() && root[FRAMEBUFFER_CLEAR_COLOR_STR].num_children() == 4)
{
auto clearColorNode = root[FRAMEBUFFER_CLEAR_COLOR_STR];
for (size_t i = 0; i < 4; ++i)
{
clearColorNode[i] >> m_frameBufferClearColor[i];
}
}
if (root.has_child(PREFER_FRAMEBUFFER_FORMAT_SRGB_STR))
{
root[PREFER_FRAMEBUFFER_FORMAT_SRGB_STR] >> m_preferFramebufferFormatSRGB;
}
}
EngineConfiguration* EngineConfiguration::GetEngineConfiguration()
{
static EngineConfiguration config;
return &config;
}
}

46
openVulkanoCpp/Base/EngineConfiguration.hpp
View File

@@ -8,6 +8,7 @@
#include <cstdint> #include <cstdint>
#include <algorithm> #include <algorithm>
#include <array>
#undef max #undef max
namespace OpenVulkano namespace OpenVulkano
@@ -15,7 +16,7 @@ namespace OpenVulkano
class EngineConfiguration class EngineConfiguration
{ {
private: private:
EngineConfiguration() = default; EngineConfiguration();
~EngineConfiguration() = default; ~EngineConfiguration() = default;
uint32_t m_numThreads = 1; uint32_t m_numThreads = 1;
@@ -23,40 +24,15 @@ namespace OpenVulkano
bool m_preferFramebufferFormatSRGB = true; bool m_preferFramebufferFormatSRGB = true;
public: public:
[[nodiscard]] static EngineConfiguration* GetEngineConfiguration() [[nodiscard]] static EngineConfiguration* GetEngineConfiguration();
{
static EngineConfiguration config;
return &config;
}
void SetNumThreads(uint32_t numThreads) void SetNumThreads(uint32_t numThreads) { m_numThreads = numThreads; }
{ [[nodiscard]] uint32_t GetNumThreads() const { return std::max(static_cast<uint32_t>(1), m_numThreads); }
m_numThreads = numThreads;
} void SetFrameBufferClearColor(std::array<float, 4> frameBufferClearColor) { m_frameBufferClearColor = frameBufferClearColor; }
[[nodiscard]] const std::array<float, 4>& GetFrameBufferClearColor() const { return m_frameBufferClearColor; }
[[nodiscard]] uint32_t GetNumThreads() const
{ [[nodiscard]] bool GetPreferFramebufferFormatSRGB() const {return m_preferFramebufferFormatSRGB; }
return std::max(static_cast<uint32_t>(1), m_numThreads); void SetPreferFramebufferFormatSRGB(bool sRGB) { m_preferFramebufferFormatSRGB = sRGB; }
}
void SetFrameBufferClearColor(std::array<float, 4> frameBufferClearColor)
{
m_frameBufferClearColor = frameBufferClearColor;
}
[[nodiscard]] const std::array<float, 4>& GetFrameBufferClearColor() const
{
return m_frameBufferClearColor;
}
[[nodiscard]] bool GetPreferFramebufferFormatSRGB() const
{
return m_preferFramebufferFormatSRGB;
}
void SetPreferFramebufferFormatSRGB(bool sRGB)
{
m_preferFramebufferFormatSRGB = sRGB;
}
}; };
} }