From 3755fc2487b21123882cef54d91802497f8427c0 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Wed, 31 Aug 2016 20:53:27 +0200
Subject: [PATCH] Graphics/Sprite: Add Origin parameter

Allows you to change center of translation/rotation/scale


Former-commit-id: c5e8b3cf4b67e8a2765a4f0984d08bda3d1dc0ec [formerly 20f58bfa832c85f4837f325c3d74b0eef264b2bf] [formerly 830cae0d17c4cef7b538734d6cfe83539689dab3 [formerly 4dc889bfa34a04c59844969bb0d6b08599c1189a]]
Former-commit-id: 949b6b78762b7b804e357ee5b3afe35456fd7f2d [formerly 92beb7207e1271941f4053255091d32806a19e9b]
Former-commit-id: 5b1d9b37251f0bc3be87aef0ef0c3252ff82b4d0
---
 include/Nazara/Graphics/Sprite.hpp |  3 +++
 include/Nazara/Graphics/Sprite.inl | 33 +++++++++++++++++++++++++++++-
 src/Nazara/Graphics/Sprite.cpp     | 14 ++++++++-----
 3 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/include/Nazara/Graphics/Sprite.hpp b/include/Nazara/Graphics/Sprite.hpp
index 3660bf872..3aa261d89 100644
--- a/include/Nazara/Graphics/Sprite.hpp
+++ b/include/Nazara/Graphics/Sprite.hpp
@@ -38,12 +38,14 @@ namespace Nz
 
 			inline const Color& GetColor() const;
 			inline const MaterialRef& GetMaterial() const;
+			inline const Vector3f& GetOrigin() const;
 			inline const Vector2f& GetSize() const;
 			inline const Rectf& GetTextureCoords() const;
 
 			inline void SetColor(const Color& color);
 			inline void SetDefaultMaterial();
 			inline void SetMaterial(MaterialRef material, bool resizeSprite = true);
+			inline void SetOrigin(const Vector3f& origin);
 			inline void SetSize(const Vector2f& size);
 			inline void SetSize(float sizeX, float sizeY);
 			inline void SetTexture(TextureRef texture, bool resizeSprite = true);
@@ -67,6 +69,7 @@ namespace Nz
 			MaterialRef m_material;
 			Rectf m_textureCoords;
 			Vector2f m_size;
+			Vector3f m_origin;
 
 			static SpriteLibrary::LibraryMap s_library;
 	};
diff --git a/include/Nazara/Graphics/Sprite.inl b/include/Nazara/Graphics/Sprite.inl
index f0e05c5a2..2cfc014a2 100644
--- a/include/Nazara/Graphics/Sprite.inl
+++ b/include/Nazara/Graphics/Sprite.inl
@@ -14,6 +14,7 @@ namespace Nz
 
 	inline Sprite::Sprite() :
 	m_color(Color::White),
+	m_origin(Nz::Vector3f::Zero()),
 	m_textureCoords(0.f, 0.f, 1.f, 1.f),
 	m_size(64.f, 64.f)
 	{
@@ -77,12 +78,23 @@ namespace Nz
 	* \brief Gets the material of the sprite
 	* \return Current material
 	*/
-
 	inline const MaterialRef& Sprite::GetMaterial() const
 	{
 		return m_material;
 	}
 
+	/*!
+	* \brief Gets the origin of the sprite
+	*
+	* \return Current material
+	*
+	* \see SetOrigin
+	*/
+	inline const Vector3f & Sprite::GetOrigin() const
+	{
+		return m_origin;
+	}
+
 	/*!
 	* \brief Gets the size of the sprite
 	* \return Current size
@@ -146,6 +158,24 @@ namespace Nz
 		}
 	}
 
+	/*!
+	* \brief Sets the origin of the sprite
+	*
+	* The origin is the center of translation/rotation/scaling of the sprite.
+	*
+	* \param origin New origin for the sprite
+	*
+	* \see GetOrigin
+	*/
+	inline void Sprite::SetOrigin(const Vector3f& origin)
+	{
+		m_origin = origin;
+
+		// On invalide la bounding box
+		InvalidateBoundingVolume();
+		InvalidateVertices();
+	}
+
 	/*!
 	* \brief Sets the size of the sprite
 	*
@@ -277,3 +307,4 @@ namespace Nz
 }
 
 #include <Nazara/Renderer/DebugOff.hpp>
+#include "Sprite.hpp"
diff --git a/src/Nazara/Graphics/Sprite.cpp b/src/Nazara/Graphics/Sprite.cpp
index 5ef82cddf..f4b2f0dab 100644
--- a/src/Nazara/Graphics/Sprite.cpp
+++ b/src/Nazara/Graphics/Sprite.cpp
@@ -39,7 +39,9 @@ namespace Nz
 
 	void Sprite::MakeBoundingVolume() const
 	{
-		m_boundingVolume.Set(Vector3f(0.f), m_size.x*Vector3f::Right() + m_size.y*Vector3f::Down());
+		Vector3f origin(m_origin.x, -m_origin.y, m_origin.z);
+
+		m_boundingVolume.Set(-origin, m_size.x*Vector3f::Right() + m_size.y*Vector3f::Down() - origin);
 	}
 
 	/*!
@@ -57,20 +59,22 @@ namespace Nz
 		SparsePtr<Vector3f> posPtr(&vertices[0].position, sizeof(VertexStruct_XYZ_Color_UV));
 		SparsePtr<Vector2f> texCoordPtr(&vertices[0].uv, sizeof(VertexStruct_XYZ_Color_UV));
 
+		Vector3f origin(m_origin.x, -m_origin.y, m_origin.z);
+
 		*colorPtr++ = m_color;
-		*posPtr++ = instanceData->transformMatrix->Transform(Vector3f(0.f));
+		*posPtr++ = instanceData->transformMatrix->Transform(Vector3f(-origin));
 		*texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_LeftTop);
 
 		*colorPtr++ = m_color;
-		*posPtr++ = instanceData->transformMatrix->Transform(m_size.x*Vector3f::Right());
+		*posPtr++ = instanceData->transformMatrix->Transform(m_size.x*Vector3f::Right() - origin);
 		*texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_RightTop);
 
 		*colorPtr++ = m_color;
-		*posPtr++ = instanceData->transformMatrix->Transform(m_size.y*Vector3f::Down());
+		*posPtr++ = instanceData->transformMatrix->Transform(m_size.y*Vector3f::Down() - origin);
 		*texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_LeftBottom);
 
 		*colorPtr++ = m_color;
-		*posPtr++ = instanceData->transformMatrix->Transform(m_size.x*Vector3f::Right() + m_size.y*Vector3f::Down());
+		*posPtr++ = instanceData->transformMatrix->Transform(m_size.x*Vector3f::Right() + m_size.y*Vector3f::Down() - origin);
 		*texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_RightBottom);
 	}