Added snapping of components with Left Shift

Author: BenPyton

src/Components/ComponentRenderer.cpp

@@ -20,6 +20,7 @@ ComponentRenderer::ComponentRenderer(int x, int y, int width, int height, UIStyl
 	assert(nullptr != m_pText);
 	m_pText->setString("No component");
 	m_outputPin.setParent(this);
+	m_snapGrid = sf::Vector2f(50, 50);
 }
 
 ComponentRenderer::ComponentRenderer(ComponentRenderer && _cr)
@@ -108,6 +109,8 @@ void ComponentRenderer::update()
 		m_inputPins[i].setViewParent(m_viewParent);
 		m_inputPins[i].update();
 	}
+
+	m_snap = Input::GetKey(sf::Keyboard::LShift);
 }
 
 void ComponentRenderer::_updateState()

src/Core/DraggableBox.cpp

@@ -18,13 +18,20 @@ DraggableBox::DraggableBox(int x, int y, int width, int height, UIStyle& style)
 	: AbstractUI(x, y, width, height, style)
 {
 	m_dragged = false;
+	m_mouseStart = sf::Vector2f(0, 0);
+	m_startPos = sf::Vector2f(0, 0);
+	m_snap = false;
+	m_snapGrid = sf::Vector2f(1, 1);
 }
 
 DraggableBox::DraggableBox(const DraggableBox & _db)
 	: AbstractUI(_db)
 {
 	m_dragged = _db.m_dragged;
-	m_mouseOffset = _db.m_mouseOffset;
+	m_mouseStart = _db.m_mouseStart;
+	m_startPos = _db.m_startPos;
+	m_snap = _db.m_snap;
+	m_snapGrid = _db.m_snapGrid;
 }
 
 DraggableBox::DraggableBox(DraggableBox && _db)
@@ -47,46 +54,64 @@ void DraggableBox::swap(DraggableBox & _other)
 {
 	AbstractUI::swap(_other);
 	std::swap(m_dragged, _other.m_dragged);
-	std::swap(m_mouseOffset, _other.m_mouseOffset);
+	//std::swap(m_mouseOffset, _other.m_mouseOffset);
+	std::swap(m_mouseStart, _other.m_mouseStart);
+	std::swap(m_startPos, _other.m_startPos);
+	std::swap(m_snap, _other.m_snap);
+	std::swap(m_snapGrid, _other.m_snapGrid);
 }
 
 void DraggableBox::_updateState()
 {
 	if (m_dragged)
 	{
+		sf::Vector2f mouseNewPos;
 		if (nullptr != m_viewParent)
 		{
-			m_position = m_viewParent->mapScreenPointToView((sf::Vector2f)Input::GetMousePosition()) + m_mouseOffset;
+			mouseNewPos = m_viewParent->mapScreenPointToView(Input::GetMousePosition());// +m_mouseOffset;
 		}
 		else
 		{
-			m_position = (sf::Vector2f)Input::GetMousePosition() + m_mouseOffset;
+			mouseNewPos = Input::GetMousePosition();// + m_mouseOffset;
 		}
 		if (Input::GetMouseButtonUp(sf::Mouse::Left))
 		{
 			m_dragged = false;
 			m_state = UIState::UI_NORMAL;
 		}
+
+		if (m_snap)
+		{
+			m_position = sf::Vector2f(
+				floorf((m_startPos.x + (mouseNewPos.x - m_mouseStart.x)) / m_snapGrid.x) * m_snapGrid.x,
+				floorf((m_startPos.y + (mouseNewPos.y - m_mouseStart.y)) / m_snapGrid.y) * m_snapGrid.y);
+		}
+		else
+		{
+			m_position = m_startPos + (mouseNewPos - m_mouseStart);
+		}
 	}
 	else
 	{
 		if (click() && UIManager::GetFirstHoveredUI(Input::GetMousePosition()) == this)
 		{
 			if (nullptr != m_viewParent)
 			{
-				if (m_viewParent->hovered((sf::Vector2f)Input::GetMousePosition()))
+				if (m_viewParent->hovered(Input::GetMousePosition()))
 				{
-					m_mouseOffset = m_position - m_viewParent->mapScreenPointToView((sf::Vector2f)Input::GetMousePosition());
-					m_dragged = true;
-					m_state = UIState::UI_HOVERED;
+					m_mouseStart = m_viewParent->mapScreenPointToView(Input::GetMousePosition());
+					//m_mouseOffset = m_position - m_viewParent->mapScreenPointToView(Input::GetMousePosition());
 				}
 			}
 			else
 			{
-				m_mouseOffset = m_position - (sf::Vector2f)Input::GetMousePosition();
-				m_dragged = true;
-				m_state = UIState::UI_HOVERED;
+				m_mouseStart = Input::GetMousePosition();
+				//m_mouseOffset = m_position - Input::GetMousePosition();
 			}
+
+			m_startPos = m_position;
+			m_dragged = true;
+			m_state = UIState::UI_HOVERED;
 		}
 	}
 
@@ -95,34 +120,3 @@ void DraggableBox::_updateState()
 		m_state = m_focused ? UIState::UI_FOCUSED : UIState::UI_NORMAL;
 	}
 }
-
-//void DraggableBox::_updateTransform()
-//{
-//}
-
-//void DraggableBox::update()
-//{
-//	if (m_dragged)
-//	{
-//		m_rect->setPosition((sf::Vector2f)Input::GetMousePosition() + m_mouseOffset);
-//
-//		if (Input::GetMouseButtonUp(sf::Mouse::Left))
-//		{
-//			m_dragged = false;
-//			m_state = UIState::UI_NORMAL;
-//		}
-//	}
-//	else
-//	{
-//		if (click())
-//		{
-//			m_dragged = true;
-//			m_mouseOffset = m_rect->getPosition() - (sf::Vector2f)Input::GetMousePosition();
-//			m_state = UIState::UI_HOVERED;
-//		}
-//	}
-//
-//
-//	m_rect->setFillColor((*m_style)[m_state].bgCol);
-//	m_rect->setOutlineColor((*m_style)[m_state].outCol);
-//}

src/Core/DraggableBox.h

@@ -21,7 +21,12 @@ class DraggableBox : public AbstractUI
 {
 protected:
 	bool m_dragged;
-	sf::Vector2f m_mouseOffset;
+	sf::Vector2f m_mouseStart;
+	sf::Vector2f m_startPos;
+
+	bool m_snap = true;
+	sf::Vector2f m_snapGrid = sf::Vector2f(50, 50);
+
 public:
 	DraggableBox(int x, int y, int width, int height, UIStyle& style = UIStyle::Default);
 	DraggableBox(const DraggableBox& _db);
@@ -31,14 +36,8 @@ class DraggableBox : public AbstractUI
 	DraggableBox& operator=(DraggableBox&& _db);
 	void swap(DraggableBox& _other);
 
-
-
-	//virtual void update();
-
 protected:
 	virtual void _updateState() override;
-	//virtual void _updateTransform() override;
-	//virtual void _updateStyle() override;
 };
 
 #endif // _DRAGGABLEBOX_H