X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2Fcml%2Fmathlib%2Ftypedef.h;h=902a331d5e2195ff25cca2681ffce994c3643c3f;hp=f34843efb2d0049afbd92de2b884d25956ea308a;hb=50c1239917f5e443b8ec91773c85ceb3db7da67b;hpb=1dd005530930657fd6216edc1dfcfa4c270a81c9 diff --git a/src/Moof/cml/mathlib/typedef.h b/src/Moof/cml/mathlib/typedef.h index f34843e..902a331 100644 --- a/src/Moof/cml/mathlib/typedef.h +++ b/src/Moof/cml/mathlib/typedef.h @@ -35,6 +35,11 @@ typedef vector< float, fixed<4> > vector4f; typedef vector< double, fixed<4> > vector4d; /* fixed-size matrices */ + +typedef matrix< int, fixed<2,2> > matrix22i; +typedef matrix< float, fixed<2,2> > matrix22f; +typedef matrix< double, fixed<2,2> > matrix22d; + typedef matrix< int, fixed<2,2>, row_basis, row_major > matrix22i_r; typedef matrix< int, fixed<2,2>, col_basis, col_major > matrix22i_c; typedef matrix< float, fixed<2,2>, row_basis, row_major > matrix22f_r; @@ -42,6 +47,11 @@ typedef matrix< float, fixed<2,2>, col_basis, col_major > matrix22f_c; typedef matrix< double, fixed<2,2>, row_basis, row_major > matrix22d_r; typedef matrix< double, fixed<2,2>, col_basis, col_major > matrix22d_c; + +typedef matrix< int, fixed<3,3> > matrix33i; +typedef matrix< float, fixed<3,3> > matrix33f; +typedef matrix< double, fixed<3,3> > matrix33d; + typedef matrix< int, fixed<3,3>, row_basis, row_major > matrix33i_r; typedef matrix< int, fixed<3,3>, col_basis, col_major > matrix33i_c; typedef matrix< float, fixed<3,3>, row_basis, row_major > matrix33f_r; @@ -49,6 +59,11 @@ typedef matrix< float, fixed<3,3>, col_basis, col_major > matrix33f_c; typedef matrix< double, fixed<3,3>, row_basis, row_major > matrix33d_r; typedef matrix< double, fixed<3,3>, col_basis, col_major > matrix33d_c; + +typedef matrix< int, fixed<4,4> > matrix44i; +typedef matrix< float, fixed<4,4> > matrix44f; +typedef matrix< double, fixed<4,4> > matrix44d; + typedef matrix< int, fixed<4,4>, row_basis, row_major > matrix44i_r; typedef matrix< int, fixed<4,4>, col_basis, col_major > matrix44i_c; typedef matrix< float, fixed<4,4>, row_basis, row_major > matrix44f_r; @@ -56,6 +71,7 @@ typedef matrix< float, fixed<4,4>, col_basis, col_major > matrix44f_c; typedef matrix< double, fixed<4,4>, row_basis, row_major > matrix44d_r; typedef matrix< double, fixed<4,4>, col_basis, col_major > matrix44d_c; + typedef matrix< int, fixed<3,2>, row_basis, row_major > matrix32i_r; typedef matrix< float, fixed<3,2>, row_basis, row_major > matrix32f_r; typedef matrix< double, fixed<3,2>, row_basis, row_major > matrix32d_r; @@ -72,6 +88,7 @@ typedef matrix< int, fixed<3,4>, col_basis, col_major > matrix34i_c; typedef matrix< float, fixed<3,4>, col_basis, col_major > matrix34f_c; typedef matrix< double, fixed<3,4>, col_basis, col_major > matrix34d_c; + /* quaternions */ typedef quaternion,vector_first,negative_cross> quaternionf_n; @@ -81,13 +98,21 @@ typedef quaternion,vector_first,negative_cross> quaterniond_n; typedef quaternion,vector_first,positive_cross> quaterniond_p; +typedef quaternion quaternionf; +typedef quaternion quaterniond; + /* dynamically resizable vectors */ typedef vector< int, dynamic<> > vectori; typedef vector< float, dynamic<> > vectorf; typedef vector< double, dynamic<> > vectord; + /* dynamically resizable matrices */ +typedef matrix< int, dynamic<> > matrixi; +typedef matrix< float, dynamic<> > matrixf; +typedef matrix< double, dynamic<> > matrixd; + typedef matrix< int, dynamic<>, row_basis, row_major > matrixi_r; typedef matrix< int, dynamic<>, col_basis, col_major > matrixi_c; typedef matrix< float, dynamic<>, row_basis, row_major > matrixf_r; @@ -95,6 +120,7 @@ typedef matrix< float, dynamic<>, col_basis, col_major > matrixf_c; typedef matrix< double, dynamic<>, row_basis, row_major > matrixd_r; typedef matrix< double, dynamic<>, col_basis, col_major > matrixd_c; + /* constants */ typedef constants constantsf; typedef constants constantsd;