From a54c42229b34093f0557dd76e99a1627131c878f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Crozet?= Date: Wed, 2 Oct 2013 11:52:10 +0200 Subject: [PATCH] Update to the last Rust: remove the float type. --- src/adaptors/rotmat.rs | 8 ++++-- src/adaptors/transform.rs | 5 ++-- src/dmat.rs | 4 --- src/dvec.rs | 4 --- src/lib.rs | 1 + src/mat.rs | 40 -------------------------- src/traits/operations.rs | 4 +-- src/types.rs | 60 --------------------------------------- src/vec.rs | 28 ------------------ 9 files changed, 10 insertions(+), 144 deletions(-) diff --git a/src/adaptors/rotmat.rs b/src/adaptors/rotmat.rs index f84e2753..53a4c3d7 100644 --- a/src/adaptors/rotmat.rs +++ b/src/adaptors/rotmat.rs @@ -11,9 +11,11 @@ use mat::{Mat2, Mat3}; #[path = "../metal.rs"] mod metal; -/// Matrix wrapper representing rotation matrix. It is built uppon another matrix and ensures (at -/// the type-level) that it will always represent a rotation. Rotation matrices have some -/// properties useful for performances, like the fact that the inversion is simply a transposition. +/// Matrix wrapper representing rotation matrix. +/// +/// It is built uppon another matrix and ensures (at the type-level) that it will always represent +/// a rotation. Rotation matrices have some properties useful for performances, like the fact that +/// the inversion is simply a transposition. #[deriving(Eq, ToStr, Clone)] pub struct Rotmat { priv submat: M diff --git a/src/adaptors/transform.rs b/src/adaptors/transform.rs index 67b3f218..abfac99e 100644 --- a/src/adaptors/transform.rs +++ b/src/adaptors/transform.rs @@ -11,6 +11,7 @@ use vec::{Vec2, Vec3, Vec2MulRhs, Vec3MulRhs}; use mat::Mat3; /// Matrix-Vector wrapper used to represent a matrix multiplication followed by a translation. +/// /// Usually, a matrix in homogeneous coordinate is used to be able to apply an affine transform with /// a translation to a vector. This is weird because it makes a `n`-dimentional transformation be /// an `n + 1`-matrix. Using the `Transform` wrapper avoid homogeneous coordinates by having the @@ -78,8 +79,8 @@ impl Transform, Rotmat>> { /// # Arguments /// * eye - The new translation of the transformation. /// * at - The point to look at. `at - eye` is the direction the matrix `x` axis will be - /// aligned with - /// * up - Vector pointing `up`. The only requirement of this parameter is to not be colinear + /// aligned with. + /// * up - Vector pointing up. The only requirement of this parameter is to not be colinear /// with `at`. Non-colinearity is not checked. pub fn look_at(&mut self, eye: &Vec3, at: &Vec3, up: &Vec3) { self.submat.look_at(&(*at - *eye), up); diff --git a/src/dmat.rs b/src/dmat.rs index 366d154f..b1603626 100644 --- a/src/dmat.rs +++ b/src/dmat.rs @@ -549,7 +549,6 @@ scalar_mul_impl!(i64) scalar_mul_impl!(i32) scalar_mul_impl!(i16) scalar_mul_impl!(i8) -scalar_mul_impl!(float) scalar_mul_impl!(uint) scalar_mul_impl!(int) @@ -563,7 +562,6 @@ scalar_div_impl!(i64) scalar_div_impl!(i32) scalar_div_impl!(i16) scalar_div_impl!(i8) -scalar_div_impl!(float) scalar_div_impl!(uint) scalar_div_impl!(int) @@ -577,7 +575,6 @@ scalar_add_impl!(i64) scalar_add_impl!(i32) scalar_add_impl!(i16) scalar_add_impl!(i8) -scalar_add_impl!(float) scalar_add_impl!(uint) scalar_add_impl!(int) @@ -591,7 +588,6 @@ scalar_sub_impl!(i64) scalar_sub_impl!(i32) scalar_sub_impl!(i16) scalar_sub_impl!(i8) -scalar_sub_impl!(float) scalar_sub_impl!(uint) scalar_sub_impl!(int) diff --git a/src/dvec.rs b/src/dvec.rs index 5518b666..565b3db9 100644 --- a/src/dvec.rs +++ b/src/dvec.rs @@ -408,7 +408,6 @@ scalar_mul_impl!(i64) scalar_mul_impl!(i32) scalar_mul_impl!(i16) scalar_mul_impl!(i8) -scalar_mul_impl!(float) scalar_mul_impl!(uint) scalar_mul_impl!(int) @@ -422,7 +421,6 @@ scalar_div_impl!(i64) scalar_div_impl!(i32) scalar_div_impl!(i16) scalar_div_impl!(i8) -scalar_div_impl!(float) scalar_div_impl!(uint) scalar_div_impl!(int) @@ -436,7 +434,6 @@ scalar_add_impl!(i64) scalar_add_impl!(i32) scalar_add_impl!(i16) scalar_add_impl!(i8) -scalar_add_impl!(float) scalar_add_impl!(uint) scalar_add_impl!(int) @@ -450,6 +447,5 @@ scalar_sub_impl!(i64) scalar_sub_impl!(i32) scalar_sub_impl!(i16) scalar_sub_impl!(i8) -scalar_sub_impl!(float) scalar_sub_impl!(uint) scalar_sub_impl!(int) diff --git a/src/lib.rs b/src/lib.rs index 9c62ecd2..63789b18 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -42,6 +42,7 @@ mod spec { mod mat; mod vec0; mod vec; + // mod complex; } // mod lower_triangular; // mod chol; diff --git a/src/mat.rs b/src/mat.rs index 07e30da2..9592b1f3 100644 --- a/src/mat.rs +++ b/src/mat.rs @@ -66,7 +66,6 @@ scalar_mul_impl!(Mat1, u64, Mat1MulRhs, m11) scalar_mul_impl!(Mat1, u32, Mat1MulRhs, m11) scalar_mul_impl!(Mat1, u16, Mat1MulRhs, m11) scalar_mul_impl!(Mat1, u8, Mat1MulRhs, m11) -scalar_mul_impl!(Mat1, float, Mat1MulRhs, m11) scalar_mul_impl!(Mat1, uint, Mat1MulRhs, m11) scalar_mul_impl!(Mat1, int, Mat1MulRhs, m11) @@ -80,7 +79,6 @@ scalar_div_impl!(Mat1, u64, Mat1DivRhs, m11) scalar_div_impl!(Mat1, u32, Mat1DivRhs, m11) scalar_div_impl!(Mat1, u16, Mat1DivRhs, m11) scalar_div_impl!(Mat1, u8, Mat1DivRhs, m11) -scalar_div_impl!(Mat1, float, Mat1DivRhs, m11) scalar_div_impl!(Mat1, uint, Mat1DivRhs, m11) scalar_div_impl!(Mat1, int, Mat1DivRhs, m11) @@ -94,7 +92,6 @@ scalar_add_impl!(Mat1, u64, Mat1AddRhs, m11) scalar_add_impl!(Mat1, u32, Mat1AddRhs, m11) scalar_add_impl!(Mat1, u16, Mat1AddRhs, m11) scalar_add_impl!(Mat1, u8, Mat1AddRhs, m11) -scalar_add_impl!(Mat1, float, Mat1AddRhs, m11) scalar_add_impl!(Mat1, uint, Mat1AddRhs, m11) scalar_add_impl!(Mat1, int, Mat1AddRhs, m11) @@ -108,7 +105,6 @@ scalar_sub_impl!(Mat1, u64, Mat1SubRhs, m11) scalar_sub_impl!(Mat1, u32, Mat1SubRhs, m11) scalar_sub_impl!(Mat1, u16, Mat1SubRhs, m11) scalar_sub_impl!(Mat1, u8, Mat1SubRhs, m11) -scalar_sub_impl!(Mat1, float, Mat1SubRhs, m11) scalar_sub_impl!(Mat1, uint, Mat1SubRhs, m11) scalar_sub_impl!(Mat1, int, Mat1SubRhs, m11) @@ -164,7 +160,6 @@ scalar_mul_impl!(Mat2, u64, Mat2MulRhs, m11, m12, m21, m22) scalar_mul_impl!(Mat2, u32, Mat2MulRhs, m11, m12, m21, m22) scalar_mul_impl!(Mat2, u16, Mat2MulRhs, m11, m12, m21, m22) scalar_mul_impl!(Mat2, u8, Mat2MulRhs, m11, m12, m21, m22) -scalar_mul_impl!(Mat2, float, Mat2MulRhs, m11, m12, m21, m22) scalar_mul_impl!(Mat2, uint, Mat2MulRhs, m11, m12, m21, m22) scalar_mul_impl!(Mat2, int, Mat2MulRhs, m11, m12, m21, m22) @@ -178,7 +173,6 @@ scalar_div_impl!(Mat2, u64, Mat2DivRhs, m11, m12, m21, m22) scalar_div_impl!(Mat2, u32, Mat2DivRhs, m11, m12, m21, m22) scalar_div_impl!(Mat2, u16, Mat2DivRhs, m11, m12, m21, m22) scalar_div_impl!(Mat2, u8, Mat2DivRhs, m11, m12, m21, m22) -scalar_div_impl!(Mat2, float, Mat2DivRhs, m11, m12, m21, m22) scalar_div_impl!(Mat2, uint, Mat2DivRhs, m11, m12, m21, m22) scalar_div_impl!(Mat2, int, Mat2DivRhs, m11, m12, m21, m22) @@ -192,7 +186,6 @@ scalar_add_impl!(Mat2, u64, Mat2AddRhs, m11, m12, m21, m22) scalar_add_impl!(Mat2, u32, Mat2AddRhs, m11, m12, m21, m22) scalar_add_impl!(Mat2, u16, Mat2AddRhs, m11, m12, m21, m22) scalar_add_impl!(Mat2, u8, Mat2AddRhs, m11, m12, m21, m22) -scalar_add_impl!(Mat2, float, Mat2AddRhs, m11, m12, m21, m22) scalar_add_impl!(Mat2, uint, Mat2AddRhs, m11, m12, m21, m22) scalar_add_impl!(Mat2, int, Mat2AddRhs, m11, m12, m21, m22) @@ -206,7 +199,6 @@ scalar_sub_impl!(Mat2, u64, Mat2SubRhs, m11, m12, m21, m22) scalar_sub_impl!(Mat2, u32, Mat2SubRhs, m11, m12, m21, m22) scalar_sub_impl!(Mat2, u16, Mat2SubRhs, m11, m12, m21, m22) scalar_sub_impl!(Mat2, u8, Mat2SubRhs, m11, m12, m21, m22) -scalar_sub_impl!(Mat2, float, Mat2SubRhs, m11, m12, m21, m22) scalar_sub_impl!(Mat2, uint, Mat2SubRhs, m11, m12, m21, m22) scalar_sub_impl!(Mat2, int, Mat2SubRhs, m11, m12, m21, m22) @@ -274,7 +266,6 @@ scalar_mul_impl!(Mat3, u64, Mat3MulRhs, m11, m12, m13, m21, m22, m23, m31, m32, scalar_mul_impl!(Mat3, u32, Mat3MulRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) scalar_mul_impl!(Mat3, u16, Mat3MulRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) scalar_mul_impl!(Mat3, u8, Mat3MulRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) -scalar_mul_impl!(Mat3, float, Mat3MulRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) scalar_mul_impl!(Mat3, uint, Mat3MulRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) scalar_mul_impl!(Mat3, int, Mat3MulRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) @@ -288,7 +279,6 @@ scalar_div_impl!(Mat3, u64, Mat3DivRhs, m11, m12, m13, m21, m22, m23, m31, m32, scalar_div_impl!(Mat3, u32, Mat3DivRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) scalar_div_impl!(Mat3, u16, Mat3DivRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) scalar_div_impl!(Mat3, u8, Mat3DivRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) -scalar_div_impl!(Mat3, float, Mat3DivRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) scalar_div_impl!(Mat3, uint, Mat3DivRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) scalar_div_impl!(Mat3, int, Mat3DivRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) @@ -302,7 +292,6 @@ scalar_add_impl!(Mat3, u64, Mat3AddRhs, m11, m12, m13, m21, m22, m23, m31, m32, scalar_add_impl!(Mat3, u32, Mat3AddRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) scalar_add_impl!(Mat3, u16, Mat3AddRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) scalar_add_impl!(Mat3, u8, Mat3AddRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) -scalar_add_impl!(Mat3, float, Mat3AddRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) scalar_add_impl!(Mat3, uint, Mat3AddRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) scalar_add_impl!(Mat3, int, Mat3AddRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) @@ -316,7 +305,6 @@ scalar_sub_impl!(Mat3, u64, Mat3SubRhs, m11, m12, m13, m21, m22, m23, m31, m32, scalar_sub_impl!(Mat3, u32, Mat3SubRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) scalar_sub_impl!(Mat3, u16, Mat3SubRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) scalar_sub_impl!(Mat3, u8, Mat3SubRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) -scalar_sub_impl!(Mat3, float, Mat3SubRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) scalar_sub_impl!(Mat3, uint, Mat3SubRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) scalar_sub_impl!(Mat3, int, Mat3SubRhs, m11, m12, m13, m21, m22, m23, m31, m32, m33) @@ -406,8 +394,6 @@ scalar_mul_impl!(Mat4, u16, Mat4MulRhs, m11, m12, m13, m14, m21, m22, m23, m24, m41, m42, m43, m44) scalar_mul_impl!(Mat4, u8, Mat4MulRhs, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44) -scalar_mul_impl!(Mat4, float, Mat4MulRhs, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, - m41, m42, m43, m44) scalar_mul_impl!(Mat4, uint, Mat4MulRhs, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44) scalar_mul_impl!(Mat4, int, Mat4MulRhs, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, @@ -431,8 +417,6 @@ scalar_div_impl!(Mat4, u16, Mat4DivRhs, m11, m12, m13, m14, m21, m22, m23, m24, m41, m42, m43, m44) scalar_div_impl!(Mat4, u8, Mat4DivRhs, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44) -scalar_div_impl!(Mat4, float, Mat4DivRhs, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, - m41, m42, m43, m44) scalar_div_impl!(Mat4, uint, Mat4DivRhs, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44) scalar_div_impl!(Mat4, int, Mat4DivRhs, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, @@ -456,8 +440,6 @@ scalar_add_impl!(Mat4, u16, Mat4AddRhs, m11, m12, m13, m14, m21, m22, m23, m24, m41, m42, m43, m44) scalar_add_impl!(Mat4, u8, Mat4AddRhs, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44) -scalar_add_impl!(Mat4, float, Mat4AddRhs, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, - m41, m42, m43, m44) scalar_add_impl!(Mat4, uint, Mat4AddRhs, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44) scalar_add_impl!(Mat4, int, Mat4AddRhs, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, @@ -481,8 +463,6 @@ scalar_sub_impl!(Mat4, u16, Mat4SubRhs, m11, m12, m13, m14, m21, m22, m23, m24, m41, m42, m43, m44) scalar_sub_impl!(Mat4, u8, Mat4SubRhs, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44) -scalar_sub_impl!(Mat4, float, Mat4SubRhs, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, - m41, m42, m43, m44) scalar_sub_impl!(Mat4, uint, Mat4SubRhs, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44) scalar_sub_impl!(Mat4, int, Mat4SubRhs, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, @@ -596,8 +576,6 @@ scalar_mul_impl!(Mat5, u16, Mat5MulRhs, m11, m12, m13, m14, m15, m21, m22, m23, m31, m32, m33, m34, m35, m41, m42, m43, m44, m45, m51, m52, m53, m54, m55) scalar_mul_impl!(Mat5, u8, Mat5MulRhs, m11, m12, m13, m14, m15, m21, m22, m23, m24, m25, m31, m32, m33, m34, m35, m41, m42, m43, m44, m45, m51, m52, m53, m54, m55) -scalar_mul_impl!(Mat5, float, Mat5MulRhs, m11, m12, m13, m14, m15, m21, m22, m23, m24, m25, - m31, m32, m33, m34, m35, m41, m42, m43, m44, m45, m51, m52, m53, m54, m55) scalar_mul_impl!(Mat5, uint, Mat5MulRhs, m11, m12, m13, m14, m15, m21, m22, m23, m24, m25, m31, m32, m33, m34, m35, m41, m42, m43, m44, m45, m51, m52, m53, m54, m55) scalar_mul_impl!(Mat5, int, Mat5MulRhs, m11, m12, m13, m14, m15, m21, m22, m23, m24, m25, @@ -623,8 +601,6 @@ scalar_div_impl!(Mat5, u16, Mat5DivRhs, m11, m12, m13, m14, m15, m21, m22, m23, m31, m32, m33, m34, m35, m41, m42, m43, m44, m45, m51, m52, m53, m54, m55) scalar_div_impl!(Mat5, u8, Mat5DivRhs, m11, m12, m13, m14, m15, m21, m22, m23, m24, m25, m31, m32, m33, m34, m35, m41, m42, m43, m44, m45, m51, m52, m53, m54, m55) -scalar_div_impl!(Mat5, float, Mat5DivRhs, m11, m12, m13, m14, m15, m21, m22, m23, m24, m25, - m31, m32, m33, m34, m35, m41, m42, m43, m44, m45, m51, m52, m53, m54, m55) scalar_div_impl!(Mat5, uint, Mat5DivRhs, m11, m12, m13, m14, m15, m21, m22, m23, m24, m25, m31, m32, m33, m34, m35, m41, m42, m43, m44, m45, m51, m52, m53, m54, m55) scalar_div_impl!(Mat5, int, Mat5DivRhs, m11, m12, m13, m14, m15, m21, m22, m23, m24, m25, @@ -650,8 +626,6 @@ scalar_add_impl!(Mat5, u16, Mat5AddRhs, m11, m12, m13, m14, m15, m21, m22, m23, m31, m32, m33, m34, m35, m41, m42, m43, m44, m45, m51, m52, m53, m54, m55) scalar_add_impl!(Mat5, u8, Mat5AddRhs, m11, m12, m13, m14, m15, m21, m22, m23, m24, m25, m31, m32, m33, m34, m35, m41, m42, m43, m44, m45, m51, m52, m53, m54, m55) -scalar_add_impl!(Mat5, float, Mat5AddRhs, m11, m12, m13, m14, m15, m21, m22, m23, m24, m25, - m31, m32, m33, m34, m35, m41, m42, m43, m44, m45, m51, m52, m53, m54, m55) scalar_add_impl!(Mat5, uint, Mat5AddRhs, m11, m12, m13, m14, m15, m21, m22, m23, m24, m25, m31, m32, m33, m34, m35, m41, m42, m43, m44, m45, m51, m52, m53, m54, m55) scalar_add_impl!(Mat5, int, Mat5AddRhs, m11, m12, m13, m14, m15, m21, m22, m23, m24, m25, @@ -677,8 +651,6 @@ scalar_sub_impl!(Mat5, u16, Mat5SubRhs, m11, m12, m13, m14, m15, m21, m22, m23, m31, m32, m33, m34, m35, m41, m42, m43, m44, m45, m51, m52, m53, m54, m55) scalar_sub_impl!(Mat5, u8, Mat5SubRhs, m11, m12, m13, m14, m15, m21, m22, m23, m24, m25, m31, m32, m33, m34, m35, m41, m42, m43, m44, m45, m51, m52, m53, m54, m55) -scalar_sub_impl!(Mat5, float, Mat5SubRhs, m11, m12, m13, m14, m15, m21, m22, m23, m24, m25, - m31, m32, m33, m34, m35, m41, m42, m43, m44, m45, m51, m52, m53, m54, m55) scalar_sub_impl!(Mat5, uint, Mat5SubRhs, m11, m12, m13, m14, m15, m21, m22, m23, m24, m25, m31, m32, m33, m34, m35, m41, m42, m43, m44, m45, m51, m52, m53, m54, m55) scalar_sub_impl!(Mat5, int, Mat5SubRhs, m11, m12, m13, m14, m15, m21, m22, m23, m24, m25, @@ -784,9 +756,6 @@ scalar_mul_impl!(Mat6, u16, Mat6MulRhs, m11, m12, m13, m14, m15, m16, m21, m22, scalar_mul_impl!(Mat6, u8, Mat6MulRhs, m11, m12, m13, m14, m15, m16, m21, m22, m23, m24, m25, m26, m31, m32, m33, m34, m35, m36, m41, m42, m43, m44, m45, m46, m51, m52, m53, m54, m55, m56, m61, m62, m63, m64, m65, m66) -scalar_mul_impl!(Mat6, float, Mat6MulRhs, m11, m12, m13, m14, m15, m16, m21, m22, m23, m24, m25, m26, - m31, m32, m33, m34, m35, m36, m41, m42, m43, m44, m45, m46, m51, m52, m53, m54, m55, m56, - m61, m62, m63, m64, m65, m66) scalar_mul_impl!(Mat6, uint, Mat6MulRhs, m11, m12, m13, m14, m15, m16, m21, m22, m23, m24, m25, m26, m31, m32, m33, m34, m35, m36, m41, m42, m43, m44, m45, m46, m51, m52, m53, m54, m55, m56, m61, m62, m63, m64, m65, m66) @@ -824,9 +793,6 @@ scalar_div_impl!(Mat6, u16, Mat6DivRhs, m11, m12, m13, m14, m15, m16, m21, m22, scalar_div_impl!(Mat6, u8, Mat6DivRhs, m11, m12, m13, m14, m15, m16, m21, m22, m23, m24, m25, m26, m31, m32, m33, m34, m35, m36, m41, m42, m43, m44, m45, m46, m51, m52, m53, m54, m55, m56, m61, m62, m63, m64, m65, m66) -scalar_div_impl!(Mat6, float, Mat6DivRhs, m11, m12, m13, m14, m15, m16, m21, m22, m23, m24, m25, m26, - m31, m32, m33, m34, m35, m36, m41, m42, m43, m44, m45, m46, m51, m52, m53, m54, m55, m56, - m61, m62, m63, m64, m65, m66) scalar_div_impl!(Mat6, uint, Mat6DivRhs, m11, m12, m13, m14, m15, m16, m21, m22, m23, m24, m25, m26, m31, m32, m33, m34, m35, m36, m41, m42, m43, m44, m45, m46, m51, m52, m53, m54, m55, m56, m61, m62, m63, m64, m65, m66) @@ -864,9 +830,6 @@ scalar_add_impl!(Mat6, u16, Mat6AddRhs, m11, m12, m13, m14, m15, m16, m21, m22, scalar_add_impl!(Mat6, u8, Mat6AddRhs, m11, m12, m13, m14, m15, m16, m21, m22, m23, m24, m25, m26, m31, m32, m33, m34, m35, m36, m41, m42, m43, m44, m45, m46, m51, m52, m53, m54, m55, m56, m61, m62, m63, m64, m65, m66) -scalar_add_impl!(Mat6, float, Mat6AddRhs, m11, m12, m13, m14, m15, m16, m21, m22, m23, m24, m25, m26, - m31, m32, m33, m34, m35, m36, m41, m42, m43, m44, m45, m46, m51, m52, m53, m54, m55, m56, - m61, m62, m63, m64, m65, m66) scalar_add_impl!(Mat6, uint, Mat6AddRhs, m11, m12, m13, m14, m15, m16, m21, m22, m23, m24, m25, m26, m31, m32, m33, m34, m35, m36, m41, m42, m43, m44, m45, m46, m51, m52, m53, m54, m55, m56, m61, m62, m63, m64, m65, m66) @@ -904,9 +867,6 @@ scalar_sub_impl!(Mat6, u16, Mat6SubRhs, m11, m12, m13, m14, m15, m16, m21, m22, scalar_sub_impl!(Mat6, u8, Mat6SubRhs, m11, m12, m13, m14, m15, m16, m21, m22, m23, m24, m25, m26, m31, m32, m33, m34, m35, m36, m41, m42, m43, m44, m45, m46, m51, m52, m53, m54, m55, m56, m61, m62, m63, m64, m65, m66) -scalar_sub_impl!(Mat6, float, Mat6SubRhs, m11, m12, m13, m14, m15, m16, m21, m22, m23, m24, m25, m26, - m31, m32, m33, m34, m35, m36, m41, m42, m43, m44, m45, m46, m51, m52, m53, m54, m55, m56, - m61, m62, m63, m64, m65, m66) scalar_sub_impl!(Mat6, uint, Mat6SubRhs, m11, m12, m13, m14, m15, m16, m21, m22, m23, m24, m25, m26, m31, m32, m33, m34, m35, m36, m41, m42, m43, m44, m45, m46, m51, m52, m53, m54, m55, m56, m61, m62, m63, m64, m65, m66) diff --git a/src/traits/operations.rs b/src/traits/operations.rs index e26f2d49..93185e98 100644 --- a/src/traits/operations.rs +++ b/src/traits/operations.rs @@ -17,9 +17,7 @@ pub trait Inv { fn inplace_inverse(&mut self) -> bool; } -/// Trait of objects which can be transposed. Note that, for the moment, this -/// does not allow the implementation by non-square matrix (or anything which -/// is not stable by transposition). +/// Trait of objects which can be transposed. pub trait Transpose { /// Computes the transpose of a matrix. fn transposed(&self) -> Self; diff --git a/src/types.rs b/src/types.rs index 99ca97fa..80aa50c1 100644 --- a/src/types.rs +++ b/src/types.rs @@ -10,213 +10,153 @@ use adaptors::transform::Transform; pub type Vec1f64 = Vec1; /// 1-dimensional `f32`-valued vector. pub type Vec1f32 = Vec1; -/// 1-dimensional `float`-valued vector. -pub type Vec1flt = Vec1; /// 1-dimensional `f64`-valued matrix. pub type Mat1f64 = Mat1; /// 1-dimensional `f32`-valued matrix. pub type Mat1f32 = Mat1; -/// 1-dimensional `float`-valued matrix. -pub type Mat1flt = Mat1; // /// 1-dimensional `f64`-valued rotation matrix. // pub type Rot1f64 = Rotmat>; // /// 1-dimensional `f32`-valued rotation matrix. // pub type Rot1f32 = Rotmat>; -// /// 1-dimensional `float`-valued rotation matrix. -// pub type Rot1flt = Rotmat>; // // /// 1-dimensional `f64`-valued isometric transform. // pub type Iso1f64 = Transform; // /// 1-dimensional `f32`-valued isometric transform. // pub type Iso1f32 = Transform; -// /// 1-dimensional `float`-valued isometric transform. -// pub type Iso1flt = Transform; /// 1-dimensional `f64`-valued general transform. pub type Aff1f64 = Transform; /// 1-dimensional `f32`-valued general transform. pub type Aff1f32 = Transform; -/// 1-dimensional `float`-valued general transform. -pub type Aff1flt = Transform; // 2D /// 2-dimensional `f64`-valued vector. pub type Vec2f64 = Vec2; /// 2-dimensional `f32`-valued vector. pub type Vec2f32 = Vec2; -/// 2-dimensional `float`-valued vector. -pub type Vec2flt = Vec2; /// 2-dimensional `f64`-valued matrix. pub type Mat2f64 = Mat2; /// 2-dimensional `f32`-valued matrix. pub type Mat2f32 = Mat2; -/// 2-dimensional `float`-valued matrix. -pub type Mat2flt = Mat2; /// 2-dimensional `f64`-valued rotation matrix. pub type Rot2f64 = Rotmat>; /// 2-dimensional `f32`-valued rotation matrix. pub type Rot2f32 = Rotmat>; -/// 2-dimensional `float`-valued rotation matrix. -pub type Rot2flt = Rotmat>; /// 2-dimensional `f64`-valued isometric transform. pub type Iso2f64 = Transform; /// 2-dimensional `f32`-valued isometric transform. pub type Iso2f32 = Transform; -/// 2-dimensional `float`-valued isometric transform. -pub type Iso2flt = Transform; /// 2-dimensional `f64`-valued general transform. pub type Aff2f64 = Transform; /// 2-dimensional `f32`-valued general transform. pub type Aff2f32 = Transform; -/// 2-dimensional `float`-valued general transform. -pub type Aff2flt = Transform; // 3D /// 3-dimensional `f64`-valued vector. pub type Vec3f64 = Vec3; /// 3-dimensional `f32`-valued vector. pub type Vec3f32 = Vec3; -/// 3-dimensional `float`-valued vector. -pub type Vec3flt = Vec3; /// 3-dimensional `f64`-valued matrix. pub type Mat3f64 = Mat3; /// 3-dimensional `f32`-valued matrix. pub type Mat3f32 = Mat3; -/// 3-dimensional `float`-valued matrix. -pub type Mat3flt = Mat3; /// 3-dimensional `f64`-valued rotation matrix. pub type Rot3f64 = Rotmat>; /// 3-dimensional `f32`-valued rotation matrix. pub type Rot3f32 = Rotmat>; -/// 3-dimensional `float`-valued rotation matrix. -pub type Rot3flt = Rotmat>; /// 3-dimensional `f64`-valued isometric transform. pub type Iso3f64 = Transform; /// 3-dimensional `f32`-valued isometric transform. pub type Iso3f32 = Transform; -/// 3-dimensional `float`-valued isometric transform. -pub type Iso3flt = Transform; /// 3-dimensional `f64`-valued general transform. pub type Aff3f64 = Transform; /// 3-dimensional `f32`-valued general transform. pub type Aff3f32 = Transform; -/// 3-dimensional `float`-valued general transform. -pub type Aff3flt = Transform; // 4D /// 4-dimensional `f64`-valued vector. pub type Vec4f64 = Vec4; /// 4-dimensional `f32`-valued vector. pub type Vec4f32 = Vec4; -/// 4-dimensional `float`-valued vector. -pub type Vec4flt = Vec4; /// 4-dimensional `f64`-valued matrix. pub type Mat4f64 = Mat4; /// 4-dimensional `f32`-valued matrix. pub type Mat4f32 = Mat4; -/// 4-dimensional `float`-valued matrix. -pub type Mat4flt = Mat4; // /// 4-dimensional `f64`-valued rotation matrix. // pub type Rot4f64 = Rotmat>; // /// 4-dimensional `f32`-valued rotation matrix. // pub type Rot4f32 = Rotmat>; -// /// 4-dimensional `float`-valued rotation matrix. -// pub type Rot4flt = Rotmat>; // // /// 4-dimensional `f64`-valued isometric transform. // pub type Iso4f64 = Transform; // /// 4-dimensional `f32`-valued isometric transform. // pub type Iso4f32 = Transform; -// /// 4-dimensional `float`-valued isometric transform. -// pub type Iso4flt = Transform; /// 4-dimensional `f64`-valued general transform. pub type Aff4f64 = Transform; /// 4-dimensional `f32`-valued general transform. pub type Aff4f32 = Transform; -/// 4-dimensional `float`-valued general transform. -pub type Aff4flt = Transform; // 5D /// 5-dimensional `f64`-valued vector. pub type Vec5f64 = Vec5; /// 5-dimensional `f32`-valued vector. pub type Vec5f32 = Vec5; -/// 5-dimensional `float`-valued vector. -pub type Vec5flt = Vec5; /// 5-dimensional `f64`-valued matrix. pub type Mat5f64 = Mat5; /// 5-dimensional `f32`-valued matrix. pub type Mat5f32 = Mat5; -/// 5-dimensional `float`-valued matrix. -pub type Mat5flt = Mat5; // /// 5-dimensional `f64`-valued rotation matrix. // pub type Rot5f64 = Rotmat>; // /// 5-dimensional `f32`-valued rotation matrix. // pub type Rot5f32 = Rotmat>; -// /// 5-dimensional `float`-valued rotation matrix. -// pub type Rot5flt = Rotmat>; // // /// 5-dimensional `f64`-valued isometric transform. // pub type Iso5f64 = Transform; // /// 5-dimensional `f32`-valued isometric transform. // pub type Iso5f32 = Transform; -// /// 5-dimensional `float`-valued isometric transform. -// pub type Iso5flt = Transform; /// 5-dimensional `f64`-valued general transform. pub type Aff5f64 = Transform; /// 5-dimensional `f32`-valued general transform. pub type Aff5f32 = Transform; -/// 5-dimensional `float`-valued general transform. -pub type Aff5flt = Transform; // 6D /// 6-dimensional `f64`-valued vector. pub type Vec6f64 = Vec6; /// 6-dimensional `f32`-valued vector. pub type Vec6f32 = Vec6; -/// 6-dimensional `float`-valued vector. -pub type Vec6flt = Vec6; /// 6-dimensional `f64`-valued matrix. pub type Mat6f64 = Mat6; /// 6-dimensional `f32`-valued matrix. pub type Mat6f32 = Mat6; -/// 6-dimensional `float`-valued matrix. -pub type Mat6flt = Mat6; // /// 6-dimensional `f64`-valued rotation matrix. // pub type Rot6f64 = Rotmat>; // /// 6-dimensional `f32`-valued rotation matrix. // pub type Rot6f32 = Rotmat>; -// /// 6-dimensional `float`-valued rotation matrix. -// pub type Rot6flt = Rotmat>; // // /// 6-dimensional `f64`-valued isometric transform. // pub type Iso6f64 = Transform; // /// 6-dimensional `f32`-valued isometric transform. // pub type Iso6f32 = Transform; -// /// 6-dimensional `float`-valued isometric transform. -// pub type Iso6flt = Transform; /// 6-dimensional `f64`-valued general transform. pub type Aff6f64 = Transform; /// 6-dimensional `f32`-valued general transform. pub type Aff6f32 = Transform; -/// 6-dimensional `float`-valued general transform. -pub type Aff6flt = Transform; diff --git a/src/vec.rs b/src/vec.rs index 1d82357a..78fcb2ea 100644 --- a/src/vec.rs +++ b/src/vec.rs @@ -67,7 +67,6 @@ scalar_mul_impl!(Vec1, i64, Vec1MulRhs, x) scalar_mul_impl!(Vec1, i32, Vec1MulRhs, x) scalar_mul_impl!(Vec1, i16, Vec1MulRhs, x) scalar_mul_impl!(Vec1, i8, Vec1MulRhs, x) -scalar_mul_impl!(Vec1, float, Vec1MulRhs, x) scalar_mul_impl!(Vec1, uint, Vec1MulRhs, x) scalar_mul_impl!(Vec1, int, Vec1MulRhs, x) scalar_div_impl!(Vec1, f64, Vec1DivRhs, x) @@ -80,7 +79,6 @@ scalar_div_impl!(Vec1, i64, Vec1DivRhs, x) scalar_div_impl!(Vec1, i32, Vec1DivRhs, x) scalar_div_impl!(Vec1, i16, Vec1DivRhs, x) scalar_div_impl!(Vec1, i8, Vec1DivRhs, x) -scalar_div_impl!(Vec1, float, Vec1DivRhs, x) scalar_div_impl!(Vec1, uint, Vec1DivRhs, x) scalar_div_impl!(Vec1, int, Vec1DivRhs, x) scalar_add_impl!(Vec1, f64, Vec1AddRhs, x) @@ -93,7 +91,6 @@ scalar_add_impl!(Vec1, i64, Vec1AddRhs, x) scalar_add_impl!(Vec1, i32, Vec1AddRhs, x) scalar_add_impl!(Vec1, i16, Vec1AddRhs, x) scalar_add_impl!(Vec1, i8, Vec1AddRhs, x) -scalar_add_impl!(Vec1, float, Vec1AddRhs, x) scalar_add_impl!(Vec1, uint, Vec1AddRhs, x) scalar_add_impl!(Vec1, int, Vec1AddRhs, x) scalar_sub_impl!(Vec1, f64, Vec1SubRhs, x) @@ -106,7 +103,6 @@ scalar_sub_impl!(Vec1, i64, Vec1SubRhs, x) scalar_sub_impl!(Vec1, i32, Vec1SubRhs, x) scalar_sub_impl!(Vec1, i16, Vec1SubRhs, x) scalar_sub_impl!(Vec1, i8, Vec1SubRhs, x) -scalar_sub_impl!(Vec1, float, Vec1SubRhs, x) scalar_sub_impl!(Vec1, uint, Vec1SubRhs, x) scalar_sub_impl!(Vec1, int, Vec1SubRhs, x) translation_impl!(Vec1) @@ -166,7 +162,6 @@ scalar_mul_impl!(Vec2, i64, Vec2MulRhs, x, y) scalar_mul_impl!(Vec2, i32, Vec2MulRhs, x, y) scalar_mul_impl!(Vec2, i16, Vec2MulRhs, x, y) scalar_mul_impl!(Vec2, i8, Vec2MulRhs, x, y) -scalar_mul_impl!(Vec2, float, Vec2MulRhs, x, y) scalar_mul_impl!(Vec2, uint, Vec2MulRhs, x, y) scalar_mul_impl!(Vec2, int, Vec2MulRhs, x, y) scalar_div_impl!(Vec2, f64, Vec2DivRhs, x, y) @@ -179,7 +174,6 @@ scalar_div_impl!(Vec2, i64, Vec2DivRhs, x, y) scalar_div_impl!(Vec2, i32, Vec2DivRhs, x, y) scalar_div_impl!(Vec2, i16, Vec2DivRhs, x, y) scalar_div_impl!(Vec2, i8, Vec2DivRhs, x, y) -scalar_div_impl!(Vec2, float, Vec2DivRhs, x, y) scalar_div_impl!(Vec2, uint, Vec2DivRhs, x, y) scalar_div_impl!(Vec2, int, Vec2DivRhs, x, y) scalar_add_impl!(Vec2, f64, Vec2AddRhs, x, y) @@ -192,7 +186,6 @@ scalar_add_impl!(Vec2, i64, Vec2AddRhs, x, y) scalar_add_impl!(Vec2, i32, Vec2AddRhs, x, y) scalar_add_impl!(Vec2, i16, Vec2AddRhs, x, y) scalar_add_impl!(Vec2, i8, Vec2AddRhs, x, y) -scalar_add_impl!(Vec2, float, Vec2AddRhs, x, y) scalar_add_impl!(Vec2, uint, Vec2AddRhs, x, y) scalar_add_impl!(Vec2, int, Vec2AddRhs, x, y) scalar_sub_impl!(Vec2, f64, Vec2SubRhs, x, y) @@ -205,7 +198,6 @@ scalar_sub_impl!(Vec2, i64, Vec2SubRhs, x, y) scalar_sub_impl!(Vec2, i32, Vec2SubRhs, x, y) scalar_sub_impl!(Vec2, i16, Vec2SubRhs, x, y) scalar_sub_impl!(Vec2, i8, Vec2SubRhs, x, y) -scalar_sub_impl!(Vec2, float, Vec2SubRhs, x, y) scalar_sub_impl!(Vec2, uint, Vec2SubRhs, x, y) scalar_sub_impl!(Vec2, int, Vec2SubRhs, x, y) translation_impl!(Vec2) @@ -267,7 +259,6 @@ scalar_mul_impl!(Vec3, i64, Vec3MulRhs, x, y, z) scalar_mul_impl!(Vec3, i32, Vec3MulRhs, x, y, z) scalar_mul_impl!(Vec3, i16, Vec3MulRhs, x, y, z) scalar_mul_impl!(Vec3, i8, Vec3MulRhs, x, y, z) -scalar_mul_impl!(Vec3, float, Vec3MulRhs, x, y, z) scalar_mul_impl!(Vec3, uint, Vec3MulRhs, x, y, z) scalar_mul_impl!(Vec3, int, Vec3MulRhs, x, y, z) @@ -281,7 +272,6 @@ scalar_div_impl!(Vec3, i64, Vec3DivRhs, x, y, z) scalar_div_impl!(Vec3, i32, Vec3DivRhs, x, y, z) scalar_div_impl!(Vec3, i16, Vec3DivRhs, x, y, z) scalar_div_impl!(Vec3, i8, Vec3DivRhs, x, y, z) -scalar_div_impl!(Vec3, float, Vec3DivRhs, x, y, z) scalar_div_impl!(Vec3, uint, Vec3DivRhs, x, y, z) scalar_div_impl!(Vec3, int, Vec3DivRhs, x, y, z) @@ -295,7 +285,6 @@ scalar_add_impl!(Vec3, i64, Vec3AddRhs, x, y, z) scalar_add_impl!(Vec3, i32, Vec3AddRhs, x, y, z) scalar_add_impl!(Vec3, i16, Vec3AddRhs, x, y, z) scalar_add_impl!(Vec3, i8, Vec3AddRhs, x, y, z) -scalar_add_impl!(Vec3, float, Vec3AddRhs, x, y, z) scalar_add_impl!(Vec3, uint, Vec3AddRhs, x, y, z) scalar_add_impl!(Vec3, int, Vec3AddRhs, x, y, z) @@ -309,7 +298,6 @@ scalar_sub_impl!(Vec3, i64, Vec3SubRhs, x, y, z) scalar_sub_impl!(Vec3, i32, Vec3SubRhs, x, y, z) scalar_sub_impl!(Vec3, i16, Vec3SubRhs, x, y, z) scalar_sub_impl!(Vec3, i8, Vec3SubRhs, x, y, z) -scalar_sub_impl!(Vec3, float, Vec3SubRhs, x, y, z) scalar_sub_impl!(Vec3, uint, Vec3SubRhs, x, y, z) scalar_sub_impl!(Vec3, int, Vec3SubRhs, x, y, z) translation_impl!(Vec3) @@ -380,7 +368,6 @@ scalar_mul_impl!(PVec3, i64, PVec3MulRhs, x, y, z) scalar_mul_impl!(PVec3, i32, PVec3MulRhs, x, y, z) scalar_mul_impl!(PVec3, i16, PVec3MulRhs, x, y, z) scalar_mul_impl!(PVec3, i8, PVec3MulRhs, x, y, z) -scalar_mul_impl!(PVec3, float, PVec3MulRhs, x, y, z) scalar_mul_impl!(PVec3, uint, PVec3MulRhs, x, y, z) scalar_mul_impl!(PVec3, int, PVec3MulRhs, x, y, z) scalar_div_impl!(PVec3, f64, PVec3DivRhs, x, y, z) @@ -393,7 +380,6 @@ scalar_div_impl!(PVec3, i64, PVec3DivRhs, x, y, z) scalar_div_impl!(PVec3, i32, PVec3DivRhs, x, y, z) scalar_div_impl!(PVec3, i16, PVec3DivRhs, x, y, z) scalar_div_impl!(PVec3, i8, PVec3DivRhs, x, y, z) -scalar_div_impl!(PVec3, float, PVec3DivRhs, x, y, z) scalar_div_impl!(PVec3, uint, PVec3DivRhs, x, y, z) scalar_div_impl!(PVec3, int, PVec3DivRhs, x, y, z) scalar_add_impl!(PVec3, f64, PVec3AddRhs, x, y, z) @@ -406,7 +392,6 @@ scalar_add_impl!(PVec3, i64, PVec3AddRhs, x, y, z) scalar_add_impl!(PVec3, i32, PVec3AddRhs, x, y, z) scalar_add_impl!(PVec3, i16, PVec3AddRhs, x, y, z) scalar_add_impl!(PVec3, i8, PVec3AddRhs, x, y, z) -scalar_add_impl!(PVec3, float, PVec3AddRhs, x, y, z) scalar_add_impl!(PVec3, uint, PVec3AddRhs, x, y, z) scalar_add_impl!(PVec3, int, PVec3AddRhs, x, y, z) scalar_sub_impl!(PVec3, f64, PVec3SubRhs, x, y, z) @@ -419,7 +404,6 @@ scalar_sub_impl!(PVec3, i64, PVec3SubRhs, x, y, z) scalar_sub_impl!(PVec3, i32, PVec3SubRhs, x, y, z) scalar_sub_impl!(PVec3, i16, PVec3SubRhs, x, y, z) scalar_sub_impl!(PVec3, i8, PVec3SubRhs, x, y, z) -scalar_sub_impl!(PVec3, float, PVec3SubRhs, x, y, z) scalar_sub_impl!(PVec3, uint, PVec3SubRhs, x, y, z) scalar_sub_impl!(PVec3, int, PVec3SubRhs, x, y, z) translation_impl!(PVec3) @@ -485,7 +469,6 @@ scalar_mul_impl!(Vec4, i64, Vec4MulRhs, x, y, z, w) scalar_mul_impl!(Vec4, i32, Vec4MulRhs, x, y, z, w) scalar_mul_impl!(Vec4, i16, Vec4MulRhs, x, y, z, w) scalar_mul_impl!(Vec4, i8, Vec4MulRhs, x, y, z, w) -scalar_mul_impl!(Vec4, float, Vec4MulRhs, x, y, z, w) scalar_mul_impl!(Vec4, uint, Vec4MulRhs, x, y, z, w) scalar_mul_impl!(Vec4, int, Vec4MulRhs, x, y, z, w) scalar_div_impl!(Vec4, f64, Vec4DivRhs, x, y, z, w) @@ -498,7 +481,6 @@ scalar_div_impl!(Vec4, i64, Vec4DivRhs, x, y, z, w) scalar_div_impl!(Vec4, i32, Vec4DivRhs, x, y, z, w) scalar_div_impl!(Vec4, i16, Vec4DivRhs, x, y, z, w) scalar_div_impl!(Vec4, i8, Vec4DivRhs, x, y, z, w) -scalar_div_impl!(Vec4, float, Vec4DivRhs, x, y, z, w) scalar_div_impl!(Vec4, uint, Vec4DivRhs, x, y, z, w) scalar_div_impl!(Vec4, int, Vec4DivRhs, x, y, z, w) scalar_add_impl!(Vec4, f64, Vec4AddRhs, x, y, z, w) @@ -511,7 +493,6 @@ scalar_add_impl!(Vec4, i64, Vec4AddRhs, x, y, z, w) scalar_add_impl!(Vec4, i32, Vec4AddRhs, x, y, z, w) scalar_add_impl!(Vec4, i16, Vec4AddRhs, x, y, z, w) scalar_add_impl!(Vec4, i8, Vec4AddRhs, x, y, z, w) -scalar_add_impl!(Vec4, float, Vec4AddRhs, x, y, z, w) scalar_add_impl!(Vec4, uint, Vec4AddRhs, x, y, z, w) scalar_add_impl!(Vec4, int, Vec4AddRhs, x, y, z, w) scalar_sub_impl!(Vec4, f64, Vec4SubRhs, x, y, z, w) @@ -524,7 +505,6 @@ scalar_sub_impl!(Vec4, i64, Vec4SubRhs, x, y, z, w) scalar_sub_impl!(Vec4, i32, Vec4SubRhs, x, y, z, w) scalar_sub_impl!(Vec4, i16, Vec4SubRhs, x, y, z, w) scalar_sub_impl!(Vec4, i8, Vec4SubRhs, x, y, z, w) -scalar_sub_impl!(Vec4, float, Vec4SubRhs, x, y, z, w) scalar_sub_impl!(Vec4, uint, Vec4SubRhs, x, y, z, w) scalar_sub_impl!(Vec4, int, Vec4SubRhs, x, y, z, w) translation_impl!(Vec4) @@ -590,7 +570,6 @@ scalar_mul_impl!(Vec5, i64, Vec5MulRhs, x, y, z, w, a) scalar_mul_impl!(Vec5, i32, Vec5MulRhs, x, y, z, w, a) scalar_mul_impl!(Vec5, i16, Vec5MulRhs, x, y, z, w, a) scalar_mul_impl!(Vec5, i8, Vec5MulRhs, x, y, z, w, a) -scalar_mul_impl!(Vec5, float, Vec5MulRhs, x, y, z, w, a) scalar_mul_impl!(Vec5, uint, Vec5MulRhs, x, y, z, w, a) scalar_mul_impl!(Vec5, int, Vec5MulRhs, x, y, z, w, a) scalar_div_impl!(Vec5, f64, Vec5DivRhs, x, y, z, w, a) @@ -603,7 +582,6 @@ scalar_div_impl!(Vec5, i64, Vec5DivRhs, x, y, z, w, a) scalar_div_impl!(Vec5, i32, Vec5DivRhs, x, y, z, w, a) scalar_div_impl!(Vec5, i16, Vec5DivRhs, x, y, z, w, a) scalar_div_impl!(Vec5, i8, Vec5DivRhs, x, y, z, w, a) -scalar_div_impl!(Vec5, float, Vec5DivRhs, x, y, z, w, a) scalar_div_impl!(Vec5, uint, Vec5DivRhs, x, y, z, w, a) scalar_div_impl!(Vec5, int, Vec5DivRhs, x, y, z, w, a) scalar_add_impl!(Vec5, f64, Vec5AddRhs, x, y, z, w, a) @@ -616,7 +594,6 @@ scalar_add_impl!(Vec5, i64, Vec5AddRhs, x, y, z, w, a) scalar_add_impl!(Vec5, i32, Vec5AddRhs, x, y, z, w, a) scalar_add_impl!(Vec5, i16, Vec5AddRhs, x, y, z, w, a) scalar_add_impl!(Vec5, i8, Vec5AddRhs, x, y, z, w, a) -scalar_add_impl!(Vec5, float, Vec5AddRhs, x, y, z, w, a) scalar_add_impl!(Vec5, uint, Vec5AddRhs, x, y, z, w, a) scalar_add_impl!(Vec5, int, Vec5AddRhs, x, y, z, w, a) scalar_sub_impl!(Vec5, f64, Vec5SubRhs, x, y, z, w, a) @@ -629,7 +606,6 @@ scalar_sub_impl!(Vec5, i64, Vec5SubRhs, x, y, z, w, a) scalar_sub_impl!(Vec5, i32, Vec5SubRhs, x, y, z, w, a) scalar_sub_impl!(Vec5, i16, Vec5SubRhs, x, y, z, w, a) scalar_sub_impl!(Vec5, i8, Vec5SubRhs, x, y, z, w, a) -scalar_sub_impl!(Vec5, float, Vec5SubRhs, x, y, z, w, a) scalar_sub_impl!(Vec5, uint, Vec5SubRhs, x, y, z, w, a) scalar_sub_impl!(Vec5, int, Vec5SubRhs, x, y, z, w, a) translation_impl!(Vec5) @@ -697,7 +673,6 @@ scalar_mul_impl!(Vec6, i64, Vec6MulRhs, x, y, z, w, a, b) scalar_mul_impl!(Vec6, i32, Vec6MulRhs, x, y, z, w, a, b) scalar_mul_impl!(Vec6, i16, Vec6MulRhs, x, y, z, w, a, b) scalar_mul_impl!(Vec6, i8, Vec6MulRhs, x, y, z, w, a, b) -scalar_mul_impl!(Vec6, float, Vec6MulRhs, x, y, z, w, a, b) scalar_mul_impl!(Vec6, uint, Vec6MulRhs, x, y, z, w, a, b) scalar_mul_impl!(Vec6, int, Vec6MulRhs, x, y, z, w, a, b) scalar_div_impl!(Vec6, f64, Vec6DivRhs, x, y, z, w, a, b) @@ -710,7 +685,6 @@ scalar_div_impl!(Vec6, i64, Vec6DivRhs, x, y, z, w, a, b) scalar_div_impl!(Vec6, i32, Vec6DivRhs, x, y, z, w, a, b) scalar_div_impl!(Vec6, i16, Vec6DivRhs, x, y, z, w, a, b) scalar_div_impl!(Vec6, i8, Vec6DivRhs, x, y, z, w, a, b) -scalar_div_impl!(Vec6, float, Vec6DivRhs, x, y, z, w, a, b) scalar_div_impl!(Vec6, uint, Vec6DivRhs, x, y, z, w, a, b) scalar_div_impl!(Vec6, int, Vec6DivRhs, x, y, z, w, a, b) scalar_add_impl!(Vec6, f64, Vec6AddRhs, x, y, z, w, a, b) @@ -723,7 +697,6 @@ scalar_add_impl!(Vec6, i64, Vec6AddRhs, x, y, z, w, a, b) scalar_add_impl!(Vec6, i32, Vec6AddRhs, x, y, z, w, a, b) scalar_add_impl!(Vec6, i16, Vec6AddRhs, x, y, z, w, a, b) scalar_add_impl!(Vec6, i8, Vec6AddRhs, x, y, z, w, a, b) -scalar_add_impl!(Vec6, float, Vec6AddRhs, x, y, z, w, a, b) scalar_add_impl!(Vec6, uint, Vec6AddRhs, x, y, z, w, a, b) scalar_add_impl!(Vec6, int, Vec6AddRhs, x, y, z, w, a, b) scalar_sub_impl!(Vec6, f64, Vec6SubRhs, x, y, z, w, a, b) @@ -736,7 +709,6 @@ scalar_sub_impl!(Vec6, i64, Vec6SubRhs, x, y, z, w, a, b) scalar_sub_impl!(Vec6, i32, Vec6SubRhs, x, y, z, w, a, b) scalar_sub_impl!(Vec6, i16, Vec6SubRhs, x, y, z, w, a, b) scalar_sub_impl!(Vec6, i8, Vec6SubRhs, x, y, z, w, a, b) -scalar_sub_impl!(Vec6, float, Vec6SubRhs, x, y, z, w, a, b) scalar_sub_impl!(Vec6, uint, Vec6SubRhs, x, y, z, w, a, b) scalar_sub_impl!(Vec6, int, Vec6SubRhs, x, y, z, w, a, b) translation_impl!(Vec6)