NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inactivated code part 2 

Matrix to angularAxis conversions in OysterMath
This commit is contained in:
Dander7BD 2014-01-28 08:56:29 +01:00
parent cbdce81b20
commit 4e4aaf881a
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Code/OysterMath/OysterMath.cpp
View File

@ -81,20 +81,20 @@ namespace Oyster { namespace Math2D
namespace Oyster { namespace Math3D namespace Oyster { namespace Math3D
{ {
Float4 AngularAxis( const Float3x3 &rotationMatrix ) //Float4 AngularAxis( const Float3x3 &rotationMatrix )
{ //{
return ::LinearAlgebra3D::AngularAxis( rotationMatrix ); // return ::LinearAlgebra3D::AngularAxis( rotationMatrix );
} //}
Float4 AngularAxis( const Float4x4 &rotationMatrix ) //Float4 AngularAxis( const Float4x4 &rotationMatrix )
{ //{
return ::LinearAlgebra3D::AngularAxis( rotationMatrix ); // return ::LinearAlgebra3D::AngularAxis( rotationMatrix );
} //}
Float4 ExtractAngularAxis( const Float4x4 &orientationMatrix ) //Float4 ExtractAngularAxis( const Float4x4 &orientationMatrix )
{ //{
return ::LinearAlgebra3D::ExtractAngularAxis( orientationMatrix ); // return ::LinearAlgebra3D::ExtractAngularAxis( orientationMatrix );
} //}
Float4x4 & TranslationMatrix( const Float3 &position, Float4x4 &targetMem ) Float4x4 & TranslationMatrix( const Float3 &position, Float4x4 &targetMem )
{ {