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