From 85cc8abb7b54196fa62c6269a19b8ec917c5e3e6 Mon Sep 17 00:00:00 2001 From: GeorgH93 Date: Mon, 14 Dec 2020 21:21:21 +0100 Subject: [PATCH] Minor fixes and extensions --- openVulkanoCpp/IO/Archive/ArchiveReader.cpp | 1 + openVulkanoCpp/Math/CameraIntrinsic.hpp | 4 +++- openVulkanoCpp/Math/Timestamp.hpp | 12 ++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/openVulkanoCpp/IO/Archive/ArchiveReader.cpp b/openVulkanoCpp/IO/Archive/ArchiveReader.cpp index ee58ad5..fb57ccb 100644 --- a/openVulkanoCpp/IO/Archive/ArchiveReader.cpp +++ b/openVulkanoCpp/IO/Archive/ArchiveReader.cpp @@ -34,6 +34,7 @@ namespace openVulkanoCpp : ArchiveBase(archive_read_new(), nullptr, logger) { ChkErr(archive_read_support_filter_all(m_archive)); + ChkErr(archive_read_support_format_all(m_archive)); ChkErr(archive_read_open_memory(m_archive, archiveBuffer, size)); ReadNextHeader(); } diff --git a/openVulkanoCpp/Math/CameraIntrinsic.hpp b/openVulkanoCpp/Math/CameraIntrinsic.hpp index 17a730d..0e580a5 100644 --- a/openVulkanoCpp/Math/CameraIntrinsic.hpp +++ b/openVulkanoCpp/Math/CameraIntrinsic.hpp @@ -13,7 +13,9 @@ namespace openVulkanoCpp::Math class CameraIntrinsic { public: - const Math::Matrix3f cameraMatrix; + Math::Matrix3f cameraMatrix; + + CameraIntrinsic() : CameraIntrinsic(Math::Matrix3f(0)) {} CameraIntrinsic(const Math::Matrix3f& camMat) : cameraMatrix(camMat) {} diff --git a/openVulkanoCpp/Math/Timestamp.hpp b/openVulkanoCpp/Math/Timestamp.hpp index b99fb95..e8fdb97 100644 --- a/openVulkanoCpp/Math/Timestamp.hpp +++ b/openVulkanoCpp/Math/Timestamp.hpp @@ -35,6 +35,18 @@ namespace openVulkanoCpp::Math timestamp -= rhs.timestamp; return *this; } + + Timestamp& operator =(double time) + { + timestamp = Timestamp(time).timestamp; + return *this; + } + + Timestamp& operator =(uint64_t time) + { + timestamp = time; + return *this; + } }; inline bool operator==(const Timestamp& lhs, const Timestamp& rhs)