kbz_8/MacroLibX
1
0
Fork 0
mirror of https://github.com/seekrs/MacroLibX.git synced 2026-01-11 14:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

yes

Browse Source
This commit is contained in:
kbz_8
2024-10-31 12:36:44 +01:00
parent 2854b19296
commit 5cf965b9a1
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
runtime/Sources/Graphics/Font.cpp
View File

@@ -3,6 +3,10 @@
#include <Graphics/Font.h> #include <Graphics/Font.h>
#include <Core/Memory.h> #include <Core/Memory.h>
#define STBRP_ASSERT(x) mlx::Assert(x, "internal stb assertion")
#define STB_RECT_PACK_IMPLEMENTATION
#include <stb_rect_pack.h>
#define STB_TRUETYPE_IMPLEMENTATION #define STB_TRUETYPE_IMPLEMENTATION
#define STB_malloc(x, u) ((void)(u), MemManager::Get().Malloc(x)) #define STB_malloc(x, u) ((void)(u), MemManager::Get().Malloc(x))
#define STB_free(x, u) ((void)(u), MemManager::Get().Free(x)) #define STB_free(x, u) ((void)(u), MemManager::Get().Free(x))
@@ -29,24 +33,24 @@ namespace mlx
file.close(); file.close();
} }
CPUBuffer tmp_bitmap(RANGE * RANGE); CPUBuffer bitmap(RANGE * RANGE);
stbtt_pack_context pc; stbtt_pack_context pc;
stbtt_PackBegin(&pc, tmp_bitmap.GetData(), RANGE, RANGE, RANGE, 1, nullptr); stbtt_PackBegin(&pc, bitmap.GetData(), RANGE, RANGE, RANGE, 1, nullptr);
if(std::holds_alternative<std::filesystem::path>(m_build_data)) if(std::holds_alternative<std::filesystem::path>(m_build_data))
stbtt_PackFontRange(&pc, file_bytes.data(), 0, m_scale, 32, 96, m_cdata.data()); stbtt_PackFontRange(&pc, file_bytes.data(), 0, m_scale, 32, 96, m_cdata.data());
else else
stbtt_PackFontRange(&pc, std::get<std::vector<std::uint8_t>>(m_build_data).data(), 0, m_scale, 32, 96, m_cdata.data()); stbtt_PackFontRange(&pc, std::get<std::vector<std::uint8_t>>(m_build_data).data(), 0, m_scale, 32, 96, m_cdata.data());
stbtt_PackEnd(&pc); stbtt_PackEnd(&pc);
// TODO : find better solution
CPUBuffer vulkan_bitmap(RANGE * RANGE * 4); CPUBuffer vulkan_bitmap(RANGE * RANGE * 4);
for(int i = 0, j = 0; i < RANGE * RANGE; i++, j += 4) for(int i = 0, j = 0; i < RANGE * RANGE; i++, j += 4)
{ {
vulkan_bitmap.GetData()[j + 0] = tmp_bitmap.GetData()[i]; vulkan_bitmap.GetData()[j + 0] = bitmap.GetData()[i];
vulkan_bitmap.GetData()[j + 1] = tmp_bitmap.GetData()[i]; vulkan_bitmap.GetData()[j + 1] = bitmap.GetData()[i];
vulkan_bitmap.GetData()[j + 2] = tmp_bitmap.GetData()[i]; vulkan_bitmap.GetData()[j + 2] = bitmap.GetData()[i];
vulkan_bitmap.GetData()[j + 3] = tmp_bitmap.GetData()[i]; vulkan_bitmap.GetData()[j + 3] = bitmap.GetData()[i];
} }
#ifdef DEBUG #ifdef DEBUG

5
runtime/Sources/Graphics/Text.cpp
View File

@@ -2,9 +2,6 @@
#include <Graphics/Text.h> #include <Graphics/Text.h>
#define STB_RECT_PACK_IMPLEMENTATION
#include <stb_rect_pack.h>
namespace mlx namespace mlx
{ {
Text::Text(const std::string& text, std::shared_ptr<Font> font) : Drawable(DrawableType::Text) Text::Text(const std::string& text, std::shared_ptr<Font> font) : Drawable(DrawableType::Text)
@@ -19,7 +16,7 @@ namespace mlx
float stb_x = 0.0f; float stb_x = 0.0f;
float stb_y = 0.0f; float stb_y = 0.0f;
auto char_data = font->GetCharData(); const auto& char_data = font->GetCharData();
for(char c : text) for(char c : text)
{ {
if(c < 32) if(c < 32)