#158 Fix gizmos position with align property, move gui objects

Author: ducphamhong

Projects/Editor/Source/Editor/GUIEditor/CGUIEditor.cpp

@@ -75,8 +75,12 @@ namespace Skylicht
 						CSpaceGUIDesign* guiDesign = dynamic_cast<CSpaceGUIDesign*>(space);
 						CGUITransformGizmos* gizmos = guiDesign->getGizmos();
 
+						// update transform first
+						m_gui->getCanvas()->updateEntities();
+
+						// apply for Gizmos
 						gizmos->setTransform(
-							m_gui->getPosition(),
+							m_gui->getAlignPosition(),
 							m_gui->getRotation(),
 							m_gui->getScale(),
 							m_gui->getRect()

Projects/Editor/Source/Editor/Gizmos/GUITransform/CGUITransformGizmos.cpp

@@ -59,6 +59,7 @@ namespace Skylicht
 			if (selectObject == NULL)
 			{
 				handle->end();
+				m_selectID = "";
 				return;
 			}
 
@@ -86,7 +87,7 @@ namespace Skylicht
 						if (parentGUI)
 							m_parentWorld = parentGUI->getAbsoluteTransform();
 
-						m_position = gui->getPosition();
+						m_position = gui->getAlignPosition();
 						m_rotation = gui->getRotationQuaternion();
 						m_scale = gui->getScale();
 						m_rect = gui->getRect();
@@ -109,24 +110,27 @@ namespace Skylicht
 			// position
 			{
 				core::vector3df newPos = CGUIHandles::getInstance()->positionHandle(*m_position, m_gui->getRotationQuaternion());
+				core::vector3df delta;
 
 				if (newPos != *m_position)
 				{
-					core::vector3df delta = newPos - *m_position;
+					delta = newPos - *m_position;
 					updateSelectedPosition(delta);
 
 					m_position = newPos;
 					m_position.notify(this);
 
-					m_gui->setPosition(newPos);
+					core::vector3df p = m_gui->getPosition() + delta;
+					m_gui->setPosition(p);
 
 					m_changed = true;
 					updateProperty();
 				}
 
 				if (handle->endCheck())
 				{
-					m_gui->setPosition(*m_position);
+					core::vector3df p = m_gui->getPosition() + delta;
+					m_gui->setPosition(p);
 					handle->end();
 
 					// save undo/redo
@@ -139,7 +143,7 @@ namespace Skylicht
 			{
 				core::rectf newRect = CGUIHandles::getInstance()->rectHandle(
 					*m_rect,
-					m_gui->getPosition(),
+					m_gui->getAlignPosition(),
 					m_gui->getScale(),
 					m_gui->getRotationQuaternion());
 
@@ -159,6 +163,8 @@ namespace Skylicht
 					m_gui->setRect(*m_rect);
 					handle->end();
 
+					m_selectID = "";
+
 					// save undo/redo
 					// if (m_changed)
 					//	saveHistorySelectedObject();
@@ -264,14 +270,39 @@ namespace Skylicht
 			CGameObject* guiCanvas = scene->searchObjectInChild(L"GUICanvas");
 			CCanvas* canvas = guiCanvas->getComponent<CCanvas>();
 
-			guis.clear();
+			std::vector<CGUIElement*> selects;
 
 			std::vector<CSelectObject*>& selectList = CSelection::getInstance()->getAllSelected();
 			for (CSelectObject* sel : selectList)
 			{
 				CGUIElement* gui = canvas->getGUIByID(sel->getID().c_str());
 				if (gui)
-					guis.push_back(gui);
+					selects.push_back(gui);
+			}
+
+			std::sort(selects.begin(), selects.end(), [](CGUIElement*& a, CGUIElement*& b)
+				{
+					return a->getDepth() < b->getDepth();
+				});
+
+			guis.clear();
+
+			for (CGUIElement* sel : selects)
+			{
+				bool add = true;
+				for (CGUIElement* del : guis)
+				{
+					if (sel->isChild(del))
+					{
+						add = false;
+						break;
+					}
+				}
+
+				if (add)
+				{
+					guis.push_back(sel);
+				}
 			}
 		}
 	}

Projects/Skylicht/Engine/Source/Graphics2D/EntityData/CGUITransformData.h

@@ -58,6 +58,11 @@ namespace Skylicht
 			return m_position;
 		}
 
+		inline const core::vector3df& getAlignPosition()
+		{
+			return m_transformPosition;
+		}
+
 		inline void setPosition(const core::vector3df& v)
 		{
 			m_position = v;

Projects/Skylicht/Engine/Source/Graphics2D/GUI/CGUIElement.h

@@ -185,6 +185,11 @@ namespace Skylicht
 
 		void setRelativeTransform(const core::matrix4& relative);
 
+		inline const core::vector3df getAlignPosition()
+		{
+			return m_guiTransform->getAlignPosition();
+		}
+
 		inline const core::vector3df& getPosition()
 		{
 			return m_guiTransform->getPosition();

Projects/Skylicht/Engine/Source/Graphics2D/GUISystem/CGUILayoutSystem.cpp

@@ -230,9 +230,9 @@ namespace Skylicht
 				m[10] *= t->m_scale.Z;
 				m[11] *= t->m_scale.Z;
 
-				m[12] = t->m_position.X;
-				m[13] = t->m_position.Y;
-				m[14] = t->m_position.Z;
+				m[12] = t->m_transformPosition.X;
+				m[13] = t->m_transformPosition.Y;
+				m[14] = t->m_transformPosition.Z;
 
 				// update world matrix
 				if (w->Parent)