From 77d71adc1f395488f45f5c0948fb820c33c0fe2c Mon Sep 17 00:00:00 2001 From: kbz_8 Date: Sat, 8 Apr 2023 20:45:06 +0200 Subject: [PATCH] almost fixing text rendering --- src/core/graphics.inl | 2 +- src/renderer/images/texture.cpp | 4 +- src/renderer/images/texture_atlas.cpp | 4 +- src/renderer/images/vk_image.cpp | 135 +++++++++++++++++++++++++- src/renderer/images/vk_image.h | 3 +- src/renderer/text_pipeline.cpp | 22 +++-- src/renderer/text_pipeline.h | 15 +-- test/main.c | 6 +- 8 files changed, 166 insertions(+), 25 deletions(-) diff --git a/src/core/graphics.inl b/src/core/graphics.inl index e9cafb1..9bfa1f6 100644 --- a/src/core/graphics.inl +++ b/src/core/graphics.inl @@ -29,7 +29,7 @@ namespace mlx { _textures_to_render.clear(); _pixel_put_pipeline.clear(); - _text_put_pipeline.clear(); + _text_put_pipeline->clear(); } void GraphicsSupport::pixelPut(int x, int y, int color) noexcept diff --git a/src/renderer/images/texture.cpp b/src/renderer/images/texture.cpp index aafe4f5..856502a 100644 --- a/src/renderer/images/texture.cpp +++ b/src/renderer/images/texture.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/03/31 18:03:35 by maldavid #+# #+# */ -/* Updated: 2023/04/07 14:23:01 by maldavid ### ########.fr */ +/* Updated: 2023/04/08 18:41:54 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -47,7 +47,7 @@ namespace mlx if(pixels != nullptr) { Buffer staging_buffer; - std::size_t size = width * height * (format == VK_FORMAT_R32G32B32A32_SFLOAT ? 16 : 4); + std::size_t size = width * height * formatSize(format); staging_buffer.create(Buffer::kind::dynamic, size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, pixels); Image::copyFromBuffer(staging_buffer); staging_buffer.destroy(); diff --git a/src/renderer/images/texture_atlas.cpp b/src/renderer/images/texture_atlas.cpp index 9865c35..011a675 100644 --- a/src/renderer/images/texture_atlas.cpp +++ b/src/renderer/images/texture_atlas.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/07 16:40:09 by maldavid #+# #+# */ -/* Updated: 2023/04/08 00:29:39 by maldavid ### ########.fr */ +/* Updated: 2023/04/08 18:41:44 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -47,7 +47,7 @@ namespace mlx if(pixels != nullptr) { Buffer staging_buffer; - std::size_t size = width * height * (format == VK_FORMAT_R32G32B32A32_SFLOAT ? 16 : 4); + std::size_t size = width * height * formatSize(format); staging_buffer.create(Buffer::kind::dynamic, size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, pixels); Image::copyFromBuffer(staging_buffer); staging_buffer.destroy(); diff --git a/src/renderer/images/vk_image.cpp b/src/renderer/images/vk_image.cpp index dd7dfa6..9c611c3 100644 --- a/src/renderer/images/vk_image.cpp +++ b/src/renderer/images/vk_image.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/01/25 11:59:07 by maldavid #+# #+# */ -/* Updated: 2023/04/02 22:54:18 by maldavid ### ########.fr */ +/* Updated: 2023/04/08 18:41:15 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -274,4 +274,137 @@ namespace mlx vkFreeMemory(Render_Core::get().getDevice().get(), _memory, nullptr); vkDestroyImage(Render_Core::get().getDevice().get(), _image, nullptr); } + + uint32_t formatSize(VkFormat format) + { + switch(format) + { + case VK_FORMAT_UNDEFINED: return 0; + case VK_FORMAT_R4G4_UNORM_PACK8: return 1; + case VK_FORMAT_R4G4B4A4_UNORM_PACK16: return 2; + case VK_FORMAT_B4G4R4A4_UNORM_PACK16: return 2; + case VK_FORMAT_R5G6B5_UNORM_PACK16: return 2; + case VK_FORMAT_B5G6R5_UNORM_PACK16: return 2; + case VK_FORMAT_R5G5B5A1_UNORM_PACK16: return 2; + case VK_FORMAT_B5G5R5A1_UNORM_PACK16: return 2; + case VK_FORMAT_A1R5G5B5_UNORM_PACK16: return 2; + case VK_FORMAT_R8_UNORM: return 1; + case VK_FORMAT_R8_SNORM: return 1; + case VK_FORMAT_R8_USCALED: return 1; + case VK_FORMAT_R8_SSCALED: return 1; + case VK_FORMAT_R8_UINT: return 1; + case VK_FORMAT_R8_SINT: return 1; + case VK_FORMAT_R8_SRGB: return 1; + case VK_FORMAT_R8G8_UNORM: return 2; + case VK_FORMAT_R8G8_SNORM: return 2; + case VK_FORMAT_R8G8_USCALED: return 2; + case VK_FORMAT_R8G8_SSCALED: return 2; + case VK_FORMAT_R8G8_UINT: return 2; + case VK_FORMAT_R8G8_SINT: return 2; + case VK_FORMAT_R8G8_SRGB: return 2; + case VK_FORMAT_R8G8B8_UNORM: return 3; + case VK_FORMAT_R8G8B8_SNORM: return 3; + case VK_FORMAT_R8G8B8_USCALED: return 3; + case VK_FORMAT_R8G8B8_SSCALED: return 3; + case VK_FORMAT_R8G8B8_UINT: return 3; + case VK_FORMAT_R8G8B8_SINT: return 3; + case VK_FORMAT_R8G8B8_SRGB: return 3; + case VK_FORMAT_B8G8R8_UNORM: return 3; + case VK_FORMAT_B8G8R8_SNORM: return 3; + case VK_FORMAT_B8G8R8_USCALED: return 3; + case VK_FORMAT_B8G8R8_SSCALED: return 3; + case VK_FORMAT_B8G8R8_UINT: return 3; + case VK_FORMAT_B8G8R8_SINT: return 3; + case VK_FORMAT_B8G8R8_SRGB: return 3; + case VK_FORMAT_R8G8B8A8_UNORM: return 4; + case VK_FORMAT_R8G8B8A8_SNORM: return 4; + case VK_FORMAT_R8G8B8A8_USCALED: return 4; + case VK_FORMAT_R8G8B8A8_SSCALED: return 4; + case VK_FORMAT_R8G8B8A8_UINT: return 4; + case VK_FORMAT_R8G8B8A8_SINT: return 4; + case VK_FORMAT_R8G8B8A8_SRGB: return 4; + case VK_FORMAT_B8G8R8A8_UNORM: return 4; + case VK_FORMAT_B8G8R8A8_SNORM: return 4; + case VK_FORMAT_B8G8R8A8_USCALED: return 4; + case VK_FORMAT_B8G8R8A8_SSCALED: return 4; + case VK_FORMAT_B8G8R8A8_UINT: return 4; + case VK_FORMAT_B8G8R8A8_SINT: return 4; + case VK_FORMAT_B8G8R8A8_SRGB: return 4; + case VK_FORMAT_A8B8G8R8_UNORM_PACK32: return 4; + case VK_FORMAT_A8B8G8R8_SNORM_PACK32: return 4; + case VK_FORMAT_A8B8G8R8_USCALED_PACK32: return 4; + case VK_FORMAT_A8B8G8R8_SSCALED_PACK32: return 4; + case VK_FORMAT_A8B8G8R8_UINT_PACK32: return 4; + case VK_FORMAT_A8B8G8R8_SINT_PACK32: return 4; + case VK_FORMAT_A8B8G8R8_SRGB_PACK32: return 4; + case VK_FORMAT_A2R10G10B10_UNORM_PACK32: return 4; + case VK_FORMAT_A2R10G10B10_SNORM_PACK32: return 4; + case VK_FORMAT_A2R10G10B10_USCALED_PACK32: return 4; + case VK_FORMAT_A2R10G10B10_SSCALED_PACK32: return 4; + case VK_FORMAT_A2R10G10B10_UINT_PACK32: return 4; + case VK_FORMAT_A2R10G10B10_SINT_PACK32: return 4; + case VK_FORMAT_A2B10G10R10_UNORM_PACK32: return 4; + case VK_FORMAT_A2B10G10R10_SNORM_PACK32: return 4; + case VK_FORMAT_A2B10G10R10_USCALED_PACK32: return 4; + case VK_FORMAT_A2B10G10R10_SSCALED_PACK32: return 4; + case VK_FORMAT_A2B10G10R10_UINT_PACK32: return 4; + case VK_FORMAT_A2B10G10R10_SINT_PACK32: return 4; + case VK_FORMAT_R16_UNORM: return 2; + case VK_FORMAT_R16_SNORM: return 2; + case VK_FORMAT_R16_USCALED: return 2; + case VK_FORMAT_R16_SSCALED: return 2; + case VK_FORMAT_R16_UINT: return 2; + case VK_FORMAT_R16_SINT: return 2; + case VK_FORMAT_R16_SFLOAT: return 2; + case VK_FORMAT_R16G16_UNORM: return 4; + case VK_FORMAT_R16G16_SNORM: return 4; + case VK_FORMAT_R16G16_USCALED: return 4; + case VK_FORMAT_R16G16_SSCALED: return 4; + case VK_FORMAT_R16G16_UINT: return 4; + case VK_FORMAT_R16G16_SINT: return 4; + case VK_FORMAT_R16G16_SFLOAT: return 4; + case VK_FORMAT_R16G16B16_UNORM: return 6; + case VK_FORMAT_R16G16B16_SNORM: return 6; + case VK_FORMAT_R16G16B16_USCALED: return 6; + case VK_FORMAT_R16G16B16_SSCALED: return 6; + case VK_FORMAT_R16G16B16_UINT: return 6; + case VK_FORMAT_R16G16B16_SINT: return 6; + case VK_FORMAT_R16G16B16_SFLOAT: return 6; + case VK_FORMAT_R16G16B16A16_UNORM: return 8; + case VK_FORMAT_R16G16B16A16_SNORM: return 8; + case VK_FORMAT_R16G16B16A16_USCALED: return 8; + case VK_FORMAT_R16G16B16A16_SSCALED: return 8; + case VK_FORMAT_R16G16B16A16_UINT: return 8; + case VK_FORMAT_R16G16B16A16_SINT: return 8; + case VK_FORMAT_R16G16B16A16_SFLOAT: return 8; + case VK_FORMAT_R32_UINT: return 4; + case VK_FORMAT_R32_SINT: return 4; + case VK_FORMAT_R32_SFLOAT: return 4; + case VK_FORMAT_R32G32_UINT: return 8; + case VK_FORMAT_R32G32_SINT: return 8; + case VK_FORMAT_R32G32_SFLOAT: return 8; + case VK_FORMAT_R32G32B32_UINT: return 12; + case VK_FORMAT_R32G32B32_SINT: return 12; + case VK_FORMAT_R32G32B32_SFLOAT: return 12; + case VK_FORMAT_R32G32B32A32_UINT: return 16; + case VK_FORMAT_R32G32B32A32_SINT: return 16; + case VK_FORMAT_R32G32B32A32_SFLOAT: return 16; + case VK_FORMAT_R64_UINT: return 8; + case VK_FORMAT_R64_SINT: return 8; + case VK_FORMAT_R64_SFLOAT: return 8; + case VK_FORMAT_R64G64_UINT: return 16; + case VK_FORMAT_R64G64_SINT: return 16; + case VK_FORMAT_R64G64_SFLOAT: return 16; + case VK_FORMAT_R64G64B64_UINT: return 24; + case VK_FORMAT_R64G64B64_SINT: return 24; + case VK_FORMAT_R64G64B64_SFLOAT: return 24; + case VK_FORMAT_R64G64B64A64_UINT: return 32; + case VK_FORMAT_R64G64B64A64_SINT: return 32; + case VK_FORMAT_R64G64B64A64_SFLOAT: return 32; + case VK_FORMAT_B10G11R11_UFLOAT_PACK32: return 4; + case VK_FORMAT_E5B9G9R9_UFLOAT_PACK32: return 4; + + default: return 0; + } + } } diff --git a/src/renderer/images/vk_image.h b/src/renderer/images/vk_image.h index 08a6359..1b83001 100644 --- a/src/renderer/images/vk_image.h +++ b/src/renderer/images/vk_image.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/01/25 11:54:21 by maldavid #+# #+# */ -/* Updated: 2023/04/02 20:20:55 by maldavid ### ########.fr */ +/* Updated: 2023/04/08 18:41:26 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,6 +20,7 @@ namespace mlx { VkFormat findSupportedFormat(const std::vector& candidates, VkImageTiling tiling, VkFormatFeatureFlags features); + uint32_t formatSize(VkFormat format); class Image { diff --git a/src/renderer/text_pipeline.cpp b/src/renderer/text_pipeline.cpp index a089380..849760a 100644 --- a/src/renderer/text_pipeline.cpp +++ b/src/renderer/text_pipeline.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/06 16:41:13 by maldavid #+# #+# */ -/* Updated: 2023/04/08 00:48:48 by maldavid ### ########.fr */ +/* Updated: 2023/04/08 20:44:51 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,25 +14,28 @@ #include #include +#include #define STB_TRUETYPE_IMPLEMENTATION #include +#include + namespace mlx { - static uint8_t tmp_bitmap[512 * 512]; + uint8_t tmp_bitmap[512 * 512]; void TextPutPipeline::init(Renderer* renderer) noexcept { _renderer = renderer; - stbtt_BakeFontBitmap(opensans_regular_ttf, 0, 32.0, tmp_bitmap, 512, 512, 32, 96, _cdata); - _atlas.create(reinterpret_cast(_cdata), 512, 512, VK_FORMAT_R8G8B8A8_UNORM); + stbtt_BakeFontBitmap(opensans_regular_ttf, 0, 20.0f, tmp_bitmap, 512, 512, 32, 96, _cdata); + _atlas.create(tmp_bitmap, 512, 512, VK_FORMAT_R8_UNORM); _atlas.setDescriptor(renderer->getFragDescriptorSet().duplicate()); } void TextPutPipeline::put(int x, int y, int color, std::string str) { - _drawlist.emplace_back(std::move(str), color, x, y); + _drawlist.emplace(std::move(str), color, x, y); } void TextPutPipeline::render() @@ -41,13 +44,16 @@ namespace mlx for(auto& draw : _drawlist) { _atlas.setColor(draw.color); + int i = 0; for(char c : draw.text) { - if(c < 32 && c > 127) + if(c < 32 || c > 127) continue; stbtt_aligned_quad q; - stbtt_GetBakedQuad(_cdata, 512, 512, c - 32, &draw.x, &draw.y, &q, 1); + float null_x = 0.0f; + float null_y = 0.0f; + stbtt_GetBakedQuad(_cdata, 512, 512, c - 32, &null_x, &null_y, &q, 1); std::array pos = { glm::vec2{q.x0, q.y0}, @@ -63,7 +69,7 @@ namespace mlx glm::vec2{q.s0, q.t1} }; - _atlas.render(*_renderer, 0, 0, std::move(pos), std::move(uv)); + _atlas.render(*_renderer, draw.x, draw.y, std::move(pos), std::move(uv)); } } } diff --git a/src/renderer/text_pipeline.h b/src/renderer/text_pipeline.h index 5688590..77cf335 100644 --- a/src/renderer/text_pipeline.h +++ b/src/renderer/text_pipeline.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/06 16:24:11 by maldavid #+# #+# */ -/* Updated: 2023/04/08 00:46:36 by maldavid ### ########.fr */ +/* Updated: 2023/04/08 20:44:33 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,7 +18,7 @@ #include #include #include -#include +#include namespace mlx { @@ -37,21 +37,22 @@ namespace mlx ~TextPutPipeline() = default; private: - struct DrawList + struct DrawData { std::string text; - float x; - float y; + int x; + int y; int color; - DrawList(std::string _text, int _color, int _x, int _y) : + DrawData(std::string _text, int _color, int _x, int _y) : text(std::move(_text)), color(_color), x(_x), y(_y) {} + bool operator==(const DrawData& rhs) const { return text == rhs.text && x == rhs.x && y == rhs.y && color == rhs.color; } }; stbtt_bakedchar _cdata[96]; TextureAtlas _atlas; - std::vector _drawlist; + std::unordered_set _drawlist; Renderer* _renderer = nullptr; }; } diff --git a/test/main.c b/test/main.c index b2a977a..91040e3 100644 --- a/test/main.c +++ b/test/main.c @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 17:55:21 by maldavid #+# #+# */ -/* Updated: 2023/04/08 00:21:38 by maldavid ### ########.fr */ +/* Updated: 2023/04/08 19:04:29 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -73,12 +73,12 @@ int main(void) void *img; mlx.mlx = mlx_init(); - mlx.win = mlx_new_window(mlx.mlx, 400, 400, "My window"); + mlx.win = mlx_new_window(mlx.mlx, 1400, 800, "My window"); mlx.logo = mlx_png_file_to_image(mlx.mlx, "42_logo.png", &w, &h); mlx_pixel_put(mlx.mlx, mlx.win, 200, 10, 0xFFFF00FF); mlx_put_image_to_window(mlx.mlx, mlx.win, mlx.logo, 200, 200); img = create_image(&mlx); - mlx_string_put(mlx.mlx, mlx.win, 0, 0, 0xFFFF0000, "this is a text"); + mlx_string_put(mlx.mlx, mlx.win, 20, 20, 0xFFFF0000, "this is a text"); mlx_put_image_to_window(mlx.mlx, mlx.win, img, 200, 20); mlx_loop_hook(mlx.mlx, update, &mlx); mlx_loop(mlx.mlx);