GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add flags struct

Browse Source
This commit is contained in:
Georg Hagen
2025-01-11 12:35:24 +01:00
parent 4c5e64ff18
commit 98db9f79fe
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
openVulkanoCpp/Scene/Text/FontAtlas.cpp
View File

@@ -16,6 +16,16 @@
namespace OpenVulkano::Scene
{
namespace
{
struct FontAtlasFileFlags
{
uint8_t packed = 1;
uint8_t version = 1;
uint16_t reserved = 0;
};
}
FontAtlas::FontAtlas(const std::filesystem::path& path)
{
auto content = Utils::ReadFile(path);
@@ -41,25 +51,25 @@ namespace OpenVulkano::Scene
metadataBytes += sizeof(uint32_t) + sizeof(GlyphInfo);
}
fs.write(reinterpret_cast<const char*>(&metadataBytes), sizeof(uint64_t));
std::array<uint8_t, 4> flags = { 1, 1, 0, 0 };
fs.write(reinterpret_cast<const char*>(&flags), sizeof(std::array<uint8_t, 4>));
FontAtlasFileFlags flags;
fs.write(reinterpret_cast<const char*>(&flags), sizeof(FontAtlasFileFlags));
fs.close();
}
void FontAtlas::Load(const std::span<char> data)
{
if (data.size() < 16) { Logger::DATA->warn("Font atlas file is invalid!"); return; };
uint8_t flags[4] = { 0, 0, 0, 0 };
FontAtlasFileFlags flags;
std::memcpy(&flags, data.data() + data.size() - sizeof(flags), sizeof(flags));
size_t headerSize = sizeof(flags) + sizeof(uint64_t);
size_t headerSize = sizeof(FontAtlasFileFlags) + sizeof(uint64_t);
uint64_t metadataSize = *reinterpret_cast<uint64_t*>(data.data() + data.size() - headerSize);
char* metadata = data.data() + data.size() - headerSize - metadataSize;
if (flags[0] == 0) throw std::runtime_error("No longer support loading of unpacked font atlas!");
if (flags.packed == 0) throw std::runtime_error("No longer support loading of unpacked font atlas!");
LoadImage({ data.data(), data.size() - headerSize - metadataSize });
std::span metadataSpan(metadata, metadataSize);
if (flags[1] == 0) LoadLegacy(metadataSpan);
if (flags.version == 0) LoadLegacy(metadataSpan);
else LoadNew(metadataSpan);
if (GetAtlasType() >= FontAtlasType::BITMAP) m_texture.m_samplerConfig = &SamplerConfig::NEAREST;
}