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