#157 Implement layout system

Author: ducphamhong

Projects/Skylicht/Engine/Source/Graphics2D/CCanvas.cpp

@@ -46,7 +46,7 @@ namespace Skylicht
 
 		// add root
 		m_root = new CGUIElement(this, NULL, m_rect);
-		m_root->setDock(CGUIElement::DockFill);
+		m_root->setDock(EGUIDock::DockFill);
 
 		m_systems.push_back(new CGUILayoutSystem());
 		for (IEntitySystem* system : m_systems)
@@ -117,6 +117,11 @@ namespace Skylicht
 
 				if (maxDepth < world->Depth)
 					maxDepth = world->Depth;
+
+				if (world->ParentIndex != -1)
+					world->Parent = GET_ENTITY_DATA(entities[world->ParentIndex], CWorldTransformData);
+				else
+					world->Parent = NULL;
 			}
 		}
 
@@ -131,21 +136,19 @@ namespace Skylicht
 			for (int j = 0, n = m_depth[i].count(); j < n; j++)
 				m_alives.push(entitiesPtr[j]);
 		}
-	}
-
-	void CCanvas::render(CCamera* camera)
-	{
-		m_renderCamera = camera;
-
-		// update system
-		updateEntities();
 
+		// update systems
 		for (IEntitySystem* system : m_systems)
 		{
 			system->beginQuery(NULL);
 			system->onQuery(NULL, m_alives.pointer(), m_alives.count());
 			system->update(NULL);
 		}
+	}
+
+	void CCanvas::render(CCamera* camera)
+	{
+		m_renderCamera = camera;
 
 		// render
 		std::stack<CGUIElement*> renderEntity;

Projects/Skylicht/Engine/Source/Graphics2D/CGraphics2D.cpp

@@ -214,6 +214,15 @@ namespace Skylicht
 
 			CGUIElement* root = canvas->getRootElement();
 
+			// set screensize for root
+			core::dimension2du s = getScreenSize();
+			float w = (float)s.Width;
+			float h = (float)s.Height;
+			root->setRect(core::rectf(0.0f, 0.0f, w, h));
+
+			// update canvas layout, position...
+			canvas->updateEntities();
+
 			core::matrix4 world;
 
 			if (canvas->isEnable3DBillboard() == true && camera->getProjectionType() != CCamera::OrthoUI)

Projects/Skylicht/Engine/Source/Graphics2D/EntityData/CGUIAlignData.cpp

@@ -29,7 +29,10 @@ namespace Skylicht
 {
 	IMPLEMENT_DATA_TYPE_INDEX(CGUIAlignData);
 
-	CGUIAlignData::CGUIAlignData()
+	CGUIAlignData::CGUIAlignData() :
+		Vertical(EGUIVerticalAlign::Top),
+		Horizontal(EGUIHorizontalAlign::Left),
+		Dock(EGUIDock::NoDock)
 	{
 
 	}

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

@@ -28,13 +28,61 @@ This file is part of the "Skylicht Engine".
 
 namespace Skylicht
 {
+	enum class EGUIVerticalAlign
+	{
+		Top,
+		Middle,
+		Bottom
+	};
+
+	enum class EGUIHorizontalAlign
+	{
+		Left,
+		Center,
+		Right
+	};
+
+	enum class EGUIDock
+	{
+		NoDock,
+		DockLeft,
+		DockRight,
+		DockTop,
+		DockBottom,
+		DockFill
+	};
+
+	struct SMargin
+	{
+		float Left;
+		float Top;
+		float Right;
+		float Bottom;
+
+		SMargin()
+		{
+			Left = 0.0f;
+			Top = 0.0f;
+			Right = 0.0f;
+			Bottom = 0.0f;
+		}
+	};
+
 	class CGUIAlignData : public IEntityData
 	{
 		friend class CGUILayoutSystem;
 
 	public:
 		DECLARE_DATA_TYPE_INDEX;
 
+		EGUIDock Dock;
+
+		SMargin Margin;
+
+		EGUIVerticalAlign Vertical;
+
+		EGUIHorizontalAlign Horizontal;
+
 	public:
 		CGUIAlignData();
 

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

@@ -30,7 +30,8 @@ namespace Skylicht
 	IMPLEMENT_DATA_TYPE_INDEX(CGUITransformData);
 
 	CGUITransformData::CGUITransformData() :
-		m_dirty(true),
+		HasChanged(true),
+		Parent(NULL),
 		m_scale(1.0f, 1.0f, 1.0f)
 	{
 

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

@@ -33,9 +33,7 @@ namespace Skylicht
 		friend class CGUILayoutSystem;
 
 	protected:
-		core::rectf m_rect;
 		core::vector3df m_transformPosition;
-		bool m_dirty;
 
 		core::vector3df	m_position;
 		core::vector3df	m_scale;
@@ -44,6 +42,12 @@ namespace Skylicht
 	public:
 		DECLARE_DATA_TYPE_INDEX;
 
+		bool HasChanged;
+
+		core::rectf Rect;
+
+		CGUITransformData* Parent;
+
 	public:
 		CGUITransformData();
 
@@ -57,7 +61,7 @@ namespace Skylicht
 		inline void setPosition(const core::vector3df& v)
 		{
 			m_position = v;
-			m_dirty = true;
+			HasChanged = true;
 		}
 
 		inline const core::vector3df& getScale()
@@ -68,7 +72,7 @@ namespace Skylicht
 		inline void setScale(const core::vector3df& v)
 		{
 			m_scale = v;
-			m_dirty = true;
+			HasChanged = true;
 		}
 
 		inline const core::vector3df& getRotation()
@@ -79,37 +83,27 @@ namespace Skylicht
 		inline void setRotation(const core::vector3df& v)
 		{
 			m_rotation = v;
-			m_dirty = true;
+			HasChanged = true;
 		}
 
 		inline float getHeight()
 		{
-			return m_rect.getHeight();
+			return Rect.getHeight();
 		}
 
 		inline float getWidth()
 		{
-			return m_rect.getWidth();
+			return Rect.getWidth();
 		}
 
 		inline const core::rectf& getRect()
 		{
-			return m_rect;
+			return Rect;
 		}
 
 		inline void setRect(const core::rectf& r)
 		{
-			m_rect = r;
-		}
-
-		inline bool isChanged()
-		{
-			return m_dirty;
-		}
-
-		inline void setChanged(bool b)
-		{
-			m_dirty = b;
+			Rect = r;
 		}
 
 		DECLARE_GETTYPENAME(CGUITransformData);