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

Merge branch '2.0-dev' of github.com:Namonay/MacroLibX into 2.0-dev

Browse Source
This commit is contained in:
Namonay
2024-10-24 05:15:57 +02:00
parent e1fefba841 58ad52e1cc
commit b0384830a9
16 changed files with 174 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/Includes/Core/Graphics.inl
View File

@@ -9,8 +9,12 @@ namespace mlx
p_scene->ResetSprites();
m_put_pixel_manager.ResetRenderData();
m_draw_layer = 0;
<<<<<<< HEAD
m_putpixel_called = false;
// PixelPut(0, 0, 0x00000000); // bozoman solution FIXME
=======
PixelPut(0, 0, 0x00000000); // bozoman solution FIXME WTF
>>>>>>> cfb41b7b2706234ac514c2daab7c3717863af115
}
void GraphicsSupport::PixelPut(int x, int y, std::uint32_t color) noexcept
@@ -56,13 +60,6 @@ namespace mlx
}
}
void GraphicsSupport::LoadFont(const std::filesystem::path& filepath, float scale)
{
MLX_PROFILE_FUNCTION();
(void)filepath;
(void)scale;
}
void GraphicsSupport::TryEraseSpritesInScene(NonOwningPtr<Texture> texture) noexcept
{
MLX_PROFILE_FUNCTION();