Fixing layering issues with text and textures (#99)

![image](https://github.com/user-attachments/assets/804d7dfa-90fd-4d61-b448-61ffa30ed00f)
seekrs · Oct 28, 2024 · 51427dc · 51427dc
2 parents 7724001 + 245d556
commit 51427dc
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/runtime/Includes/Core/Graphics.inl b/runtime/Includes/Core/Graphics.inl
@@ -40,20 +40,17 @@ namespace mlx
 		NonOwningPtr<Text> text = p_scene->GetTextFromPositionAndColor(str, Vec2f{ static_cast<float>(x), static_cast<float>(y) }, vec_color);
 		if(!text)
 		{
-			Text& new_text = p_scene->CreateText(str);
-			new_text.SetPosition(Vec2f{ static_cast<float>(x), static_cast<float>(y) });
-			new_text.SetColor(std::move(vec_color));
-		//	if(m_pixelput_called)
+			if(m_pixelput_called)
 			{
 				m_draw_layer++;
-		//		m_pixelput_called = false;
+				m_pixelput_called = false;
 			}
+			Text& new_text = p_scene->CreateText(str);
+			new_text.SetPosition(Vec2f{ static_cast<float>(x), static_cast<float>(y) });
+			new_text.SetColor(std::move(vec_color));
 		}
 		else if(!p_scene->IsTextAtGivenDrawLayer(str, m_draw_layer))
-		{
-			p_scene->BringToFront(text.Get());
-			m_draw_layer++;
-		}
+			p_scene->BringToDrawLayer(text.Get(), m_draw_layer);
 	}
 
 	void GraphicsSupport::TexturePut(NonOwningPtr<Texture> texture, int x, int y)
@@ -62,20 +59,17 @@ namespace mlx
 		NonOwningPtr<Sprite> sprite = p_scene->GetSpriteFromTextureAndPosition(texture, Vec2f{ static_cast<float>(x), static_cast<float>(y) });
 		if(!sprite)
 		{
-
-			Sprite& new_sprite = p_scene->CreateSprite(texture);
-			new_sprite.SetPosition(Vec2f{ static_cast<float>(x), static_cast<float>(y) });
 			if(m_pixelput_called)
 			{
 				m_draw_layer++;
 				m_pixelput_called = false;
-			}
-		}
-		else if(!p_scene->IsTextureAtGivenDrawLayer(texture, m_draw_layer))
-		{
-			p_scene->BringToFront(sprite.Get());
-			m_draw_layer++;
+			}	
+			Sprite& new_sprite = p_scene->CreateSprite(texture);
+			new_sprite.SetPosition(Vec2f{ static_cast<float>(x), static_cast<float>(y) });
+
 		}
+		else if(!p_scene->IsTextureAtGivenDrawLayer(texture, m_draw_layer))	
+			p_scene->BringToDrawLayer(sprite.Get(), m_draw_layer);
 	}
 
 	void GraphicsSupport::TryEraseSpritesInScene(NonOwningPtr<Texture> texture) noexcept

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

diff --git a/runtime/Sources/Graphics/Scene.cpp b/runtime/Sources/Graphics/Scene.cpp
@@ -124,4 +124,15 @@ namespace mlx
 			return;
 		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));
+    }
 }