Sdk/Widget: Add Canvas system, mouse movement event for widgets (buttons react to hovering)

Former-commit-id: 685295853d1f0edf28c36b2f698eca881da25ea2 [formerly f65f951ed3d2edfd9c12d390837cd13e5691eaa3] [formerly 5e239f37c28bf5e93a71cba29a94f0de680a79a2 [formerly 38346fa5d68c7bf79ddebc1990959e7c56617640]]
Former-commit-id: 92da4ed40fb63fe0b02c7543ea64cebda0575623 [formerly 2db1fe5fca87a1461ceb8314709d764af079a7be]
Former-commit-id: 77d61a99fd5a2bb21701fbe4a4b4451c3655663a

SDK/src/NDK/BaseWidget.cpp

@@ -3,16 +3,28 @@
 // For conditions of distribution and use, see copyright notice in Prerequesites.hpp
 
 #include <NDK/BaseWidget.hpp>
+#include <NDK/Canvas.hpp>
 #include <NDK/Components/GraphicsComponent.hpp>
 #include <NDK/Components/NodeComponent.hpp>
 #include <NDK/World.hpp>
 
 namespace Ndk
 {
+	BaseWidget::BaseWidget(BaseWidget* parent) :
+	BaseWidget()
+	{
+		NazaraAssert(parent, "Invalid parent");
+		NazaraAssert(parent->GetCanvas(), "Parent has no canvas");
+
+		m_canvas = parent->GetCanvas();
+		m_world = m_canvas->GetWorld();
+
+		m_canvasIndex = m_canvas->RegisterWidget(this);
+	}
+
 	BaseWidget::~BaseWidget()
 	{
-		for (BaseWidget* child : m_children)
-			delete child;
+		m_canvas->UnregisterWidget(m_canvasIndex);
 	}
 
 	inline void BaseWidget::EnableBackground(bool enable)
@@ -60,6 +72,9 @@ namespace Ndk
 
 	void BaseWidget::Layout()
 	{
+		if (m_canvas)
+			m_canvas->NotifyWidgetUpdate(m_canvasIndex);
+
 		if (m_backgroundEntity)
 		{
 			NodeComponent& node = m_backgroundEntity->GetComponent<NodeComponent>();
@@ -68,4 +83,24 @@ namespace Ndk
 			m_backgroundSprite->SetSize(m_contentSize.x + m_padding.left + m_padding.right, m_contentSize.y + m_padding.top + m_padding.bottom);
 		}
 	}
+
+	void BaseWidget::InvalidateNode()
+	{
+		Node::InvalidateNode();
+
+		if (m_canvas)
+			m_canvas->NotifyWidgetUpdate(m_canvasIndex);
+	}
+
+	void BaseWidget::OnMouseEnter()
+	{
+	}
+
+	void BaseWidget::OnMouseMoved(int x, int y, int deltaX, int deltaY)
+	{
+	}
+
+	void BaseWidget::OnMouseExit()
+	{
+	}
 }

SDK/src/NDK/Canvas.cpp

@@ -0,0 +1,102 @@
+// Copyright (C) 2015 Jérôme Leclercq
+// This file is part of the "Nazara Development Kit"
+// For conditions of distribution and use, see copyright notice in Prerequesites.hpp
+
+#include <NDK/Canvas.hpp>
+#include <NDK/Components/GraphicsComponent.hpp>
+#include <NDK/Components/NodeComponent.hpp>
+#include <NDK/World.hpp>
+#include <limits>
+
+namespace Ndk
+{
+	void Ndk::Canvas::ResizeToContent()
+	{
+	}
+
+	void Canvas::Layout()
+	{
+		if (m_backgroundEntity)
+		{
+			NodeComponent& node = m_backgroundEntity->GetComponent<NodeComponent>();
+			node.SetPosition(-m_padding.left, -m_padding.top);
+
+			m_backgroundSprite->SetSize(m_contentSize.x + m_padding.left + m_padding.right, m_contentSize.y + m_padding.top + m_padding.bottom);
+		}
+	}
+
+	void Canvas::NotifyWidgetUpdate(std::size_t index)
+	{
+		WidgetBox& entry = m_widgetBoxes[index];
+
+		Nz::Vector3f pos  = entry.widget->GetPosition();
+		Nz::Vector2f size = entry.widget->GetContentSize();
+
+		entry.box.Set(pos.x, pos.y, pos.z, size.x, size.y, 1.f);
+	}
+
+	std::size_t Canvas::RegisterWidget(BaseWidget* widget)
+	{
+		WidgetBox box;
+		box.widget = widget;
+
+		std::size_t index = m_widgetBoxes.size();
+		m_widgetBoxes.emplace_back(box);
+
+		NotifyWidgetUpdate(index);
+		return index;
+	}
+
+	void Canvas::UnregisterWidget(std::size_t index)
+	{
+		if (m_widgetBoxes.size() > 1U)
+		{
+			WidgetBox& entry = m_widgetBoxes[index];
+			WidgetBox& lastEntry = m_widgetBoxes.back();
+
+			entry = std::move(lastEntry);
+			entry.widget->UpdateCanvasIndex(index);
+			m_widgetBoxes.pop_back();
+		}
+	}
+
+	void Canvas::OnMouseMoved(const Nz::EventHandler* eventHandler, const Nz::WindowEvent::MouseMoveEvent& event)
+	{
+		const WidgetBox* bestEntry = nullptr;
+		float bestEntryArea = std::numeric_limits<float>::infinity();
+
+		for (const WidgetBox& entry : m_widgetBoxes)
+		{
+			const Nz::Boxf& box = entry.box;
+
+			if (box.Contains(Nz::Vector3f(event.x, event.y, 0.f)))
+			{
+				float area = box.width * box.height;
+				if (area < bestEntryArea)
+				{
+					bestEntry = &entry;
+					bestEntryArea = area;
+				}
+			}
+		}
+
+		if (bestEntry)
+		{
+			if (m_hoveredWidget != bestEntry->widget)
+			{
+				if (m_hoveredWidget)
+					m_hoveredWidget->OnMouseExit();
+
+				m_hoveredWidget = bestEntry->widget;
+				m_hoveredWidget->OnMouseEnter();
+			}
+
+			bestEntry->widget->OnMouseMoved(event.x - bestEntry->box.x, event.y - bestEntry->box.y, event.deltaX, event.deltaY);
+		}
+		else if (m_hoveredWidget)
+		{
+			m_hoveredWidget->OnMouseExit();
+			m_hoveredWidget = nullptr;
+		}
+	}
+}

