diff --git a/CMakeLists.txt b/CMakeLists.txt index 7121b05..beee030 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ else() endif() FilterPlatformPaths(sources) SetWarningSettings(openVulkanoCpp) -set_property(TARGET openVulkanoCpp PROPERTY CXX_STANDARD 17) +set_property(TARGET openVulkanoCpp PROPERTY CXX_STANDARD 20) target_sources(openVulkanoCpp PRIVATE ${sources}) target_include_directories(openVulkanoCpp PUBLIC openVulkanoCpp) diff --git a/openVulkanoCpp/Base/Version.cpp b/openVulkanoCpp/Base/Version.cpp index fb92c13..dbabe20 100644 --- a/openVulkanoCpp/Base/Version.cpp +++ b/openVulkanoCpp/Base/Version.cpp @@ -9,10 +9,6 @@ #include #include -#if (__cplusplus >= 202002L) -#include -#endif - namespace OpenVulkano { namespace @@ -26,7 +22,7 @@ namespace OpenVulkano ComponentDecodeHolder(const std::string_view& versionStr) { if (versionStr.empty()) return; - int offset = 0; + size_t offset = 0; if (versionStr[0] == 'v' || versionStr[0] == 'V') { offset++; @@ -54,7 +50,7 @@ namespace OpenVulkano return tmp; } - static void ReadVersionComponents(std::vector& comps, const std::string_view& versionStr, int& offset) + static void ReadVersionComponents(std::vector& comps, const std::string_view& versionStr, size_t& offset) { do { @@ -66,7 +62,7 @@ namespace OpenVulkano } while(versionStr.size() > offset); } - static void ReadTagComponents(std::vector& tags, const std::string_view& versionStr, int& offset) + static void ReadTagComponents(std::vector& tags, const std::string_view& versionStr, size_t& offset) { do { @@ -88,14 +84,10 @@ namespace OpenVulkano } } - Version::Version(uint32_t major, uint32_t minor, uint32_t patch, uint32_t build) + Version::Version(uint32_t major, uint32_t minor, uint32_t patch, const uint32_t build) : m_versionComponents(build ? std::initializer_list{major, minor, patch, build} : std::initializer_list{major, minor, patch}) , m_buildNumber(build) -#if (__cplusplus >= 202002L) - , m_versionString(std::format(build ? "v{}.{}.{}.{}" : "v{}.{}.{}", major, minor, patch, build)) -#else , m_versionString("v" + std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(patch) + (build ? "." + std::to_string(build) : "")) -#endif {} Version::Version(std::string_view versionString, bool ignoreTags) diff --git a/openVulkanoCpp/Data/Containers/Array.hpp b/openVulkanoCpp/Data/Containers/Array.hpp index 9f2924a..4df03ec 100644 --- a/openVulkanoCpp/Data/Containers/Array.hpp +++ b/openVulkanoCpp/Data/Containers/Array.hpp @@ -11,6 +11,8 @@ #include #include #include +#include +#include namespace OpenVulkano { diff --git a/openVulkanoCpp/Host/GraphicsAppManager.cpp b/openVulkanoCpp/Host/GraphicsAppManager.cpp index cfa1d7d..c7f34ac 100644 --- a/openVulkanoCpp/Host/GraphicsAppManager.cpp +++ b/openVulkanoCpp/Host/GraphicsAppManager.cpp @@ -174,7 +174,7 @@ namespace OpenVulkano fpsTimer = 0; if (window->HasTitle()) { - window->SetTitle(fmt::format(windowTitleFormat, avgFps, avgFrameTime)); + window->SetTitle(fmt::format(fmt::runtime(windowTitleFormat), avgFps, avgFrameTime)); } } } diff --git a/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.cpp b/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.cpp index 5049c97..9fd080e 100644 --- a/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.cpp +++ b/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.cpp @@ -35,7 +35,7 @@ namespace OpenVulkano void MultiPartArchiveWriter::StartNewFile() { - m_archives.push_back(m_dir / fmt::format(m_fileNamePattern, m_archiveId++)); + m_archives.push_back(m_dir / fmt::format(fmt::runtime(m_fileNamePattern), m_archiveId++)); #ifdef WIN32 m_writer = std::make_unique(m_archives.back().string().c_str(), m_archiveConfig, m_logger); #else diff --git a/openVulkanoCpp/Math/ByteSize.hpp b/openVulkanoCpp/Math/ByteSize.hpp index bce6e1d..6cda7cc 100644 --- a/openVulkanoCpp/Math/ByteSize.hpp +++ b/openVulkanoCpp/Math/ByteSize.hpp @@ -171,7 +171,7 @@ template<> struct fmt::formatter template auto format(const OpenVulkano::ByteSize& bs, FormatContext& ctx) { - return format_to(ctx.out(), "{}", bs.Format()); + return fmt::format_to(ctx.out(), "{}", bs.Format()); } }; #endif \ No newline at end of file diff --git a/openVulkanoCpp/Scene/UI/ImGuiExtensions/ImGuiTextFmt.hpp b/openVulkanoCpp/Scene/UI/ImGuiExtensions/ImGuiTextFmt.hpp index b628ef4..558519d 100644 --- a/openVulkanoCpp/Scene/UI/ImGuiExtensions/ImGuiTextFmt.hpp +++ b/openVulkanoCpp/Scene/UI/ImGuiExtensions/ImGuiTextFmt.hpp @@ -19,9 +19,24 @@ namespace ImGui { - template - IMGUI_API void TextFmt(T&& fmt, const Args &... args) { - std::string str = fmt::format(std::forward(fmt), args...); + template + void TextFmt(const std::string_view& fmt, const Args&... args) + { + std::string str = fmt::format(fmt::runtime(fmt), (args)...); + ImGui::TextUnformatted(str.data(), str.data() + str.size()); + } + + template + void TextFmt(const std::string_view& fmt, Args&&... args) + { + std::string str = fmt::format(fmt::runtime(fmt), std::forward(args)...); + ImGui::TextUnformatted(str.data(), str.data() + str.size()); + } + + template + IMGUI_API void TextFmt(Args &&... args) + { + std::string str = fmt::format(FMT, std::forward(args)...); ImGui::TextUnformatted(str.data(), str.data() + str.size()); } } \ No newline at end of file diff --git a/openVulkanoCpp/Vulkan/DeviceManager.cpp b/openVulkanoCpp/Vulkan/DeviceManager.cpp index d540e4e..973d4da 100644 --- a/openVulkanoCpp/Vulkan/DeviceManager.cpp +++ b/openVulkanoCpp/Vulkan/DeviceManager.cpp @@ -7,6 +7,7 @@ #include "DeviceManager.hpp" #include "Device.hpp" #include +#include namespace OpenVulkano::Vulkan {