Update ui control event priority by GUI Element render order

skylicht-lab · Aug 21, 2024 · 40951c1 · 40951c1
1 parent b40ae55
commit 40951c1
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 3 deletions.
diff --git a/Assets/SampleGUIDemo/Main.gui b/Assets/SampleGUIDemo/Main.gui
diff --git a/Projects/Editor/Source/Selection/CGUISelecting.cpp b/Projects/Editor/Source/Selection/CGUISelecting.cpp
@@ -110,7 +110,7 @@ namespace Skylicht
 							}
 							else
 							{
-								// no select gui							
+								// no select gui
 								controller->deselectAllOnHierachy();
 								selection->clear();
 							}

diff --git a/Projects/Skylicht/Engine/Source/Graphics2D/CCanvas.cpp b/Projects/Skylicht/Engine/Source/Graphics2D/CCanvas.cpp
@@ -178,6 +178,8 @@ namespace Skylicht
 		CGUIElement* entity = NULL;
 		CGUIElement* parent = NULL;
 
+		int renderOrder = 0;
+
 		while (renderEntity.size() > 0)
 		{
 			entity = renderEntity.top();
@@ -217,6 +219,9 @@ namespace Skylicht
 
 			entity->render(camera);
 
+			// update render order for UI Hitest
+			entity->m_renderOrder = renderOrder++;
+
 			if (mask != NULL)
 				mask->endMaskTest();
 
@@ -254,7 +259,7 @@ namespace Skylicht
 			up = look.crossProduct(right);
 			up.normalize();
 
-			// billboard matrix		
+			// billboard matrix
 			f32* matData = billboardMatrix.pointer();
 
 			matData[0] = right.X;

diff --git a/Projects/Skylicht/Engine/Source/Graphics2D/GUI/CGUIElement.cpp b/Projects/Skylicht/Engine/Source/Graphics2D/GUI/CGUIElement.cpp
@@ -42,6 +42,7 @@ namespace Skylicht
 		m_drawBorder(false),
 		m_enableMaterial(false),
 		m_materialId(0),
+		m_renderOrder(0),
 		m_applyCurrentMask(NULL)
 	{
 		CEntityPrefab* entityPrefab = m_canvas->getEntityManager();
@@ -66,6 +67,7 @@ namespace Skylicht
 		m_drawBorder(false),
 		m_enableMaterial(false),
 		m_materialId(0),
+		m_renderOrder(0),
 		m_applyCurrentMask(NULL)
 	{
 		CEntityPrefab* entityPrefab = m_canvas->getEntityManager();

diff --git a/Projects/Skylicht/Engine/Source/Graphics2D/GUI/CGUIElement.h b/Projects/Skylicht/Engine/Source/Graphics2D/GUI/CGUIElement.h
@@ -54,6 +54,8 @@ namespace Skylicht
 		bool m_visible;
 		bool m_enableMaterial;
 
+		int m_renderOrder;
+
 		ArrayMaterial m_materials;
 
 		int m_materialId;
@@ -158,6 +160,11 @@ namespace Skylicht
 			return m_transform->Depth;
 		}
 
+		inline int getRenderOrder()
+		{
+			return m_renderOrder;
+		}
+
 		inline void setDock(EGUIDock dock)
 		{
 			m_guiAlign->Dock = dock;

diff --git a/Projects/Skylicht/UserInterface/Source/UserInterface/CUIContainer.cpp b/Projects/Skylicht/UserInterface/Source/UserInterface/CUIContainer.cpp
@@ -13,6 +13,7 @@ namespace Skylicht
 			m_enable(true),
 			m_hover(NULL),
 			m_canvas(NULL),
+			m_skip(NULL),
 			m_inMotion(false),
 			m_outMotion(false),
 			m_pointerDown(false)
@@ -232,7 +233,7 @@ namespace Skylicht
 
 				std::sort(m_raycastUIObjects.begin(), m_raycastUIObjects.end(), [](CUIBase*& a, CUIBase*& b)
 					{
-						return a->getElement()->getDepth() > b->getElement()->getDepth();
+						return a->getElement()->getRenderOrder() > b->getElement()->getRenderOrder();
 					});
 
 				if (m_hover != m_raycastUIObjects[0])
@@ -317,6 +318,7 @@ namespace Skylicht
 				m_hover->onPointerOut(x, y);
 				m_hover = NULL;
 			}
+
 			m_skip = NULL;
 			m_pointerDown = false;
 		}