SDK/src/NDK/Widgets/ButtonWidget.cpp

@@ -9,8 +9,8 @@
 
 namespace Ndk
 {
-	ButtonWidget::ButtonWidget(const WorldHandle& world, BaseWidget* parent) :
-	BaseWidget(world, parent)
+	ButtonWidget::ButtonWidget(BaseWidget* parent) :
+	BaseWidget(parent)
 	{
 		m_gradientSprite = Nz::Sprite::New();
 		m_gradientSprite->SetColor(Nz::Color(74, 74, 74));
@@ -21,13 +21,14 @@ namespace Ndk
 		m_gradientEntity = CreateEntity();
 		m_gradientEntity->AddComponent<NodeComponent>().SetParent(this);
 		m_gradientEntity->AddComponent<GraphicsComponent>().Attach(m_gradientSprite);
-		m_gradientEntity->GetComponent<GraphicsComponent>().Attach(m_borderSprite, Nz::Matrix4f::Translate(Nz::Vector2f(-1.f, -1.f)), -1);
 
 		m_textSprite = Nz::TextSprite::New();
 
 		m_textEntity = CreateEntity();
 		m_textEntity->AddComponent<NodeComponent>().SetParent(this);
 		m_textEntity->AddComponent<GraphicsComponent>().Attach(m_textSprite, 1);
+
+		Layout();
 	}
 
 	void ButtonWidget::ResizeToContent()
@@ -37,6 +38,8 @@ namespace Ndk
 
 	void ButtonWidget::Layout()
 	{
+		BaseWidget::Layout();
+
 		const Nz::Vector2f& contentSize = GetContentSize();
 
 		m_gradientSprite->SetSize(contentSize);
@@ -44,4 +47,19 @@ namespace Ndk
 		Nz::Boxf textBox = m_textEntity->GetComponent<GraphicsComponent>().GetBoundingVolume().aabb;
 		m_textEntity->GetComponent<NodeComponent>().SetPosition(contentSize.x / 2 - textBox.width / 2, contentSize.y / 2 - textBox.height / 2);
 	}
+
+	void ButtonWidget::OnMouseEnter()
+	{
+		m_gradientSprite->SetColor(Nz::Color(128, 128, 128));
+	}
+
+	void ButtonWidget::OnMouseMoved(int x, int y, int deltaX, int deltaY)
+	{
+		NazaraDebug(Nz::String::Number(x) + ", " + Nz::String::Number(y));
+	}
+
+	void ButtonWidget::OnMouseExit()
+	{
+		m_gradientSprite->SetColor(Nz::Color(74, 74, 74));
+	}
 }

SDK/src/NDK/Widgets/LabelWidget.cpp

@@ -9,14 +9,16 @@
 
 namespace Ndk
 {
-	LabelWidget::LabelWidget(const WorldHandle& world, BaseWidget* parent) :
-	BaseWidget(world, parent)
+	LabelWidget::LabelWidget(BaseWidget* parent) :
+	BaseWidget(parent)
 	{
 		m_textSprite = Nz::TextSprite::New();
 
 		m_textEntity = CreateEntity();
 		m_textEntity->AddComponent<GraphicsComponent>().Attach(m_textSprite);
 		m_textEntity->AddComponent<NodeComponent>().SetParent(this);
+
+		Layout();
 	}
 
 	void LabelWidget::ResizeToContent()