From 9a2d2b94907e0624113f77f9bfd5f2e42b556cea Mon Sep 17 00:00:00 2001 From: Dander7BD Date: Tue, 21 Jan 2014 11:23:03 +0100 Subject: [PATCH] Interpolation methods referred in ::Oyster::Math & Math3D --- Code/OysterMath/OysterMath.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Code/OysterMath/OysterMath.h b/Code/OysterMath/OysterMath.h index 2fe57718..9ce38deb 100644 --- a/Code/OysterMath/OysterMath.h +++ b/Code/OysterMath/OysterMath.h @@ -45,6 +45,9 @@ namespace Oyster { namespace Math //! Oyster's native math library //! Creates a solution matrix for 'outī= 'targetMem' * 'in'. //! Returns false if there is no explicit solution. bool SuperpositionMatrix( const Float4x4 &in, const Float4x4 &out, Float4x4 &targetMem ); + + using ::LinearAlgebra::Lerp; + using ::LinearAlgebra::Nlerp; } } inline ::Oyster::Math::Float2 & operator *= ( ::Oyster::Math::Float2 &left, const ::Oyster::Math::Float2 &right ) @@ -328,6 +331,9 @@ namespace Oyster { namespace Math3D //! Oyster's native math library specialized //! Helper inline function that sets and then returns targetMem = transformer * transformee inline Float4 & TransformVector( const Float4x4 &transformer, const Float4 &transformee, Float4 &targetMem = Float4() ) { return targetMem = transformer * transformee; } + + using ::LinearAlgebra3D::SnapAxisYToNormal_UsingNlerp; + using ::LinearAlgebra3D::InterpolateAxisYToNormal_UsingNlerp; } } #endif \ No newline at end of file