Merge pull request #236 from TeamWisp/feature_rotation_quat

Added ability to set quaternion directly

src/scene_graph/node.cpp

@@ -5,6 +5,7 @@ namespace wr
 	Node::Node()
 	{
 		SignalTransformChange();
+		m_used_quaternion = false;
 	}
 
 	void Node::SignalChange()
@@ -49,6 +50,13 @@ namespace wr
 		SignalTransformChange();
 	}
 
+	void Node::SetQuaternionRotation( float x, float y, float z, float w )
+	{
+		m_rotation = { x,y,z,w };
+		m_used_quaternion = true;
+		SignalTransformChange();
+	}
+
 	void Node::SetPosition(DirectX::XMVECTOR position)
 	{
 		m_position = position;
@@ -70,7 +78,14 @@ namespace wr
 
 	void Node::UpdateTransform()
 	{
-		m_rotation = DirectX::XMQuaternionRotationRollPitchYawFromVector(m_rotation_radians);
+		if( m_used_quaternion )
+		{
+			m_used_quaternion == false; // reset
+		}
+		else
+		{
+			m_rotation = DirectX::XMQuaternionRotationRollPitchYawFromVector(m_rotation_radians);
+		}
 		DirectX::XMMATRIX translation_mat = DirectX::XMMatrixTranslationFromVector(m_position);
 		DirectX::XMMATRIX rotation_mat = DirectX::XMMatrixRotationQuaternion(m_rotation);
 		DirectX::XMMATRIX scale_mat = DirectX::XMMatrixScalingFromVector(m_scale);

src/scene_graph/node.hpp

@@ -22,6 +22,9 @@ namespace wr
 		//Takes roll, pitch and yaw and converts it to quaternion
 		virtual void SetRotation(DirectX::XMVECTOR roll_pitch_yaw);
 
+		//Takes raw values of a quaternion
+		virtual void SetQuaternionRotation( float x, float y, float z, float w );
+
 		//Sets position
 		virtual void SetPosition(DirectX::XMVECTOR position);
 
@@ -56,6 +59,6 @@ namespace wr
 
 		std::bitset<3> m_requires_update;
 		std::bitset<3> m_requires_transform_update;
-
+		bool m_used_quaternion;
 	};
 } // namespace wr