From e976515d823f74aae1b2327af5f6c39a95b1779c Mon Sep 17 00:00:00 2001 From: Vladyslav Baranovskyi Date: Tue, 11 Feb 2025 16:15:05 +0200 Subject: [PATCH 1/6] Marked all (probably) functions that take regular string instead of std::fs::path as deprecated --- openVulkanoCpp/AR/ArRecorder.hpp | 2 +- openVulkanoCpp/AR/ArSession.hpp | 2 +- openVulkanoCpp/AR/ArSessionMetadata.hpp | 4 ++-- .../AR/Provider/Playback/ArPlaybackReader.hpp | 2 +- .../AR/Provider/Playback/ArSessionPlayback.hpp | 4 ++-- openVulkanoCpp/Base/Logger.hpp | 2 +- openVulkanoCpp/Host/ExeAppendedZipResourceLoader.hpp | 2 +- openVulkanoCpp/Host/ResourceLoader.hpp | 2 +- openVulkanoCpp/Host/SystemFontResolver.hpp | 2 +- .../Host/Windows/ResourceLoaderAppDirWindows.hpp | 2 +- openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp | 4 ++-- openVulkanoCpp/Image/ImageLoader.hpp | 6 +++--- openVulkanoCpp/Image/ImageLoaderDds.hpp | 4 ++-- openVulkanoCpp/Image/ImageLoaderJpeg.hpp | 4 ++-- openVulkanoCpp/Image/ImageLoaderKtx.hpp | 4 ++-- openVulkanoCpp/Image/ImageLoaderPfm.hpp | 4 ++-- openVulkanoCpp/Image/ImageLoaderPng.hpp | 4 ++-- openVulkanoCpp/Image/ImageLoaderPnm.hpp | 4 ++-- openVulkanoCpp/Scene/Export/MeshWriter.hpp | 12 ++++++------ openVulkanoCpp/Scene/MeshLoader.hpp | 6 +++--- .../Scene/Text/BitmapFontAtlasGenerator.hpp | 2 +- openVulkanoCpp/Scene/Text/FontAtlasFactory.hpp | 2 +- openVulkanoCpp/Scene/Text/IFontAtlasGenerator.hpp | 2 +- openVulkanoCpp/Scene/Text/SdfFontAtlasGenerator.hpp | 4 ++-- openVulkanoCpp/Shader/ShaderCompiler.hpp | 2 +- 25 files changed, 44 insertions(+), 44 deletions(-) diff --git a/openVulkanoCpp/AR/ArRecorder.hpp b/openVulkanoCpp/AR/ArRecorder.hpp index fc7bf94..4a53dc8 100644 --- a/openVulkanoCpp/AR/ArRecorder.hpp +++ b/openVulkanoCpp/AR/ArRecorder.hpp @@ -121,7 +121,7 @@ namespace OpenVulkano::AR * If path is changed after starting the recording, the already running recording will be moved to the new path. * @param path The path to be used to store the recording */ - void SetRecordingPath(const std::string& path) + void SetRecordingPath(const std::string& path) [[deprecated]] { std::filesystem::path p(path); SetRecordingPath(p); diff --git a/openVulkanoCpp/AR/ArSession.hpp b/openVulkanoCpp/AR/ArSession.hpp index d3c61a8..521040c 100644 --- a/openVulkanoCpp/AR/ArSession.hpp +++ b/openVulkanoCpp/AR/ArSession.hpp @@ -114,7 +114,7 @@ namespace OpenVulkano::AR * @param autoAdvance If set to true the playback will advance based on the stored timestamps. If set to false it will only advance if a new frame is requested. * @return ArCreateResult about the status of the AR session creation. The session pointer will always be nullptr unless the status is SUCCESS. */ - [[nodiscard]] static ArCreateResult CreatePlayback(const std::string& recordingPath, bool autoAdvance = true, bool loadImages = true, bool loadDepth = true); + [[nodiscard]] static ArCreateResult CreatePlayback(const std::string& recordingPath, bool autoAdvance = true, bool loadImages = true, bool loadDepth = true) [[deprecated]]; /** * Creates a network streamed AR session. nullptr if failed to create session for given address. This will block till the connection with the remote host has been established. diff --git a/openVulkanoCpp/AR/ArSessionMetadata.hpp b/openVulkanoCpp/AR/ArSessionMetadata.hpp index 2a9af1c..fb8821d 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); - static ArSessionMetadata FromXML(const std::string& filePath); + static ArSessionMetadata FromXML(const std::string& filePath) [[deprecated]]; - static ArSessionMetadata FromYaml(const std::string& filePath); + static ArSessionMetadata FromYaml(const std::string& filePath) [[deprecated]]; }; } \ No newline at end of file diff --git a/openVulkanoCpp/AR/Provider/Playback/ArPlaybackReader.hpp b/openVulkanoCpp/AR/Provider/Playback/ArPlaybackReader.hpp index 893e5f0..0960f78 100644 --- a/openVulkanoCpp/AR/Provider/Playback/ArPlaybackReader.hpp +++ b/openVulkanoCpp/AR/Provider/Playback/ArPlaybackReader.hpp @@ -47,7 +47,7 @@ namespace OpenVulkano::AR::Playback size_t m_imgTotalSize = 0, m_imgReadSize = 0; public: - ArPlaybackReader(const std::string& recDir) + ArPlaybackReader(const std::string& recDir) [[deprecated]] { std::string extensions = R"((_\d+|\.part\d+)?)" + std::string(TAR_EXTENSIONS_REGEX); m_archiveMetadata.Open(recDir, ".*meta(data)?" + extensions); diff --git a/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.hpp b/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.hpp index 971489c..9a1c42f 100644 --- a/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.hpp +++ b/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.hpp @@ -15,7 +15,7 @@ namespace OpenVulkano::AR::Playback class ArSessionPlayback final : public ArSession, public std::enable_shared_from_this { public: - ArSessionPlayback(const std::string& recordingPath, bool autoAdvance, bool loadImages, bool loadDepth); + ArSessionPlayback(const std::string& recordingPath, bool autoAdvance, bool loadImages, bool loadDepth); [[deprecated]] ~ArSessionPlayback() override; @@ -31,7 +31,7 @@ class ArSessionPlayback final : public ArSession, public std::enable_shared_from [[nodiscard]] ArType GetArType() override; - [[nodiscard]] const std::string& GetPlaybackPath() const { return recordingPath; } + [[nodiscard]] [[deprecated]] const std::string& GetPlaybackPath() const { return recordingPath; } [[nodiscard]] bool IsLoadColorEnabled() const { return loadImages; } [[nodiscard]] bool IsLoadDepthEnabled() const { return loadDepth; } diff --git a/openVulkanoCpp/Base/Logger.hpp b/openVulkanoCpp/Base/Logger.hpp index 2490e20..f1d1751 100644 --- a/openVulkanoCpp/Base/Logger.hpp +++ b/openVulkanoCpp/Base/Logger.hpp @@ -34,7 +34,7 @@ namespace OpenVulkano static Ptr PERF; static Ptr APP; - static void SetupLogger(std::string logFolder = "", const std::string& logFile = "openVulkano.log", bool handleSignals = false); + static void SetupLogger(std::string logFolder = "", const std::string& logFile = "openVulkano.log", bool handleSignals = false) [[deprecated]]; /** * \brief Creates a new custom logger that writes to the main log file. diff --git a/openVulkanoCpp/Host/ExeAppendedZipResourceLoader.hpp b/openVulkanoCpp/Host/ExeAppendedZipResourceLoader.hpp index a5a1863..7cc331f 100644 --- a/openVulkanoCpp/Host/ExeAppendedZipResourceLoader.hpp +++ b/openVulkanoCpp/Host/ExeAppendedZipResourceLoader.hpp @@ -16,7 +16,7 @@ namespace OpenVulkano class ExeAppendedZipResourceLoader : public ResourceLoader { public: - std::string GetResourcePath(const std::string& resourceName) final { return ""; } + std::string GetResourcePath(const std::string& resourceName) [[deprecated]] final { return ""; } Array GetResource(const std::string& resourceName) override; protected: virtual std::string GetCurrentExecutablePath() const = 0; diff --git a/openVulkanoCpp/Host/ResourceLoader.hpp b/openVulkanoCpp/Host/ResourceLoader.hpp index 3cf051e..9d0c57e 100644 --- a/openVulkanoCpp/Host/ResourceLoader.hpp +++ b/openVulkanoCpp/Host/ResourceLoader.hpp @@ -19,7 +19,7 @@ namespace OpenVulkano [[nodiscard]] virtual Array GetResource(const std::string& resourceName) = 0; - [[nodiscard]] virtual std::string GetResourcePath(const std::string& resourceName) { return ""; } + [[nodiscard]] virtual std::string GetResourcePath(const std::string& resourceName) [[deprecated]] { return ""; } static ResourceLoader& GetInstance(); diff --git a/openVulkanoCpp/Host/SystemFontResolver.hpp b/openVulkanoCpp/Host/SystemFontResolver.hpp index 83dac87..37da349 100644 --- a/openVulkanoCpp/Host/SystemFontResolver.hpp +++ b/openVulkanoCpp/Host/SystemFontResolver.hpp @@ -14,7 +14,7 @@ namespace OpenVulkano class SystemFontResolver { public: - static const std::string& GetSystemFontPath(const std::string& fontName); + static const std::string& GetSystemFontPath(const std::string& fontName) [[deprecated]]; private: static std::map ReadSystemFonts(); diff --git a/openVulkanoCpp/Host/Windows/ResourceLoaderAppDirWindows.hpp b/openVulkanoCpp/Host/Windows/ResourceLoaderAppDirWindows.hpp index 6e5a916..4107b70 100644 --- a/openVulkanoCpp/Host/Windows/ResourceLoaderAppDirWindows.hpp +++ b/openVulkanoCpp/Host/Windows/ResourceLoaderAppDirWindows.hpp @@ -13,7 +13,7 @@ namespace OpenVulkano class ResourceLoaderAppDirWindows final : public ResourceLoader { public: - std::string GetResourcePath(const std::string& resourceName) override; + std::string GetResourcePath(const std::string& resourceName) [[deprecated]] override; Array GetResource(const std::string& resourceName) override; }; } \ No newline at end of file diff --git a/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp b/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp index 823ade1..4915aba 100644 --- a/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp +++ b/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp @@ -30,13 +30,13 @@ namespace OpenVulkano void CheckSize(size_t size); public: - MultiPartArchiveWriter(const std::string& dir, const std::string& fileNamePattern, const ArchiveConfiguration& archiveConfiguration, size_t sizeLimit = 2_GiB, bool lazyCreation = false, const std::shared_ptr& logger = nullptr); + MultiPartArchiveWriter(const std::string& dir, const std::string& fileNamePattern, const ArchiveConfiguration& archiveConfiguration, size_t sizeLimit = 2_GiB, bool lazyCreation = false, const std::shared_ptr& logger = nullptr) [[deprecated]]; ~MultiPartArchiveWriter() override; bool AddFile(const FileDescription& description, const void* buffer) override; bool AddFile(const FileDescription& description, const std::vector>& buffers) override; - bool AddFile(const char* fileName, const char* inArchiveName) override; + bool AddFile(const char* fileName, const char* inArchiveName) [[deprecated]] override; using IArchiveWriter::AddFile; [[nodiscard]] virtual ArchiveOStream AddFileStream(const FileDescription& description) override; diff --git a/openVulkanoCpp/Image/ImageLoader.hpp b/openVulkanoCpp/Image/ImageLoader.hpp index d6340da..ad62e63 100644 --- a/openVulkanoCpp/Image/ImageLoader.hpp +++ b/openVulkanoCpp/Image/ImageLoader.hpp @@ -19,10 +19,10 @@ namespace OpenVulkano::Image virtual ~IImageLoader() = default; static std::unique_ptr loadData(const uint8_t* data, int size, int desiredChannels = 0); - virtual std::unique_ptr loadFromFile(const std::string& filePath) = 0; + virtual std::unique_ptr loadFromFile(const std::string& filePath) [[deprecated]] = 0; virtual std::unique_ptr loadFromMemory(const std::vector& buffer) = 0; - virtual Math::Vector2i GetImageDimensions(const std::string& filename) = 0; + virtual Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] = 0; protected: - static Math::Vector2i GetDimensionsInternal(const std::string& filename); + static Math::Vector2i GetDimensionsInternal(const std::string& filename) [[deprecated]]; }; } \ No newline at end of file diff --git a/openVulkanoCpp/Image/ImageLoaderDds.hpp b/openVulkanoCpp/Image/ImageLoaderDds.hpp index 05717c3..224be16 100644 --- a/openVulkanoCpp/Image/ImageLoaderDds.hpp +++ b/openVulkanoCpp/Image/ImageLoaderDds.hpp @@ -18,9 +18,9 @@ namespace OpenVulkano::Image class ImageLoaderDds : public IImageLoader { public: - std::unique_ptr loadFromFile(const std::string& filePath) override; + std::unique_ptr loadFromFile(const std::string& filePath) [[deprecated]] override; std::unique_ptr loadFromMemory(const std::vector& buffer) override; - Math::Vector2i GetImageDimensions(const std::string& filename) override; + Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] override; protected: std::unique_ptr ExtractImage(dds::Image* ddsImage); diff --git a/openVulkanoCpp/Image/ImageLoaderJpeg.hpp b/openVulkanoCpp/Image/ImageLoaderJpeg.hpp index 8b5d87a..6e2d726 100644 --- a/openVulkanoCpp/Image/ImageLoaderJpeg.hpp +++ b/openVulkanoCpp/Image/ImageLoaderJpeg.hpp @@ -13,9 +13,9 @@ namespace OpenVulkano::Image class ImageLoaderJpeg : public IImageLoader { public: - std::unique_ptr loadFromFile(const std::string& filePath) override; + std::unique_ptr loadFromFile(const std::string& filePath) [[deprecated]] override; std::unique_ptr loadFromMemory(const std::vector& buffer) override; - Math::Vector2i GetImageDimensions(const std::string& filename) override; + Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] override; private: std::unique_ptr loadJpeg(const uint8_t* data, size_t size); }; diff --git a/openVulkanoCpp/Image/ImageLoaderKtx.hpp b/openVulkanoCpp/Image/ImageLoaderKtx.hpp index dd86078..c339e94 100644 --- a/openVulkanoCpp/Image/ImageLoaderKtx.hpp +++ b/openVulkanoCpp/Image/ImageLoaderKtx.hpp @@ -13,8 +13,8 @@ namespace OpenVulkano::Image class ImageLoaderKtx : public IImageLoader { public: - std::unique_ptr loadFromFile(const std::string& filePath) override; + std::unique_ptr loadFromFile(const std::string& filePath) [[deprecated]] override; std::unique_ptr loadFromMemory(const std::vector& buffer) override; - Math::Vector2i GetImageDimensions(const std::string& filename) override; + Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] override; }; } diff --git a/openVulkanoCpp/Image/ImageLoaderPfm.hpp b/openVulkanoCpp/Image/ImageLoaderPfm.hpp index e823888..90203a5 100644 --- a/openVulkanoCpp/Image/ImageLoaderPfm.hpp +++ b/openVulkanoCpp/Image/ImageLoaderPfm.hpp @@ -13,8 +13,8 @@ namespace OpenVulkano::Image class ImageLoaderPfm : public IImageLoader { public: - std::unique_ptr loadFromFile(const std::string& filePath) override; + std::unique_ptr loadFromFile(const std::string& filePath) [[deprecated]] override; std::unique_ptr loadFromMemory(const std::vector& buffer) override; - Math::Vector2i GetImageDimensions(const std::string& filename) override; + Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] override; }; } \ No newline at end of file diff --git a/openVulkanoCpp/Image/ImageLoaderPng.hpp b/openVulkanoCpp/Image/ImageLoaderPng.hpp index 2ab52dc..9e1121e 100644 --- a/openVulkanoCpp/Image/ImageLoaderPng.hpp +++ b/openVulkanoCpp/Image/ImageLoaderPng.hpp @@ -13,8 +13,8 @@ namespace OpenVulkano::Image class ImageLoaderPng : public IImageLoader { public: - std::unique_ptr loadFromFile(const std::string& filePath) override; + std::unique_ptr loadFromFile(const std::string& filePath) [[deprecated]] override; std::unique_ptr loadFromMemory(const std::vector& buffer) override; - Math::Vector2i GetImageDimensions(const std::string& filename) override; + Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] override; }; } \ No newline at end of file diff --git a/openVulkanoCpp/Image/ImageLoaderPnm.hpp b/openVulkanoCpp/Image/ImageLoaderPnm.hpp index 51e092a..a9dd9de 100644 --- a/openVulkanoCpp/Image/ImageLoaderPnm.hpp +++ b/openVulkanoCpp/Image/ImageLoaderPnm.hpp @@ -12,8 +12,8 @@ namespace OpenVulkano::Image class ImageLoaderPnm : public IImageLoader { public: - std::unique_ptr loadFromFile(const std::string& filePath) override; + std::unique_ptr loadFromFile(const std::string& filePath) [[deprecated]] override; std::unique_ptr loadFromMemory(const std::vector& buffer) override; - Math::Vector2i GetImageDimensions(const std::string& filename) override; + Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] override; }; } \ No newline at end of file diff --git a/openVulkanoCpp/Scene/Export/MeshWriter.hpp b/openVulkanoCpp/Scene/Export/MeshWriter.hpp index 3b9255b..0de0b8e 100644 --- a/openVulkanoCpp/Scene/Export/MeshWriter.hpp +++ b/openVulkanoCpp/Scene/Export/MeshWriter.hpp @@ -14,11 +14,11 @@ namespace OpenVulkano::Scene class MeshWriter { public: - static void WriteAsOBJ(Geometry* geometry, const std::string& filePath); - static void WriteAsUSD(Geometry* geometry, const std::string& filePath); - static void WriteObjAsZip(Geometry* geometry, const std::string& texturePath, const std::string& zipPath); - static void WriteAsUSDZ(Geometry* geometry, const std::string& texturePath, const std::string& usdzPath); - static void WriteAsFBX(Geometry* geometry, const std::string& texturePath, const std::string& fbxPath); - static void WriteAsSTL(Geometry* geometry, const std::string& filePath, bool binary); + static void WriteAsOBJ(Geometry* geometry, const std::string& filePath) [[deprecated]]; + static void WriteAsUSD(Geometry* geometry, const std::string& filePath) [[deprecated]]; + static void WriteObjAsZip(Geometry* geometry, const std::string& texturePath, const std::string& zipPath) [[deprecated]]; + static void WriteAsUSDZ(Geometry* geometry, const std::string& texturePath, const std::string& usdzPath) [[deprecated]]; + static void WriteAsFBX(Geometry* geometry, const std::string& texturePath, const std::string& fbxPath) [[deprecated]]; + static void WriteAsSTL(Geometry* geometry, const std::string& filePath, bool binary) [[deprecated]]; }; } \ No newline at end of file diff --git a/openVulkanoCpp/Scene/MeshLoader.hpp b/openVulkanoCpp/Scene/MeshLoader.hpp index 1faece7..1adc483 100644 --- a/openVulkanoCpp/Scene/MeshLoader.hpp +++ b/openVulkanoCpp/Scene/MeshLoader.hpp @@ -13,9 +13,9 @@ namespace OpenVulkano::Scene class Geometry; class MeshLoader { - static void ParseAssimpFile(Geometry *geometry, const std::string& file); - static void ParseUSDFile(Geometry *geometry, const std::string& file); + static void ParseAssimpFile(Geometry *geometry, const std::string& file) [[deprecated]]; + static void ParseUSDFile(Geometry *geometry, const std::string& file) [[deprecated]]; public: - static Geometry* LoadFromFile(const std::string& file); + static Geometry* LoadFromFile(const std::string& file) [[deprecated]]; }; } \ No newline at end of file diff --git a/openVulkanoCpp/Scene/Text/BitmapFontAtlasGenerator.hpp b/openVulkanoCpp/Scene/Text/BitmapFontAtlasGenerator.hpp index 11621a9..360edc4 100644 --- a/openVulkanoCpp/Scene/Text/BitmapFontAtlasGenerator.hpp +++ b/openVulkanoCpp/Scene/Text/BitmapFontAtlasGenerator.hpp @@ -43,7 +43,7 @@ namespace OpenVulkano::Scene { } void GenerateAtlas(const std::string& fontFile, const std::set& charset, - const std::optional& pngOutput = std::nullopt) override; + const std::optional& pngOutput = std::nullopt) [[deprecated]] override; void GenerateAtlas(const Array& fontData, const std::set& charset, const std::optional& pngOutput = std::nullopt) override; private: diff --git a/openVulkanoCpp/Scene/Text/FontAtlasFactory.hpp b/openVulkanoCpp/Scene/Text/FontAtlasFactory.hpp index 6ea11c2..ebe402c 100644 --- a/openVulkanoCpp/Scene/Text/FontAtlasFactory.hpp +++ b/openVulkanoCpp/Scene/Text/FontAtlasFactory.hpp @@ -45,6 +45,6 @@ namespace OpenVulkano::Scene const std::set& charset = {}) const; private: - Array FindFont(const std::string& fontFile) const; + Array FindFont(const std::string& fontFile) const [[deprecated]]; }; } diff --git a/openVulkanoCpp/Scene/Text/IFontAtlasGenerator.hpp b/openVulkanoCpp/Scene/Text/IFontAtlasGenerator.hpp index 8c249ba..d10b56f 100644 --- a/openVulkanoCpp/Scene/Text/IFontAtlasGenerator.hpp +++ b/openVulkanoCpp/Scene/Text/IFontAtlasGenerator.hpp @@ -21,7 +21,7 @@ namespace OpenVulkano::Scene public: virtual ~IFontAtlasGenerator() = default; virtual void GenerateAtlas(const std::string& fontFile, const std::set& charset, - const std::optional& pngOutput = std::nullopt) = 0; + const std::optional& pngOutput = std::nullopt) [[deprecated]] = 0; virtual void GenerateAtlas(const Array& fontData, const std::set& charset, const std::optional& pngOutput = std::nullopt) = 0; virtual const std::shared_ptr& GetAtlas() const = 0; diff --git a/openVulkanoCpp/Scene/Text/SdfFontAtlasGenerator.hpp b/openVulkanoCpp/Scene/Text/SdfFontAtlasGenerator.hpp index fdaabb3..eb5f2f4 100644 --- a/openVulkanoCpp/Scene/Text/SdfFontAtlasGenerator.hpp +++ b/openVulkanoCpp/Scene/Text/SdfFontAtlasGenerator.hpp @@ -43,11 +43,11 @@ namespace OpenVulkano::Scene static constexpr int channelsCount = (Channels == 1 ? 1 : 4); SdfFontAtlasGeneratorGeneric(); void GenerateAtlas(const std::string& fontFile, const std::set& charset, - const std::optional& pngOutput = std::nullopt) override; + const std::optional& pngOutput = std::nullopt) [[deprecated]] override; void GenerateAtlas(const Array& fontData, const std::set& charset, const std::optional& pngOutput = std::nullopt) override; void GenerateAtlas(const std::string& fontFile, const msdf_atlas::Charset& charset = msdf_atlas::Charset::ASCII, - const std::optional& pngOutput = std::nullopt); + const std::optional& pngOutput = std::nullopt) [[deprecated]]; void GenerateAtlas(const msdfgen::byte* fontData, int length, const msdf_atlas::Charset& charset = msdf_atlas::Charset::ASCII, const std::optional& pngOutput = std::nullopt); diff --git a/openVulkanoCpp/Shader/ShaderCompiler.hpp b/openVulkanoCpp/Shader/ShaderCompiler.hpp index 4f42997..f66d795 100644 --- a/openVulkanoCpp/Shader/ShaderCompiler.hpp +++ b/openVulkanoCpp/Shader/ShaderCompiler.hpp @@ -15,7 +15,7 @@ namespace OpenVulkano * @param shaderStage - type of the shader that needs to be compiled */ static Array CompileGLSLToSpirv(const std::string& absPath, bool hasIncludes, - const std::string& incPath = std::string(), const std::string& entryPoint = "main") + const std::string& incPath = std::string(), const std::string& entryPoint = "main") [[deprecated]] #if defined(HAS_SHADERC) ; #else From 3c7a883ee831c67e91c7ea312bc98f7e76dab311 Mon Sep 17 00:00:00 2001 From: Vladyslav Baranovskyi Date: Tue, 11 Feb 2025 17:34:12 +0200 Subject: [PATCH 2/6] Moved deprecated attr at beginning of functions --- openVulkanoCpp/AR/ArRecorder.hpp | 2 +- openVulkanoCpp/AR/ArSession.hpp | 2 +- openVulkanoCpp/AR/ArSessionMetadata.hpp | 4 ++-- .../AR/Provider/Playback/ArPlaybackReader.hpp | 2 +- .../AR/Provider/Playback/ArSessionPlayback.hpp | 2 +- openVulkanoCpp/Base/Logger.hpp | 2 +- openVulkanoCpp/Host/ExeAppendedZipResourceLoader.hpp | 2 +- openVulkanoCpp/Host/ResourceLoader.hpp | 2 +- openVulkanoCpp/Host/SystemFontResolver.hpp | 2 +- .../Host/Windows/ResourceLoaderAppDirWindows.hpp | 2 +- openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp | 2 +- openVulkanoCpp/Image/ImageLoader.hpp | 6 +++--- openVulkanoCpp/Image/ImageLoaderDds.hpp | 4 ++-- openVulkanoCpp/Image/ImageLoaderJpeg.hpp | 4 ++-- openVulkanoCpp/Image/ImageLoaderKtx.hpp | 4 ++-- openVulkanoCpp/Image/ImageLoaderPfm.hpp | 4 ++-- openVulkanoCpp/Image/ImageLoaderPng.hpp | 4 ++-- openVulkanoCpp/Image/ImageLoaderPnm.hpp | 4 ++-- openVulkanoCpp/Scene/Export/MeshWriter.hpp | 12 ++++++------ openVulkanoCpp/Scene/MeshLoader.hpp | 6 +++--- .../Scene/Text/BitmapFontAtlasGenerator.hpp | 4 ++-- openVulkanoCpp/Scene/Text/FontAtlasFactory.hpp | 2 +- openVulkanoCpp/Scene/Text/IFontAtlasGenerator.hpp | 4 ++-- openVulkanoCpp/Scene/Text/SdfFontAtlasGenerator.hpp | 9 +++++---- openVulkanoCpp/Shader/ShaderCompiler.hpp | 5 +++-- 25 files changed, 49 insertions(+), 47 deletions(-) diff --git a/openVulkanoCpp/AR/ArRecorder.hpp b/openVulkanoCpp/AR/ArRecorder.hpp index 4a53dc8..692192a 100644 --- a/openVulkanoCpp/AR/ArRecorder.hpp +++ b/openVulkanoCpp/AR/ArRecorder.hpp @@ -121,7 +121,7 @@ namespace OpenVulkano::AR * If path is changed after starting the recording, the already running recording will be moved to the new path. * @param path The path to be used to store the recording */ - void SetRecordingPath(const std::string& path) [[deprecated]] + [[deprecated]] void SetRecordingPath(const std::string& path) { std::filesystem::path p(path); SetRecordingPath(p); diff --git a/openVulkanoCpp/AR/ArSession.hpp b/openVulkanoCpp/AR/ArSession.hpp index 521040c..34a15e4 100644 --- a/openVulkanoCpp/AR/ArSession.hpp +++ b/openVulkanoCpp/AR/ArSession.hpp @@ -114,7 +114,7 @@ namespace OpenVulkano::AR * @param autoAdvance If set to true the playback will advance based on the stored timestamps. If set to false it will only advance if a new frame is requested. * @return ArCreateResult about the status of the AR session creation. The session pointer will always be nullptr unless the status is SUCCESS. */ - [[nodiscard]] static ArCreateResult CreatePlayback(const std::string& recordingPath, bool autoAdvance = true, bool loadImages = true, bool loadDepth = true) [[deprecated]]; + [[nodiscard]] [[deprecated]] static ArCreateResult CreatePlayback(const std::string& recordingPath, bool autoAdvance = true, bool loadImages = true, bool loadDepth = true); /** * Creates a network streamed AR session. nullptr if failed to create session for given address. This will block till the connection with the remote host has been established. diff --git a/openVulkanoCpp/AR/ArSessionMetadata.hpp b/openVulkanoCpp/AR/ArSessionMetadata.hpp index fb8821d..f88edf2 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); - static ArSessionMetadata FromXML(const std::string& filePath) [[deprecated]]; + [[deprecated]] static ArSessionMetadata FromXML(const std::string& filePath); - static ArSessionMetadata FromYaml(const std::string& filePath) [[deprecated]]; + [[deprecated]] static ArSessionMetadata FromYaml(const std::string& filePath); }; } \ No newline at end of file diff --git a/openVulkanoCpp/AR/Provider/Playback/ArPlaybackReader.hpp b/openVulkanoCpp/AR/Provider/Playback/ArPlaybackReader.hpp index 0960f78..89b6228 100644 --- a/openVulkanoCpp/AR/Provider/Playback/ArPlaybackReader.hpp +++ b/openVulkanoCpp/AR/Provider/Playback/ArPlaybackReader.hpp @@ -47,7 +47,7 @@ namespace OpenVulkano::AR::Playback size_t m_imgTotalSize = 0, m_imgReadSize = 0; public: - ArPlaybackReader(const std::string& recDir) [[deprecated]] + [[deprecated]] ArPlaybackReader(const std::string& recDir) { std::string extensions = R"((_\d+|\.part\d+)?)" + std::string(TAR_EXTENSIONS_REGEX); m_archiveMetadata.Open(recDir, ".*meta(data)?" + extensions); diff --git a/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.hpp b/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.hpp index 9a1c42f..3621030 100644 --- a/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.hpp +++ b/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.hpp @@ -15,7 +15,7 @@ namespace OpenVulkano::AR::Playback class ArSessionPlayback final : public ArSession, public std::enable_shared_from_this { public: - ArSessionPlayback(const std::string& recordingPath, bool autoAdvance, bool loadImages, bool loadDepth); [[deprecated]] + [[deprecated]] ArSessionPlayback(const std::string& recordingPath, bool autoAdvance, bool loadImages, bool loadDepth); ~ArSessionPlayback() override; diff --git a/openVulkanoCpp/Base/Logger.hpp b/openVulkanoCpp/Base/Logger.hpp index f1d1751..7b9487b 100644 --- a/openVulkanoCpp/Base/Logger.hpp +++ b/openVulkanoCpp/Base/Logger.hpp @@ -34,7 +34,7 @@ namespace OpenVulkano static Ptr PERF; static Ptr APP; - static void SetupLogger(std::string logFolder = "", const std::string& logFile = "openVulkano.log", bool handleSignals = false) [[deprecated]]; + [[deprecated]] static void SetupLogger(std::string logFolder = "", const std::string& logFile = "openVulkano.log", bool handleSignals = false); /** * \brief Creates a new custom logger that writes to the main log file. diff --git a/openVulkanoCpp/Host/ExeAppendedZipResourceLoader.hpp b/openVulkanoCpp/Host/ExeAppendedZipResourceLoader.hpp index 7cc331f..200b310 100644 --- a/openVulkanoCpp/Host/ExeAppendedZipResourceLoader.hpp +++ b/openVulkanoCpp/Host/ExeAppendedZipResourceLoader.hpp @@ -16,7 +16,7 @@ namespace OpenVulkano class ExeAppendedZipResourceLoader : public ResourceLoader { public: - std::string GetResourcePath(const std::string& resourceName) [[deprecated]] final { return ""; } + [[deprecated]] std::string GetResourcePath(const std::string& resourceName) final { return ""; } Array GetResource(const std::string& resourceName) override; protected: virtual std::string GetCurrentExecutablePath() const = 0; diff --git a/openVulkanoCpp/Host/ResourceLoader.hpp b/openVulkanoCpp/Host/ResourceLoader.hpp index 9d0c57e..cef56d3 100644 --- a/openVulkanoCpp/Host/ResourceLoader.hpp +++ b/openVulkanoCpp/Host/ResourceLoader.hpp @@ -19,7 +19,7 @@ namespace OpenVulkano [[nodiscard]] virtual Array GetResource(const std::string& resourceName) = 0; - [[nodiscard]] virtual std::string GetResourcePath(const std::string& resourceName) [[deprecated]] { return ""; } + [[nodiscard]] [[deprecated]] virtual std::string GetResourcePath(const std::string& resourceName) { return ""; } static ResourceLoader& GetInstance(); diff --git a/openVulkanoCpp/Host/SystemFontResolver.hpp b/openVulkanoCpp/Host/SystemFontResolver.hpp index 37da349..110ea52 100644 --- a/openVulkanoCpp/Host/SystemFontResolver.hpp +++ b/openVulkanoCpp/Host/SystemFontResolver.hpp @@ -14,7 +14,7 @@ namespace OpenVulkano class SystemFontResolver { public: - static const std::string& GetSystemFontPath(const std::string& fontName) [[deprecated]]; + [[deprecated]] static const std::string& GetSystemFontPath(const std::string& fontName); private: static std::map ReadSystemFonts(); diff --git a/openVulkanoCpp/Host/Windows/ResourceLoaderAppDirWindows.hpp b/openVulkanoCpp/Host/Windows/ResourceLoaderAppDirWindows.hpp index 4107b70..1868824 100644 --- a/openVulkanoCpp/Host/Windows/ResourceLoaderAppDirWindows.hpp +++ b/openVulkanoCpp/Host/Windows/ResourceLoaderAppDirWindows.hpp @@ -13,7 +13,7 @@ namespace OpenVulkano class ResourceLoaderAppDirWindows final : public ResourceLoader { public: - std::string GetResourcePath(const std::string& resourceName) [[deprecated]] override; + [[deprecated]] std::string GetResourcePath(const std::string& resourceName) override; Array GetResource(const std::string& resourceName) override; }; } \ No newline at end of file diff --git a/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp b/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp index 4915aba..5b66b11 100644 --- a/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp +++ b/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp @@ -30,7 +30,7 @@ namespace OpenVulkano void CheckSize(size_t size); public: - MultiPartArchiveWriter(const std::string& dir, const std::string& fileNamePattern, const ArchiveConfiguration& archiveConfiguration, size_t sizeLimit = 2_GiB, bool lazyCreation = false, const std::shared_ptr& logger = nullptr) [[deprecated]]; + [[deprecated]] MultiPartArchiveWriter(const std::string& dir, const std::string& fileNamePattern, const ArchiveConfiguration& archiveConfiguration, size_t sizeLimit = 2_GiB, bool lazyCreation = false, const std::shared_ptr& logger = nullptr); ~MultiPartArchiveWriter() override; diff --git a/openVulkanoCpp/Image/ImageLoader.hpp b/openVulkanoCpp/Image/ImageLoader.hpp index ad62e63..45f7c4e 100644 --- a/openVulkanoCpp/Image/ImageLoader.hpp +++ b/openVulkanoCpp/Image/ImageLoader.hpp @@ -19,10 +19,10 @@ namespace OpenVulkano::Image virtual ~IImageLoader() = default; static std::unique_ptr loadData(const uint8_t* data, int size, int desiredChannels = 0); - virtual std::unique_ptr loadFromFile(const std::string& filePath) [[deprecated]] = 0; + [[deprecated]] virtual std::unique_ptr loadFromFile(const std::string& filePath) = 0; virtual std::unique_ptr loadFromMemory(const std::vector& buffer) = 0; - virtual Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] = 0; + [[deprecated]] virtual Math::Vector2i GetImageDimensions(const std::string& filename) = 0; protected: - static Math::Vector2i GetDimensionsInternal(const std::string& filename) [[deprecated]]; + [[deprecated]] static Math::Vector2i GetDimensionsInternal(const std::string& filename); }; } \ No newline at end of file diff --git a/openVulkanoCpp/Image/ImageLoaderDds.hpp b/openVulkanoCpp/Image/ImageLoaderDds.hpp index 224be16..7a615fc 100644 --- a/openVulkanoCpp/Image/ImageLoaderDds.hpp +++ b/openVulkanoCpp/Image/ImageLoaderDds.hpp @@ -18,9 +18,9 @@ namespace OpenVulkano::Image class ImageLoaderDds : public IImageLoader { public: - std::unique_ptr loadFromFile(const std::string& filePath) [[deprecated]] override; + [[deprecated]] std::unique_ptr loadFromFile(const std::string& filePath) override; std::unique_ptr loadFromMemory(const std::vector& buffer) override; - Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] override; + [[deprecated]] Math::Vector2i GetImageDimensions(const std::string& filename) override; protected: std::unique_ptr ExtractImage(dds::Image* ddsImage); diff --git a/openVulkanoCpp/Image/ImageLoaderJpeg.hpp b/openVulkanoCpp/Image/ImageLoaderJpeg.hpp index 6e2d726..2835e64 100644 --- a/openVulkanoCpp/Image/ImageLoaderJpeg.hpp +++ b/openVulkanoCpp/Image/ImageLoaderJpeg.hpp @@ -13,9 +13,9 @@ namespace OpenVulkano::Image class ImageLoaderJpeg : public IImageLoader { public: - std::unique_ptr loadFromFile(const std::string& filePath) [[deprecated]] override; + [[deprecated]] std::unique_ptr loadFromFile(const std::string& filePath) override; std::unique_ptr loadFromMemory(const std::vector& buffer) override; - Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] override; + [[deprecated]] Math::Vector2i GetImageDimensions(const std::string& filename) override; private: std::unique_ptr loadJpeg(const uint8_t* data, size_t size); }; diff --git a/openVulkanoCpp/Image/ImageLoaderKtx.hpp b/openVulkanoCpp/Image/ImageLoaderKtx.hpp index c339e94..9ac386a 100644 --- a/openVulkanoCpp/Image/ImageLoaderKtx.hpp +++ b/openVulkanoCpp/Image/ImageLoaderKtx.hpp @@ -13,8 +13,8 @@ namespace OpenVulkano::Image class ImageLoaderKtx : public IImageLoader { public: - std::unique_ptr loadFromFile(const std::string& filePath) [[deprecated]] override; + [[deprecated]] std::unique_ptr loadFromFile(const std::string& filePath) override; std::unique_ptr loadFromMemory(const std::vector& buffer) override; - Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] override; + [[deprecated]] Math::Vector2i GetImageDimensions(const std::string& filename) override; }; } diff --git a/openVulkanoCpp/Image/ImageLoaderPfm.hpp b/openVulkanoCpp/Image/ImageLoaderPfm.hpp index 90203a5..93275c1 100644 --- a/openVulkanoCpp/Image/ImageLoaderPfm.hpp +++ b/openVulkanoCpp/Image/ImageLoaderPfm.hpp @@ -13,8 +13,8 @@ namespace OpenVulkano::Image class ImageLoaderPfm : public IImageLoader { public: - std::unique_ptr loadFromFile(const std::string& filePath) [[deprecated]] override; + [[deprecated]] std::unique_ptr loadFromFile(const std::string& filePath) override; std::unique_ptr loadFromMemory(const std::vector& buffer) override; - Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] override; + [[deprecated]] Math::Vector2i GetImageDimensions(const std::string& filename) override; }; } \ No newline at end of file diff --git a/openVulkanoCpp/Image/ImageLoaderPng.hpp b/openVulkanoCpp/Image/ImageLoaderPng.hpp index 9e1121e..7643054 100644 --- a/openVulkanoCpp/Image/ImageLoaderPng.hpp +++ b/openVulkanoCpp/Image/ImageLoaderPng.hpp @@ -13,8 +13,8 @@ namespace OpenVulkano::Image class ImageLoaderPng : public IImageLoader { public: - std::unique_ptr loadFromFile(const std::string& filePath) [[deprecated]] override; + [[deprecated]] std::unique_ptr loadFromFile(const std::string& filePath) override; std::unique_ptr loadFromMemory(const std::vector& buffer) override; - Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] override; + [[deprecated]] Math::Vector2i GetImageDimensions(const std::string& filename) override; }; } \ No newline at end of file diff --git a/openVulkanoCpp/Image/ImageLoaderPnm.hpp b/openVulkanoCpp/Image/ImageLoaderPnm.hpp index a9dd9de..7e40c96 100644 --- a/openVulkanoCpp/Image/ImageLoaderPnm.hpp +++ b/openVulkanoCpp/Image/ImageLoaderPnm.hpp @@ -12,8 +12,8 @@ namespace OpenVulkano::Image class ImageLoaderPnm : public IImageLoader { public: - std::unique_ptr loadFromFile(const std::string& filePath) [[deprecated]] override; + [[deprecated]] std::unique_ptr loadFromFile(const std::string& filePath) override; std::unique_ptr loadFromMemory(const std::vector& buffer) override; - Math::Vector2i GetImageDimensions(const std::string& filename) [[deprecated]] override; + [[deprecated]] Math::Vector2i GetImageDimensions(const std::string& filename) override; }; } \ No newline at end of file diff --git a/openVulkanoCpp/Scene/Export/MeshWriter.hpp b/openVulkanoCpp/Scene/Export/MeshWriter.hpp index 0de0b8e..388ecb9 100644 --- a/openVulkanoCpp/Scene/Export/MeshWriter.hpp +++ b/openVulkanoCpp/Scene/Export/MeshWriter.hpp @@ -14,11 +14,11 @@ namespace OpenVulkano::Scene class MeshWriter { public: - static void WriteAsOBJ(Geometry* geometry, const std::string& filePath) [[deprecated]]; - static void WriteAsUSD(Geometry* geometry, const std::string& filePath) [[deprecated]]; - static void WriteObjAsZip(Geometry* geometry, const std::string& texturePath, const std::string& zipPath) [[deprecated]]; - static void WriteAsUSDZ(Geometry* geometry, const std::string& texturePath, const std::string& usdzPath) [[deprecated]]; - static void WriteAsFBX(Geometry* geometry, const std::string& texturePath, const std::string& fbxPath) [[deprecated]]; - static void WriteAsSTL(Geometry* geometry, const std::string& filePath, bool binary) [[deprecated]]; + [[deprecated]] static void WriteAsOBJ(Geometry* geometry, const std::string& filePath); + [[deprecated]] static void WriteAsUSD(Geometry* geometry, const std::string& filePath); + [[deprecated]] static void WriteObjAsZip(Geometry* geometry, const std::string& texturePath, const std::string& zipPath); + [[deprecated]] static void WriteAsUSDZ(Geometry* geometry, const std::string& texturePath, const std::string& usdzPath); + [[deprecated]] static void WriteAsFBX(Geometry* geometry, const std::string& texturePath, const std::string& fbxPath); + [[deprecated]] static void WriteAsSTL(Geometry* geometry, const std::string& filePath, bool binary); }; } \ No newline at end of file diff --git a/openVulkanoCpp/Scene/MeshLoader.hpp b/openVulkanoCpp/Scene/MeshLoader.hpp index 1adc483..767b0ff 100644 --- a/openVulkanoCpp/Scene/MeshLoader.hpp +++ b/openVulkanoCpp/Scene/MeshLoader.hpp @@ -13,9 +13,9 @@ namespace OpenVulkano::Scene class Geometry; class MeshLoader { - static void ParseAssimpFile(Geometry *geometry, const std::string& file) [[deprecated]]; - static void ParseUSDFile(Geometry *geometry, const std::string& file) [[deprecated]]; + [[deprecated]] static void ParseAssimpFile(Geometry *geometry, const std::string& file); + [[deprecated]] static void ParseUSDFile(Geometry *geometry, const std::string& file); public: - static Geometry* LoadFromFile(const std::string& file) [[deprecated]]; + [[deprecated]] static Geometry* LoadFromFile(const std::string& file); }; } \ No newline at end of file diff --git a/openVulkanoCpp/Scene/Text/BitmapFontAtlasGenerator.hpp b/openVulkanoCpp/Scene/Text/BitmapFontAtlasGenerator.hpp index 360edc4..8ff1a96 100644 --- a/openVulkanoCpp/Scene/Text/BitmapFontAtlasGenerator.hpp +++ b/openVulkanoCpp/Scene/Text/BitmapFontAtlasGenerator.hpp @@ -42,8 +42,8 @@ namespace OpenVulkano::Scene , m_subpixelLayout(subpixelLayout.value_or(SubpixelLayout::UNKNOWN)) { } - void GenerateAtlas(const std::string& fontFile, const std::set& charset, - const std::optional& pngOutput = std::nullopt) [[deprecated]] override; + [[deprecated]] void GenerateAtlas(const std::string& fontFile, const std::set& charset, + const std::optional& pngOutput = std::nullopt) override; void GenerateAtlas(const Array& fontData, const std::set& charset, const std::optional& pngOutput = std::nullopt) override; private: diff --git a/openVulkanoCpp/Scene/Text/FontAtlasFactory.hpp b/openVulkanoCpp/Scene/Text/FontAtlasFactory.hpp index ebe402c..228720f 100644 --- a/openVulkanoCpp/Scene/Text/FontAtlasFactory.hpp +++ b/openVulkanoCpp/Scene/Text/FontAtlasFactory.hpp @@ -45,6 +45,6 @@ namespace OpenVulkano::Scene const std::set& charset = {}) const; private: - Array FindFont(const std::string& fontFile) const [[deprecated]]; + [[deprecated]] Array FindFont(const std::string& fontFile) const; }; } diff --git a/openVulkanoCpp/Scene/Text/IFontAtlasGenerator.hpp b/openVulkanoCpp/Scene/Text/IFontAtlasGenerator.hpp index d10b56f..61c85f1 100644 --- a/openVulkanoCpp/Scene/Text/IFontAtlasGenerator.hpp +++ b/openVulkanoCpp/Scene/Text/IFontAtlasGenerator.hpp @@ -20,8 +20,8 @@ namespace OpenVulkano::Scene { public: virtual ~IFontAtlasGenerator() = default; - virtual void GenerateAtlas(const std::string& fontFile, const std::set& charset, - const std::optional& pngOutput = std::nullopt) [[deprecated]] = 0; + [[deprecated]] virtual void GenerateAtlas(const std::string& fontFile, const std::set& charset, + const std::optional& pngOutput = std::nullopt) = 0; virtual void GenerateAtlas(const Array& fontData, const std::set& charset, const std::optional& pngOutput = std::nullopt) = 0; virtual const std::shared_ptr& GetAtlas() const = 0; diff --git a/openVulkanoCpp/Scene/Text/SdfFontAtlasGenerator.hpp b/openVulkanoCpp/Scene/Text/SdfFontAtlasGenerator.hpp index eb5f2f4..4f65b5a 100644 --- a/openVulkanoCpp/Scene/Text/SdfFontAtlasGenerator.hpp +++ b/openVulkanoCpp/Scene/Text/SdfFontAtlasGenerator.hpp @@ -42,12 +42,13 @@ namespace OpenVulkano::Scene using Config = SdfFontAtlasGeneratorConfig; static constexpr int channelsCount = (Channels == 1 ? 1 : 4); SdfFontAtlasGeneratorGeneric(); - void GenerateAtlas(const std::string& fontFile, const std::set& charset, - const std::optional& pngOutput = std::nullopt) [[deprecated]] override; + [[deprecated]] void GenerateAtlas(const std::string& fontFile, const std::set& charset, + const std::optional& pngOutput = std::nullopt) override; void GenerateAtlas(const Array& fontData, const std::set& charset, const std::optional& pngOutput = std::nullopt) override; - void GenerateAtlas(const std::string& fontFile, const msdf_atlas::Charset& charset = msdf_atlas::Charset::ASCII, - const std::optional& pngOutput = std::nullopt) [[deprecated]]; + [[deprecated]] void GenerateAtlas(const std::string& fontFile, + const msdf_atlas::Charset& charset = msdf_atlas::Charset::ASCII, + const std::optional& pngOutput = std::nullopt); void GenerateAtlas(const msdfgen::byte* fontData, int length, const msdf_atlas::Charset& charset = msdf_atlas::Charset::ASCII, const std::optional& pngOutput = std::nullopt); diff --git a/openVulkanoCpp/Shader/ShaderCompiler.hpp b/openVulkanoCpp/Shader/ShaderCompiler.hpp index f66d795..918d8d7 100644 --- a/openVulkanoCpp/Shader/ShaderCompiler.hpp +++ b/openVulkanoCpp/Shader/ShaderCompiler.hpp @@ -14,8 +14,9 @@ namespace OpenVulkano * @param entryPoint - the name of the void function in the shader * @param shaderStage - type of the shader that needs to be compiled */ - static Array CompileGLSLToSpirv(const std::string& absPath, bool hasIncludes, - const std::string& incPath = std::string(), const std::string& entryPoint = "main") [[deprecated]] + [[deprecated]] static Array CompileGLSLToSpirv(const std::string& absPath, bool hasIncludes, + const std::string& incPath = std::string(), + const std::string& entryPoint = "main") #if defined(HAS_SHADERC) ; #else From 08229c3be6717b78132bb0b768a4a577b35bdeec Mon Sep 17 00:00:00 2001 From: Vladyslav Baranovskyi Date: Tue, 11 Feb 2025 17:54:26 +0200 Subject: [PATCH 3/6] Forgot this line... --- openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp b/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp index 5b66b11..b837447 100644 --- a/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp +++ b/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp @@ -36,7 +36,7 @@ namespace OpenVulkano bool AddFile(const FileDescription& description, const void* buffer) override; bool AddFile(const FileDescription& description, const std::vector>& buffers) override; - bool AddFile(const char* fileName, const char* inArchiveName) [[deprecated]] override; + [[deprecated]] bool AddFile(const char* fileName, const char* inArchiveName) override; using IArchiveWriter::AddFile; [[nodiscard]] virtual ArchiveOStream AddFileStream(const FileDescription& description) override; From f5b3ac5190ac76f5ab3ec40ec00e709fb483a57a Mon Sep 17 00:00:00 2001 From: Vladyslav Baranovskyi Date: Tue, 11 Feb 2025 20:29:04 +0200 Subject: [PATCH 4/6] Changed std::string to std::fs::path for MeshWriter & MeshLoader --- openVulkanoCpp/Scene/Export/MeshWriter.cpp | 26 +++++++++++----------- openVulkanoCpp/Scene/Export/MeshWriter.hpp | 14 ++++++------ openVulkanoCpp/Scene/MeshLoader.cpp | 23 ++++++++++--------- openVulkanoCpp/Scene/MeshLoader.hpp | 7 +++--- 4 files changed, 36 insertions(+), 34 deletions(-) diff --git a/openVulkanoCpp/Scene/Export/MeshWriter.cpp b/openVulkanoCpp/Scene/Export/MeshWriter.cpp index 7cab2ec..7b3d708 100644 --- a/openVulkanoCpp/Scene/Export/MeshWriter.cpp +++ b/openVulkanoCpp/Scene/Export/MeshWriter.cpp @@ -102,27 +102,27 @@ namespace namespace OpenVulkano::Scene { - void MeshWriter::WriteAsOBJ(Geometry* geometry, const std::string& filePath) + void MeshWriter::WriteAsOBJ(Geometry* geometry, const std::filesystem::path& filePath) { std::ofstream file(filePath); if (!file.is_open()) [[unlikely]] - throw std::runtime_error("Failed to open file '" + filePath + "' for writing!"); + throw std::runtime_error("Failed to open file '" + filePath.string() + "' for writing!"); WriteObjContents(geometry, "", file); file.close(); } - void MeshWriter::WriteAsUSD(Geometry* geometry, const std::string& filePath) + void MeshWriter::WriteAsUSD(Geometry* geometry, const std::filesystem::path& filePath) { std::ofstream file(filePath); if (!file.is_open()) [[unlikely]] - throw std::runtime_error("Failed to open file '" + filePath + "' for writing!"); + throw std::runtime_error("Failed to open file '" + filePath.string() + "' for writing!"); WriteUsdContents(file, geometry); file.close(); } - void MeshWriter::WriteObjAsZip(Geometry* geometry, const std::string& texturePath, const std::string& zipPath) + void MeshWriter::WriteObjAsZip(Geometry* geometry, const std::filesystem::path& texturePath, const std::filesystem::path& zipPath) { OpenVulkano::ArchiveWriter zipWriter(zipPath.c_str()); @@ -146,7 +146,7 @@ namespace OpenVulkano::Scene } } - void MeshWriter::WriteAsUSDZ(Geometry* geometry, const std::string& texturePath, const std::string& usdzPath) + void MeshWriter::WriteAsUSDZ(Geometry* geometry, const std::filesystem::path& texturePath, const std::filesystem::path& usdzPath) { OpenVulkano::ZipWriter zipWriter(usdzPath, true); @@ -166,7 +166,7 @@ namespace OpenVulkano::Scene } } - void MeshWriter::WriteAsSTL(Geometry* geometry, const std::string& filePath, bool binary) + void MeshWriter::WriteAsSTL(Geometry* geometry, const std::filesystem::path& filePath, bool binary) { #if __has_include("assimp/Exporter.hpp") std::unique_ptr scene(new aiScene()); @@ -178,7 +178,7 @@ namespace OpenVulkano::Scene Assimp::Exporter exporter; const char* formatId = binary ? "stlb" : "stl"; - aiReturn result = exporter.Export(scene.get(), formatId, filePath); + aiReturn result = exporter.Export(scene.get(), formatId, filePath.string().c_str()); scene->mRootNode = nullptr; scene->mMeshes = nullptr; @@ -190,14 +190,14 @@ namespace OpenVulkano::Scene if (result != aiReturn_SUCCESS) { - throw std::runtime_error("Unable to write STL file to " + filePath + ": " + exporter.GetErrorString()); + throw std::runtime_error("Unable to write STL file to " + filePath.string() + ": " + exporter.GetErrorString()); } #else throw std::runtime_error("Unable to export to STL: Assimp is not available!"); #endif } - void MeshWriter::WriteAsFBX(Geometry* geometry, const std::string& texturePath, const std::string& fbxPath) + void MeshWriter::WriteAsFBX(Geometry* geometry, const std::filesystem::path& texturePath, const std::filesystem::path& fbxPath) { #if __has_include("assimp/Exporter.hpp") std::unique_ptr scene(new aiScene()); @@ -209,12 +209,12 @@ namespace OpenVulkano::Scene if (!texturePath.empty()) { - aiString externalPath(texturePath); + aiString externalPath(texturePath.string().c_str()); scene->mMaterials[0]->AddProperty(&externalPath, AI_MATKEY_TEXTURE(aiTextureType_DIFFUSE, 0)); } Assimp::Exporter exporter; - aiReturn result = exporter.Export(scene.get(), "fbx", fbxPath); + aiReturn result = exporter.Export(scene.get(), "fbx", fbxPath.string().c_str()); scene->mRootNode = nullptr; scene->mMeshes = nullptr; @@ -226,7 +226,7 @@ namespace OpenVulkano::Scene if (result != aiReturn_SUCCESS) { - throw std::runtime_error("Unable to write a fbx file to " + fbxPath + ": " + exporter.GetErrorString()); + throw std::runtime_error("Unable to write a fbx file to " + fbxPath.string() + ": " + exporter.GetErrorString()); } #else throw std::runtime_error("Unable to convert the scene to FBX: Assimp is not available!"); diff --git a/openVulkanoCpp/Scene/Export/MeshWriter.hpp b/openVulkanoCpp/Scene/Export/MeshWriter.hpp index 388ecb9..047d8da 100644 --- a/openVulkanoCpp/Scene/Export/MeshWriter.hpp +++ b/openVulkanoCpp/Scene/Export/MeshWriter.hpp @@ -6,7 +6,7 @@ #pragma once -#include +#include namespace OpenVulkano::Scene { @@ -14,11 +14,11 @@ namespace OpenVulkano::Scene class MeshWriter { public: - [[deprecated]] static void WriteAsOBJ(Geometry* geometry, const std::string& filePath); - [[deprecated]] static void WriteAsUSD(Geometry* geometry, const std::string& filePath); - [[deprecated]] static void WriteObjAsZip(Geometry* geometry, const std::string& texturePath, const std::string& zipPath); - [[deprecated]] static void WriteAsUSDZ(Geometry* geometry, const std::string& texturePath, const std::string& usdzPath); - [[deprecated]] static void WriteAsFBX(Geometry* geometry, const std::string& texturePath, const std::string& fbxPath); - [[deprecated]] static void WriteAsSTL(Geometry* geometry, const std::string& filePath, bool binary); + static void WriteAsOBJ(Geometry* geometry, const std::filesystem::path& filePath); + static void WriteAsUSD(Geometry* geometry, const std::filesystem::path& filePath); + static void WriteObjAsZip(Geometry* geometry, const std::filesystem::path& texturePath, const std::filesystem::path& zipPath); + static void WriteAsUSDZ(Geometry* geometry, const std::filesystem::path& texturePath, const std::filesystem::path& usdzPath); + static void WriteAsFBX(Geometry* geometry, const std::filesystem::path& texturePath, const std::filesystem::path& fbxPath); + static void WriteAsSTL(Geometry* geometry, const std::filesystem::path& filePath, bool binary); }; } \ No newline at end of file diff --git a/openVulkanoCpp/Scene/MeshLoader.cpp b/openVulkanoCpp/Scene/MeshLoader.cpp index e86b62c..6aaa218 100644 --- a/openVulkanoCpp/Scene/MeshLoader.cpp +++ b/openVulkanoCpp/Scene/MeshLoader.cpp @@ -36,7 +36,7 @@ namespace namespace OpenVulkano::Scene { - void MeshLoader::ParseAssimpFile(Geometry *geometry, const std::string& file) + void MeshLoader::ParseAssimpFile(Geometry *geometry, const std::filesystem::path& file) { #ifdef ASSIMP_AVAILABLE Assimp::Importer importer; @@ -45,10 +45,10 @@ namespace OpenVulkano::Scene aiProcess_ImproveCacheLocality | aiProcess_RemoveRedundantMaterials | aiProcess_GenUVCoords | aiProcess_TransformUVCoords | aiProcess_ConvertToLeftHanded | aiProcess_PreTransformVertices | aiProcess_OptimizeGraph; - const aiScene* scene = importer.ReadFile(file, flags); - if (!scene) throw std::runtime_error("Failed to load file \"" + file + "\" Error: " + importer.GetErrorString()); - if (!scene->HasMeshes()) throw std::runtime_error("File \"" + file + "\" does not have any meshes"); - if (scene->mNumMeshes > 1) Logger::DATA->warn("File {0} contains more than one mesh. Only first one will be loaded", file); + const aiScene* scene = importer.ReadFile(file.string().c_str(), flags); + if (!scene) throw std::runtime_error("Failed to load file \"" + file.string() + "\" Error: " + importer.GetErrorString()); + if (!scene->HasMeshes()) throw std::runtime_error("File \"" + file.string() + "\" does not have any meshes"); + if (scene->mNumMeshes > 1) Logger::DATA->warn("File {0} contains more than one mesh. Only first one will be loaded", file.string()); aiMesh *mesh = scene->mMeshes[0]; geometry->aabb.Reset(); @@ -91,15 +91,15 @@ namespace OpenVulkano::Scene #endif } - void MeshLoader::ParseUSDFile(Geometry *geometry, const std::string& file) + void MeshLoader::ParseUSDFile(Geometry *geometry, const std::filesystem::path& file) { tinyusdz::Stage stage; std::string warning, err; - auto result = tinyusdz::LoadUSDFromFile(file, &stage, &warning, &err); + auto result = tinyusdz::LoadUSDFromFile(file.string().c_str(), &stage, &warning, &err); if (!result) { - throw std::runtime_error("Failed to load USD file: " + file); + throw std::runtime_error("Failed to load USD file: " + file.string()); } for (auto &prim : stage.root_prims()) @@ -148,14 +148,15 @@ namespace OpenVulkano::Scene } } } - throw std::runtime_error("No mesh found inside a xform in USD file: " + file); + throw std::runtime_error("No mesh found inside a xform in USD file: " + file.string()); } - Geometry* MeshLoader::LoadFromFile(const std::string& file) + Geometry* MeshLoader::LoadFromFile(const std::filesystem::path& file) { Geometry* geometry = new Geometry(); - if (ends_with(file, ".usd") || ends_with(file, ".usda") || ends_with(file, ".usdc") || ends_with(file, ".usdz")) + std::string fileStr = file.string(); + if (ends_with(fileStr, ".usd") || ends_with(fileStr, ".usda") || ends_with(fileStr, ".usdc") || ends_with(fileStr, ".usdz")) { ParseUSDFile(geometry, file); } diff --git a/openVulkanoCpp/Scene/MeshLoader.hpp b/openVulkanoCpp/Scene/MeshLoader.hpp index 767b0ff..86c45e6 100644 --- a/openVulkanoCpp/Scene/MeshLoader.hpp +++ b/openVulkanoCpp/Scene/MeshLoader.hpp @@ -6,6 +6,7 @@ #pragma once +#include #include namespace OpenVulkano::Scene @@ -13,9 +14,9 @@ namespace OpenVulkano::Scene class Geometry; class MeshLoader { - [[deprecated]] static void ParseAssimpFile(Geometry *geometry, const std::string& file); - [[deprecated]] static void ParseUSDFile(Geometry *geometry, const std::string& file); + static void ParseAssimpFile(Geometry *geometry, const std::filesystem::path& file); + static void ParseUSDFile(Geometry *geometry, const std::filesystem::path& file); public: - [[deprecated]] static Geometry* LoadFromFile(const std::string& file); + static Geometry* LoadFromFile(const std::filesystem::path& file); }; } \ No newline at end of file From fdbf36c040b6b41f353222855c6f17e6f096383b Mon Sep 17 00:00:00 2001 From: Vladyslav Baranovskyi Date: Wed, 12 Feb 2025 14:38:38 +0200 Subject: [PATCH 5/6] Using fmt::format to format exception messages, using .extension() method to retrieve an extension --- openVulkanoCpp/Scene/Export/MeshWriter.cpp | 9 +++++---- openVulkanoCpp/Scene/MeshLoader.cpp | 21 +++++++-------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/openVulkanoCpp/Scene/Export/MeshWriter.cpp b/openVulkanoCpp/Scene/Export/MeshWriter.cpp index 7b3d708..d7c0601 100644 --- a/openVulkanoCpp/Scene/Export/MeshWriter.cpp +++ b/openVulkanoCpp/Scene/Export/MeshWriter.cpp @@ -6,6 +6,7 @@ #include "MeshWriter.hpp" #include "Base/Utils.hpp" +#include "Extensions/FmtFormatter.hpp" #include "IO/MemMappedFile.hpp" #include "Scene/Geometry.hpp" #include "Scene/Vertex.hpp" @@ -107,7 +108,7 @@ namespace OpenVulkano::Scene std::ofstream file(filePath); if (!file.is_open()) [[unlikely]] - throw std::runtime_error("Failed to open file '" + filePath.string() + "' for writing!"); + throw std::runtime_error(fmt::format("Failed to open file '{}' for writing!", filePath)); WriteObjContents(geometry, "", file); file.close(); @@ -117,7 +118,7 @@ namespace OpenVulkano::Scene { std::ofstream file(filePath); if (!file.is_open()) [[unlikely]] - throw std::runtime_error("Failed to open file '" + filePath.string() + "' for writing!"); + throw std::runtime_error(fmt::format("Failed to open file '{}' for writing!", filePath)); WriteUsdContents(file, geometry); file.close(); } @@ -190,7 +191,7 @@ namespace OpenVulkano::Scene if (result != aiReturn_SUCCESS) { - throw std::runtime_error("Unable to write STL file to " + filePath.string() + ": " + exporter.GetErrorString()); + throw std::runtime_error(fmt::format("Unable to write STL file to {}: {}", filePath, exporter.GetErrorString())); } #else throw std::runtime_error("Unable to export to STL: Assimp is not available!"); @@ -226,7 +227,7 @@ namespace OpenVulkano::Scene if (result != aiReturn_SUCCESS) { - throw std::runtime_error("Unable to write a fbx file to " + fbxPath.string() + ": " + exporter.GetErrorString()); + throw std::runtime_error(fmt::format("Unable to write a fbx file to {}: {}", fbxPath, exporter.GetErrorString())); } #else throw std::runtime_error("Unable to convert the scene to FBX: Assimp is not available!"); diff --git a/openVulkanoCpp/Scene/MeshLoader.cpp b/openVulkanoCpp/Scene/MeshLoader.cpp index 6aaa218..ae234bb 100644 --- a/openVulkanoCpp/Scene/MeshLoader.cpp +++ b/openVulkanoCpp/Scene/MeshLoader.cpp @@ -7,6 +7,7 @@ #include "MeshLoader.hpp" #include "Scene/Geometry.hpp" #include "Base/Logger.hpp" +#include "Extensions/FmtFormatter.hpp" #if __has_include("assimp/Importer.hpp") #include #include @@ -26,14 +27,6 @@ #include "value-pprint.hh" #include "value-types.hh" -namespace -{ - static bool ends_with(std::string_view str, std::string_view suffix) - { - return str.size() >= suffix.size() && str.compare(str.size() - suffix.size(), suffix.size(), suffix) == 0; - } -} - namespace OpenVulkano::Scene { void MeshLoader::ParseAssimpFile(Geometry *geometry, const std::filesystem::path& file) @@ -46,8 +39,8 @@ namespace OpenVulkano::Scene aiProcess_ConvertToLeftHanded | aiProcess_PreTransformVertices | aiProcess_OptimizeGraph; const aiScene* scene = importer.ReadFile(file.string().c_str(), flags); - if (!scene) throw std::runtime_error("Failed to load file \"" + file.string() + "\" Error: " + importer.GetErrorString()); - if (!scene->HasMeshes()) throw std::runtime_error("File \"" + file.string() + "\" does not have any meshes"); + if (!scene) throw std::runtime_error(fmt::format("Failed to load file \"{}\" Error: {}", file, importer.GetErrorString())); + if (!scene->HasMeshes()) throw std::runtime_error(fmt::format("File \"{}\" does not have any meshes", file)); if (scene->mNumMeshes > 1) Logger::DATA->warn("File {0} contains more than one mesh. Only first one will be loaded", file.string()); aiMesh *mesh = scene->mMeshes[0]; @@ -99,7 +92,7 @@ namespace OpenVulkano::Scene auto result = tinyusdz::LoadUSDFromFile(file.string().c_str(), &stage, &warning, &err); if (!result) { - throw std::runtime_error("Failed to load USD file: " + file.string()); + throw std::runtime_error(fmt::format("Failed to load USD file: {}", file)); } for (auto &prim : stage.root_prims()) @@ -148,15 +141,15 @@ namespace OpenVulkano::Scene } } } - throw std::runtime_error("No mesh found inside a xform in USD file: " + file.string()); + throw std::runtime_error(fmt::format("No mesh found inside a xform in USD file: {}", file)); } Geometry* MeshLoader::LoadFromFile(const std::filesystem::path& file) { Geometry* geometry = new Geometry(); - std::string fileStr = file.string(); - if (ends_with(fileStr, ".usd") || ends_with(fileStr, ".usda") || ends_with(fileStr, ".usdc") || ends_with(fileStr, ".usdz")) + const std::filesystem::path ext = file.extension(); + if (ext == ".usd" || ext == ".usda" || ext == ".usdc" || ext == ".usdz") { ParseUSDFile(geometry, file); } From 2e22ab7a14d4ba9de237a7b8092c9a4215608162 Mon Sep 17 00:00:00 2001 From: Vladyslav Baranovskyi Date: Wed, 12 Feb 2025 18:55:29 +0200 Subject: [PATCH 6/6] Removed redundant .string() call --- openVulkanoCpp/Scene/MeshLoader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openVulkanoCpp/Scene/MeshLoader.cpp b/openVulkanoCpp/Scene/MeshLoader.cpp index ae234bb..cb5eb4a 100644 --- a/openVulkanoCpp/Scene/MeshLoader.cpp +++ b/openVulkanoCpp/Scene/MeshLoader.cpp @@ -41,7 +41,7 @@ namespace OpenVulkano::Scene const aiScene* scene = importer.ReadFile(file.string().c_str(), flags); if (!scene) throw std::runtime_error(fmt::format("Failed to load file \"{}\" Error: {}", file, importer.GetErrorString())); if (!scene->HasMeshes()) throw std::runtime_error(fmt::format("File \"{}\" does not have any meshes", file)); - if (scene->mNumMeshes > 1) Logger::DATA->warn("File {0} contains more than one mesh. Only first one will be loaded", file.string()); + if (scene->mNumMeshes > 1) Logger::DATA->warn("File {0} contains more than one mesh. Only first one will be loaded", file); aiMesh *mesh = scene->mMeshes[0]; geometry->aabb.Reset();