Moved deprecated attr at beginning of functions
This commit is contained in:
@@ -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);
|
||||
};
|
||||
}
|
||||
@@ -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);
|
||||
};
|
||||
}
|
||||
@@ -42,8 +42,8 @@ namespace OpenVulkano::Scene
|
||||
, m_subpixelLayout(subpixelLayout.value_or(SubpixelLayout::UNKNOWN))
|
||||
{
|
||||
}
|
||||
void GenerateAtlas(const std::string& fontFile, const std::set<uint32_t>& charset,
|
||||
const std::optional<std::string>& pngOutput = std::nullopt) [[deprecated]] override;
|
||||
[[deprecated]] void GenerateAtlas(const std::string& fontFile, const std::set<uint32_t>& charset,
|
||||
const std::optional<std::string>& pngOutput = std::nullopt) override;
|
||||
void GenerateAtlas(const Array<char>& fontData, const std::set<uint32_t>& charset,
|
||||
const std::optional<std::string>& pngOutput = std::nullopt) override;
|
||||
private:
|
||||
|
||||
@@ -45,6 +45,6 @@ namespace OpenVulkano::Scene
|
||||
const std::set<uint32_t>& charset = {}) const;
|
||||
|
||||
private:
|
||||
Array<char> FindFont(const std::string& fontFile) const [[deprecated]];
|
||||
[[deprecated]] Array<char> FindFont(const std::string& fontFile) const;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -20,8 +20,8 @@ namespace OpenVulkano::Scene
|
||||
{
|
||||
public:
|
||||
virtual ~IFontAtlasGenerator() = default;
|
||||
virtual void GenerateAtlas(const std::string& fontFile, const std::set<uint32_t>& charset,
|
||||
const std::optional<std::string>& pngOutput = std::nullopt) [[deprecated]] = 0;
|
||||
[[deprecated]] virtual void GenerateAtlas(const std::string& fontFile, const std::set<uint32_t>& charset,
|
||||
const std::optional<std::string>& pngOutput = std::nullopt) = 0;
|
||||
virtual void GenerateAtlas(const Array<char>& fontData, const std::set<uint32_t>& charset,
|
||||
const std::optional<std::string>& pngOutput = std::nullopt) = 0;
|
||||
virtual const std::shared_ptr<FontAtlas>& GetAtlas() const = 0;
|
||||
|
||||
@@ -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<uint32_t>& charset,
|
||||
const std::optional<std::string>& pngOutput = std::nullopt) [[deprecated]] override;
|
||||
[[deprecated]] void GenerateAtlas(const std::string& fontFile, const std::set<uint32_t>& charset,
|
||||
const std::optional<std::string>& pngOutput = std::nullopt) override;
|
||||
void GenerateAtlas(const Array<char>& fontData, const std::set<uint32_t>& charset,
|
||||
const std::optional<std::string>& pngOutput = std::nullopt) override;
|
||||
void GenerateAtlas(const std::string& fontFile, const msdf_atlas::Charset& charset = msdf_atlas::Charset::ASCII,
|
||||
const std::optional<std::string>& pngOutput = std::nullopt) [[deprecated]];
|
||||
[[deprecated]] void GenerateAtlas(const std::string& fontFile,
|
||||
const msdf_atlas::Charset& charset = msdf_atlas::Charset::ASCII,
|
||||
const std::optional<std::string>& pngOutput = std::nullopt);
|
||||
void GenerateAtlas(const msdfgen::byte* fontData, int length,
|
||||
const msdf_atlas::Charset& charset = msdf_atlas::Charset::ASCII,
|
||||
const std::optional<std::string>& pngOutput = std::nullopt);
|
||||
|
||||
Reference in New Issue
Block a user