special case 3d vectors and matrices
This commit is contained in:
parent
823a05c101
commit
cf17460b77
@ -83,6 +83,36 @@ macro_rules! impl_wide_vector_operations {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[doc(hidden)]
|
||||||
|
#[macro_export(local_inner_macros)]
|
||||||
|
macro_rules! impl_vector_3_wide_cross {
|
||||||
|
(
|
||||||
|
(),
|
||||||
|
($lhs:expr, $rhs:expr)
|
||||||
|
)=>{
|
||||||
|
impl Vector3<fixed_wide::fixed::Fixed<{$lhs},{$lhs*32}>>{
|
||||||
|
paste::item!{
|
||||||
|
#[inline]
|
||||||
|
pub fn [<wide_cross_ $lhs _ $rhs>](self,rhs:Vector3<fixed_wide::fixed::Fixed<{$rhs},{$rhs*32}>>)->Vector3<fixed_wide::fixed::Fixed<{$lhs+$rhs},{($lhs+$rhs)*32}>>{
|
||||||
|
Vector3{
|
||||||
|
x:self.y.[<wide_mul_ $lhs _ $rhs>](rhs.z)-self.z.[<wide_mul_ $lhs _ $rhs>](rhs.y),
|
||||||
|
y:self.z.[<wide_mul_ $lhs _ $rhs>](rhs.x)-self.x.[<wide_mul_ $lhs _ $rhs>](rhs.z),
|
||||||
|
z:self.x.[<wide_mul_ $lhs _ $rhs>](rhs.y)-self.y.[<wide_mul_ $lhs _ $rhs>](rhs.x)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[doc(hidden)]
|
||||||
|
#[macro_export(local_inner_macros)]
|
||||||
|
macro_rules! impl_vector_wide_3 {
|
||||||
|
()=>{
|
||||||
|
$crate::do_macro_8x8!(impl_vector_3_wide_cross,());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[doc(hidden)]
|
#[doc(hidden)]
|
||||||
#[macro_export(local_inner_macros)]
|
#[macro_export(local_inner_macros)]
|
||||||
macro_rules! impl_matrix_wide_dot_transpose_helper {
|
macro_rules! impl_matrix_wide_dot_transpose_helper {
|
||||||
@ -263,6 +293,72 @@ macro_rules! impl_wide_matrix_operations_1arg_not_const_generic {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[doc(hidden)]
|
||||||
|
#[macro_export(local_inner_macros)]
|
||||||
|
macro_rules! do_macro_4_dumb{
|
||||||
|
(
|
||||||
|
$macro:ident,
|
||||||
|
$any:tt
|
||||||
|
)=>{
|
||||||
|
$crate::macro_repeated!($macro, $any, (1,2),(2,4),(3,6),(4,8));
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#[doc(hidden)]
|
||||||
|
#[macro_export(local_inner_macros)]
|
||||||
|
macro_rules! impl_matrix_wide_3x3_det_not_const_generic {
|
||||||
|
(
|
||||||
|
$n: expr,
|
||||||
|
$_2n: expr
|
||||||
|
)=>{
|
||||||
|
impl Matrix3<Vector3<fixed_wide::fixed::Fixed<$n,{$n*32}>>>{
|
||||||
|
paste::item!{
|
||||||
|
pub fn [<wide_det_3x3_ $n>](self)->fixed_wide::fixed::Fixed<{$n*3},{$n*3*32}>{
|
||||||
|
//[<wide_dot_ $n _ $n*2>] will not compile, so the doubles are hardcoded above
|
||||||
|
self.x_axis.[<wide_dot_ $n _ $_2n>](self.y_axis.[<wide_cross_ $n _ $n>](self.z_axis))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[doc(hidden)]
|
||||||
|
#[macro_export(local_inner_macros)]
|
||||||
|
macro_rules! impl_matrix_wide_3x3_det_not_const_generic_shim {
|
||||||
|
(
|
||||||
|
(),($n: expr,$_2n: expr)
|
||||||
|
)=>{
|
||||||
|
$crate::impl_matrix_wide_3x3_det_not_const_generic!($n,$_2n);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[doc(hidden)]
|
||||||
|
#[macro_export(local_inner_macros)]
|
||||||
|
macro_rules! impl_matrix_wide_3x3_adjugate_not_const_generic {
|
||||||
|
(
|
||||||
|
(),
|
||||||
|
$n: expr
|
||||||
|
)=>{
|
||||||
|
impl Matrix3<Vector3<fixed_wide::fixed::Fixed<$n,{$n*32}>>>{
|
||||||
|
paste::item!{
|
||||||
|
pub fn [<wide_adjugate_3x3_ $n>](self)->Matrix3<Vector3<fixed_wide::fixed::Fixed<{$n*2},{$n*2*32}>>>{
|
||||||
|
Matrix3{
|
||||||
|
x_axis:Vector3{x:self.y_axis.y.[<wide_mul_ $n _ $n>](self.z_axis.z)-self.y_axis.z.[<wide_mul_ $n _ $n>](self.z_axis.y),y:self.x_axis.z.[<wide_mul_ $n _ $n>](self.z_axis.y)-self.x_axis.y.[<wide_mul_ $n _ $n>](self.z_axis.z),z:self.x_axis.y.[<wide_mul_ $n _ $n>](self.y_axis.z)-self.x_axis.z.[<wide_mul_ $n _ $n>](self.y_axis.y)},
|
||||||
|
y_axis:Vector3{x:self.y_axis.z.[<wide_mul_ $n _ $n>](self.z_axis.x)-self.y_axis.x.[<wide_mul_ $n _ $n>](self.z_axis.z),y:self.x_axis.x.[<wide_mul_ $n _ $n>](self.z_axis.z)-self.x_axis.z.[<wide_mul_ $n _ $n>](self.z_axis.x),z:self.x_axis.z.[<wide_mul_ $n _ $n>](self.y_axis.x)-self.x_axis.x.[<wide_mul_ $n _ $n>](self.y_axis.z)},
|
||||||
|
z_axis:Vector3{x:self.y_axis.x.[<wide_mul_ $n _ $n>](self.z_axis.y)-self.y_axis.y.[<wide_mul_ $n _ $n>](self.z_axis.x),y:self.x_axis.y.[<wide_mul_ $n _ $n>](self.z_axis.x)-self.x_axis.x.[<wide_mul_ $n _ $n>](self.z_axis.y),z:self.x_axis.x.[<wide_mul_ $n _ $n>](self.y_axis.y)-self.x_axis.y.[<wide_mul_ $n _ $n>](self.y_axis.x)},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[doc(hidden)]
|
||||||
|
#[macro_export(local_inner_macros)]
|
||||||
|
macro_rules! impl_matrix_wide_3x3 {
|
||||||
|
()=>{
|
||||||
|
$crate::do_macro_4_dumb!(impl_matrix_wide_3x3_det_not_const_generic_shim,());
|
||||||
|
$crate::do_macro_8!(impl_matrix_wide_3x3_adjugate_not_const_generic,());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// HACK: Allows us to sum repeating tokens in macros.
|
// HACK: Allows us to sum repeating tokens in macros.
|
||||||
// See: https://stackoverflow.com/a/60187870/17452730
|
// See: https://stackoverflow.com/a/60187870/17452730
|
||||||
#[doc(hidden)]
|
#[doc(hidden)]
|
||||||
|
@ -152,6 +152,15 @@ macro_rules! matrix_transpose_inner {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[doc(hidden)]
|
||||||
|
#[macro_export(local_inner_macros)]
|
||||||
|
macro_rules! impl_matrix_3x3 {
|
||||||
|
()=>{
|
||||||
|
#[cfg(feature="fixed_wide")]
|
||||||
|
$crate::impl_matrix_wide_3x3!();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[doc(hidden)]
|
#[doc(hidden)]
|
||||||
#[macro_export(local_inner_macros)]
|
#[macro_export(local_inner_macros)]
|
||||||
macro_rules! impl_matrix_operator {
|
macro_rules! impl_matrix_operator {
|
||||||
|
@ -144,3 +144,12 @@ macro_rules! impl_vector_operator {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[doc(hidden)]
|
||||||
|
#[macro_export(local_inner_macros)]
|
||||||
|
macro_rules! impl_vector_3 {
|
||||||
|
()=>{
|
||||||
|
#[cfg(feature="fixed_wide")]
|
||||||
|
$crate::impl_vector_wide_3!();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -34,3 +34,6 @@ crate::impl_matrices!(
|
|||||||
(Vector4 { x, y, z, w }, Matrix4 { x_axis, y_axis, z_axis, w_axis }, 4)
|
(Vector4 { x, y, z, w }, Matrix4 { x_axis, y_axis, z_axis, w_axis }, 4)
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
//Special case 3x3 matrix operations because I cba to write macros for the arbitrary cases
|
||||||
|
crate::impl_matrix_3x3!();
|
||||||
|
@ -79,3 +79,6 @@ crate::impl_matrix_inner!((Vector3 { x, y, z }, Vector3 { x, y, z }, 3), (Vector
|
|||||||
crate::impl_matrix_inner!((Vector4 { x, y, z, w }, Vector4 { x, y, z, w }, 4), (Vector2 { x, y }, Vector2 { x, y }, 2) );
|
crate::impl_matrix_inner!((Vector4 { x, y, z, w }, Vector4 { x, y, z, w }, 4), (Vector2 { x, y }, Vector2 { x, y }, 2) );
|
||||||
crate::impl_matrix_inner!((Vector4 { x, y, z, w }, Vector4 { x, y, z, w }, 4), (Vector3 { x, y, z }, Vector3 { x, y, z }, 3) );
|
crate::impl_matrix_inner!((Vector4 { x, y, z, w }, Vector4 { x, y, z, w }, 4), (Vector3 { x, y, z }, Vector3 { x, y, z }, 3) );
|
||||||
crate::impl_matrix_inner!((Vector4 { x, y, z, w }, Vector4 { x, y, z, w }, 4), (Vector4 { x, y, z, w }, Vector4 { x, y, z, w }, 4) );
|
crate::impl_matrix_inner!((Vector4 { x, y, z, w }, Vector4 { x, y, z, w }, 4), (Vector4 { x, y, z, w }, Vector4 { x, y, z, w }, 4) );
|
||||||
|
|
||||||
|
//cross product
|
||||||
|
crate::impl_vector_3!();
|
||||||
|
Loading…
Reference in New Issue
Block a user