diff --git a/openVulkanoCpp/AR/ArSessionMetadata.cpp b/openVulkanoCpp/AR/ArSessionMetadata.cpp index 19673ca..559de93 100644 --- a/openVulkanoCpp/AR/ArSessionMetadata.cpp +++ b/openVulkanoCpp/AR/ArSessionMetadata.cpp @@ -10,6 +10,7 @@ #include #include #include +#include namespace OpenVulkano::AR { @@ -21,7 +22,7 @@ namespace OpenVulkano::AR : ArSessionMetadata(type, format, confRange, resolution, frameRate, SystemInfo::GetDeviceModelName(), SystemInfo::GetOsNameHumanReadable()) {} - ArSessionMetadata ArSessionMetadata::FromXML(const std::string& filePath) + ArSessionMetadata ArSessionMetadata::FromXML(const std::filesystem::path& filePath) { pugi::xml_document doc; pugi::xml_parse_result result = doc.load_file(filePath.c_str()); @@ -49,9 +50,10 @@ namespace OpenVulkano::AR }; } - ArSessionMetadata ArSessionMetadata::FromYaml(const std::string& filePath) + ArSessionMetadata ArSessionMetadata::FromYaml(const std::filesystem::path& filePath) { - YAML::Node meta = YAML::LoadFile(filePath); + std::ifstream fin(filePath); + YAML::Node meta = YAML::Load(fin); ArSessionMetadata metadata = { ArType::GetFromName(meta["Type"].Scalar()), @@ -150,4 +152,4 @@ Version: {} type.GetName(), depthFormat.GetName(), static_cast(confidenceRange.min), static_cast(confidenceRange.max), imageResolution.x, imageResolution.y, frameRate, device, os, version, FinishedRecordingInfoToYaml()); } -} \ No newline at end of file +} diff --git a/openVulkanoCpp/AR/ArSessionMetadata.hpp b/openVulkanoCpp/AR/ArSessionMetadata.hpp index f88edf2..a0e488f 100644 --- a/openVulkanoCpp/AR/ArSessionMetadata.hpp +++ b/openVulkanoCpp/AR/ArSessionMetadata.hpp @@ -60,8 +60,8 @@ namespace OpenVulkano::AR static bool DirHasMetadata(const std::filesystem::path& dirPath); - [[deprecated]] static ArSessionMetadata FromXML(const std::string& filePath); + static ArSessionMetadata FromXML(const std::filesystem::path& filePath); - [[deprecated]] static ArSessionMetadata FromYaml(const std::string& filePath); + static ArSessionMetadata FromYaml(const std::filesystem::path& filePath); }; } \ No newline at end of file diff --git a/openVulkanoCpp/Image/ImageLoaderJpeg.cpp b/openVulkanoCpp/Image/ImageLoaderJpeg.cpp index 1a9fe74..408dd80 100644 --- a/openVulkanoCpp/Image/ImageLoaderJpeg.cpp +++ b/openVulkanoCpp/Image/ImageLoaderJpeg.cpp @@ -42,7 +42,7 @@ namespace OpenVulkano::Image return Math::Vector2i { -1, -1 }; } Math::Vector2i res = {}; - int size = 0, jpegSubsamp = 0; + int jpegSubsamp = 0; int status = tjDecompressHeader2(jpegDecompressor, reinterpret_cast(image.Data()), image.Size(), &res.x, &res.y, &jpegSubsamp); if (status != 0) diff --git a/openVulkanoCpp/Math/Math.hpp b/openVulkanoCpp/Math/Math.hpp index 7f0f9ce..81502b8 100644 --- a/openVulkanoCpp/Math/Math.hpp +++ b/openVulkanoCpp/Math/Math.hpp @@ -58,6 +58,30 @@ namespace OpenVulkano::Math { if (e1 > e2) std::swap(e1, e2); } + + template + T maxVal(const glm::tvec3& vec) + { + return std::max(vec.x, std::max(vec.y, vec.z)); + } + + template + T maxVal(const glm::tvec4& vec) + { + return std::max(std::max(vec.x, vec.y), std::max(vec.z, vec.w)); + } + + template + T minVal(const glm::tvec3& vec) + { + return std::min(vec.x, std::min(vec.y, vec.z)); + } + + template + T minVal(const glm::tvec4& vec) + { + return std::min(std::min(vec.x, vec.y), std::min(vec.z, vec.w)); + } } template using Matrix2_SIMD = glm::tmat2x2; diff --git a/openVulkanoCpp/Math/RGB10A2.hpp b/openVulkanoCpp/Math/RGB10A2.hpp index 4b79ce3..27dd1bc 100644 --- a/openVulkanoCpp/Math/RGB10A2.hpp +++ b/openVulkanoCpp/Math/RGB10A2.hpp @@ -30,6 +30,10 @@ namespace OpenVulkano::Math RGB10A2(TYPE value = 0) : value(value) {} +#pragma GCC diagnostic push +#pragma clang diagnostic push +#pragma GCC diagnostic ignored "-Wunused-result" +#pragma clang diagnostic ignored "-Wunused-result" template>> void Set(Vector3 vec3) { @@ -50,6 +54,8 @@ namespace OpenVulkano::Math vec4 &= VALUE_BITMASK; SetUnchecked(vec4); } +#pragma GCC diagnostic pop +#pragma clang diagnostic pop template>> void Set(const Vector3& vec3)