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

add: bring textures to draw layer

Browse Source 
Adding the Scene::BringToDrawLayer() to fix layering issues after a Scene::ResetScene() call
This commit is contained in:
Namonay
2024-10-27 23:12:07 +01:00
parent fed7111362
commit 8c287e4cbc
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,14 +45,14 @@ namespace mlx
new_text.SetColor(std::move(vec_color)); new_text.SetColor(std::move(vec_color));
// if(m_pixelput_called) // if(m_pixelput_called)
{ {
m_draw_layer++; // m_draw_layer++;
// m_pixelput_called = false; // m_pixelput_called = false;
} }
} }
else if(!p_scene->IsTextAtGivenDrawLayer(str, m_draw_layer)) else if(!p_scene->IsTextAtGivenDrawLayer(str, m_draw_layer))
{ {
p_scene->BringToFront(text.Get()); p_scene->BringToDrawLayer(text.Get(), m_draw_layer);
m_draw_layer++; //m_draw_layer++;
} }
} }
@@ -73,8 +73,8 @@ namespace mlx
} }
else if(!p_scene->IsTextureAtGivenDrawLayer(texture, m_draw_layer)) else if(!p_scene->IsTextureAtGivenDrawLayer(texture, m_draw_layer))
{ {
p_scene->BringToFront(sprite.Get()); p_scene->BringToDrawLayer(sprite.Get(), m_draw_layer);
m_draw_layer++; //m_draw_layer++;
} }
} }

1
runtime/Includes/Graphics/Scene.h
View File

@@ -27,6 +27,7 @@ namespace mlx
inline void BindFont(std::shared_ptr<Font> font) { Verify((bool)font, "invalid fond pointer"); p_bound_font = font; } inline void BindFont(std::shared_ptr<Font> font) { Verify((bool)font, "invalid fond pointer"); p_bound_font = font; }
void BringToFront(NonOwningPtr<Drawable> drawable); void BringToFront(NonOwningPtr<Drawable> drawable);
void BringToDrawLayer(NonOwningPtr<Drawable> drawable, std::uint64_t draw_layer);
inline void ResetScene() { m_drawables.clear(); } inline void ResetScene() { m_drawables.clear(); }

11
runtime/Sources/Graphics/Scene.cpp
View File

@@ -124,4 +124,15 @@ namespace mlx
return; return;
std::rotate(it, it + 1, m_drawables.end()); std::rotate(it, it + 1, m_drawables.end());
} }
void Scene::BringToDrawLayer(NonOwningPtr<Drawable> drawable, std::uint64_t draw_layer)
{
MLX_PROFILE_FUNCTION();
auto it = std::find_if(m_drawables.begin(), m_drawables.end(), [&drawable](std::shared_ptr<Drawable> drawable_ptr)
{
return drawable_ptr.get() == drawable.Get();
});
if (m_drawables.size() > draw_layer)
return;
std::swap(*it, *(m_drawables.begin() + draw_layer));
}
} }