From 7087421bb9f94e044838ebdbd6ef0bc2e88d97f2 Mon Sep 17 00:00:00 2001
From: Dander7BD <dander.1981@gmail.com>
Date: Tue, 21 Jan 2014 10:32:44 +0100
Subject: [PATCH] InterpolateAxisYToAxis_Nlerp implemented

---
 Code/OysterMath/LinearMath.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Code/OysterMath/LinearMath.h b/Code/OysterMath/LinearMath.h
index b8dfe481..0fac61e6 100644
--- a/Code/OysterMath/LinearMath.h
+++ b/Code/OysterMath/LinearMath.h
@@ -726,6 +726,21 @@ namespace LinearAlgebra3D
 	template<typename ScalarType>
 	inline ::LinearAlgebra::Vector4<ScalarType> NormalProjection( const ::LinearAlgebra::Vector4<ScalarType> &vector, const ::LinearAlgebra::Vector4<ScalarType> &normalizedAxis )
 	{ return normalizedAxis * ( vector.Dot(normalizedAxis) ); }
+
+	template<typename ScalarType>
+	::LinearAlgebra::Matrix4x4<ScalarType> & SnapAxisYToAxis_Nlerp( ::LinearAlgebra::Matrix4x4<ScalarType> &rotation, const ::LinearAlgebra::Vector4<ScalarType> &normalizedAxis )
+	{
+
+	}
+
+	template<typename ScalarType>
+	::LinearAlgebra::Matrix4x4<ScalarType> & InterpolateAxisYToAxis_Nlerp( ::LinearAlgebra::Matrix4x4<ScalarType> &rotation, const ::LinearAlgebra::Vector4<ScalarType> &normalizedAxis, ScalarType t )
+	{
+		::LinearAlgebra::Vector4<ScalarType> interpolated = ::LinearAlgebra::Nlerp( rotation.v[1], normalizedAxis, t );
+		if( interpolated.Dot(interpolated) == 0 )
+			return rotation; // return no change
+		return SnapAxisYToAxis_Nlerp( rotation, interpolated );
+	}
 }
 
 #include "Utilities.h"