From eea13ffa7d661cb40d509f70963c7d79aeca26fc Mon Sep 17 00:00:00 2001 From: sebcrozet Date: Sat, 22 Sep 2018 18:42:24 +0200 Subject: [PATCH] Add swizzling up to dimension 3 to vectors. --- src/base/mod.rs | 1 + src/base/swizzle.rs | 66 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 src/base/swizzle.rs diff --git a/src/base/mod.rs b/src/base/mod.rs index 9913820f..7197b004 100644 --- a/src/base/mod.rs +++ b/src/base/mod.rs @@ -12,6 +12,7 @@ pub mod storage; mod alias; mod alias_slice; +mod swizzle; mod cg; mod componentwise; mod construction; diff --git a/src/base/swizzle.rs b/src/base/swizzle.rs new file mode 100644 index 00000000..c7ea1b12 --- /dev/null +++ b/src/base/swizzle.rs @@ -0,0 +1,66 @@ +use base::{Scalar, Vector, DimName, U0, U1, U2, U3, U4, Vector2, Vector3}; +use storage::Storage; +use typenum::{Cmp, Greater}; + + +macro_rules! impl_swizzle { + ($(where $BaseDim: ty: $name: ident() -> $Result: ident[$($i: expr),*]);*) => { + $( + impl> Vector { + #[inline] + pub fn $name(&self) -> $Result + where D::Value: Cmp<$BaseDim, Output=Greater> { + $Result::new($(self[$i]),*) + } + } + )* + } +} + +impl_swizzle!( + where U0: xx() -> Vector2[0, 0]; + where U1: xy() -> Vector2[0, 1]; + where U2: xz() -> Vector2[0, 2]; + where U1: yx() -> Vector2[1, 0]; + where U1: yy() -> Vector2[1, 1]; + where U1: yz() -> Vector2[1, 2]; + where U2: zx() -> Vector2[2, 0]; + where U2: zy() -> Vector2[2, 1]; + where U2: zz() -> Vector2[2, 2]; + + where U0: xxx() -> Vector3[0, 0, 0]; + where U1: xxy() -> Vector3[0, 0, 1]; + where U2: xxz() -> Vector3[0, 0, 2]; + + where U1: xyx() -> Vector3[0, 1, 0]; + where U1: xyy() -> Vector3[0, 1, 1]; + where U2: xyz() -> Vector3[0, 1, 2]; + + where U2: xzx() -> Vector3[0, 2, 0]; + where U2: xzy() -> Vector3[0, 2, 1]; + where U2: xzz() -> Vector3[0, 2, 2]; + + where U1: yxx() -> Vector3[1, 0, 0]; + where U1: yxy() -> Vector3[1, 0, 1]; + where U2: yxz() -> Vector3[1, 0, 2]; + + where U1: yyx() -> Vector3[1, 1, 0]; + where U1: yyy() -> Vector3[1, 1, 1]; + where U2: yyz() -> Vector3[1, 1, 2]; + + where U2: yzx() -> Vector3[1, 2, 0]; + where U2: yzy() -> Vector3[1, 2, 1]; + where U2: yzz() -> Vector3[1, 2, 2]; + + where U2: zxx() -> Vector3[2, 0, 0]; + where U2: zxy() -> Vector3[2, 0, 1]; + where U2: zxz() -> Vector3[2, 0, 2]; + + where U2: zyx() -> Vector3[2, 1, 0]; + where U2: zyy() -> Vector3[2, 1, 1]; + where U2: zyz() -> Vector3[2, 1, 2]; + + where U2: zzx() -> Vector3[2, 2, 0]; + where U2: zzy() -> Vector3[2, 2, 1]; + where U2: zzz() -> Vector3[2, 2, 2] +); \ No newline at end of file