From c906578c697819949501f2c78468ca05d72a74d8 Mon Sep 17 00:00:00 2001 From: Brendan Zabarauskas Date: Tue, 2 Apr 2013 11:59:33 +1100 Subject: [PATCH] Remove NumCast type parameters The NumCast type parameter is no longer needed as it is a constraint of numeric::Number --- src/mat.rs | 24 ++++++++++++------------ src/projection.rs | 4 ++-- src/quat.rs | 6 +++--- src/vec.rs | 12 ++++++------ 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/mat.rs b/src/mat.rs index 12fe973..bd6575d 100644 --- a/src/mat.rs +++ b/src/mat.rs @@ -313,7 +313,7 @@ pub trait Matrix4: Matrix { #[deriving(Eq)] pub struct Mat2 { x: Vec2, y: Vec2 } -impl + Add + Sub + Mul + Div + Neg> Matrix> for Mat2 { +impl + Add + Sub + Mul + Div + Neg> Matrix> for Mat2 { #[inline(always)] fn col(&self, i: uint) -> Vec2 { self[i] } @@ -538,7 +538,7 @@ impl + Add + Sub + } } -impl + Add + Sub + Mul + Div + Neg> Matrix2> for Mat2 { +impl + Add + Sub + Mul + Div + Neg> Matrix2> for Mat2 { /** * Construct a 2 x 2 matrix * @@ -646,14 +646,14 @@ impl Index> for Mat2 { } } -impl + Add + Sub + Mul + Div + Neg> Neg> for Mat2 { +impl + Add + Sub + Mul + Div + Neg> Neg> for Mat2 { #[inline(always)] fn neg(&self) -> Mat2 { Matrix2::from_cols(-self[0], -self[1]) } } -impl> FuzzyEq for Mat2 { +impl> FuzzyEq for Mat2 { #[inline(always)] fn fuzzy_eq(&self, other: &Mat2) -> bool { self.fuzzy_eq_eps(other, &num::cast(FUZZY_EPSILON)) @@ -724,7 +724,7 @@ mat2_type!(Mat2f64) #[deriving(Eq)] pub struct Mat3 { x: Vec3, y: Vec3, z: Vec3 } -impl + Add + Sub + Mul + Div + Neg> Matrix> for Mat3 { +impl + Add + Sub + Mul + Div + Neg> Matrix> for Mat3 { #[inline(always)] fn col(&self, i: uint) -> Vec3 { self[i] } @@ -998,7 +998,7 @@ impl + Add + Sub + } } -impl + Add + Sub + Mul + Div + Neg> Matrix3> for Mat3 { +impl + Add + Sub + Mul + Div + Neg> Matrix3> for Mat3 { /** * Construct a 3 x 3 matrix * @@ -1232,14 +1232,14 @@ impl Index> for Mat3 { } } -impl + Add + Sub + Mul + Div + Neg> Neg> for Mat3 { +impl + Add + Sub + Mul + Div + Neg> Neg> for Mat3 { #[inline(always)] fn neg(&self) -> Mat3 { Matrix3::from_cols(-self[0], -self[1], -self[2]) } } -impl + Add + Sub + Mul + Div + Neg> FuzzyEq for Mat3 { +impl + Add + Sub + Mul + Div + Neg> FuzzyEq for Mat3 { #[inline(always)] fn fuzzy_eq(&self, other: &Mat3) -> bool { self.fuzzy_eq_eps(other, &num::cast(FUZZY_EPSILON)) @@ -1315,7 +1315,7 @@ mat3_type!(Mat3f64) #[deriving(Eq)] pub struct Mat4 { x: Vec4, y: Vec4, z: Vec4, w: Vec4 } -impl + Add + Sub + Mul + Div + Neg> Matrix> for Mat4 { +impl + Add + Sub + Mul + Div + Neg> Matrix> for Mat4 { #[inline(always)] fn col(&self, i: uint) -> Vec4 { self[i] } @@ -1688,7 +1688,7 @@ impl + Add + Sub + } } -impl + Add + Sub + Mul + Div + Neg> Matrix4> for Mat4 { +impl + Add + Sub + Mul + Div + Neg> Matrix4> for Mat4 { /** * Construct a 4 x 4 matrix * @@ -1755,7 +1755,7 @@ impl + Add + Sub + } } -impl + Add + Sub + Mul + Div + Neg> Neg> for Mat4 { +impl + Add + Sub + Mul + Div + Neg> Neg> for Mat4 { #[inline(always)] fn neg(&self) -> Mat4 { Matrix4::from_cols(-self[0], -self[1], -self[2], -self[3]) @@ -1769,7 +1769,7 @@ impl Index> for Mat4 { } } -impl> FuzzyEq for Mat4 { +impl> FuzzyEq for Mat4 { #[inline(always)] fn fuzzy_eq(&self, other: &Mat4) -> bool { self.fuzzy_eq_eps(other, &num::cast(FUZZY_EPSILON)) diff --git a/src/projection.rs b/src/projection.rs index c5803ba..a4ba05d 100644 --- a/src/projection.rs +++ b/src/projection.rs @@ -12,7 +12,7 @@ use mat::{Mat4, Matrix4}; * can be found [here](http://www.opengl.org/wiki/GluPerspective_code). */ #[inline(always)] -pub fn perspective + Add + Sub + Mul + Div + Neg>(fovy: T, aspectRatio: T, near: T, far: T) -> Mat4 { +pub fn perspective + Add + Sub + Mul + Div + Neg>(fovy: T, aspectRatio: T, near: T, far: T) -> Mat4 { let ymax = near * tan(radians(fovy)); let xmax = ymax * aspectRatio; @@ -26,7 +26,7 @@ pub fn perspective + Add * (http://www.opengl.org/sdk/docs/man2/xhtml/glFrustum.xml) function. */ #[inline(always)] -pub fn frustum + Add + Sub + Mul + Div + Neg>(left: T, right: T, bottom: T, top: T, near: T, far: T) -> Mat4 { +pub fn frustum + Add + Sub + Mul + Div + Neg>(left: T, right: T, bottom: T, top: T, near: T, far: T) -> Mat4 { let _0: T = num::cast(0); let _1: T = num::cast(1); let _2: T = num::cast(2); diff --git a/src/quat.rs b/src/quat.rs index a941f5c..46a04c9 100644 --- a/src/quat.rs +++ b/src/quat.rs @@ -33,7 +33,7 @@ use vec::{vec3, dvec3, Vec3f, Vec3f32, Vec3f64}; #[deriving(Eq)] pub struct Quat { s: T, v: Vec3 } -pub impl + Add + Sub + Mul + Div + Neg> Quat { +pub impl + Add + Sub + Mul + Div + Neg> Quat { /** * Construct the quaternion from one scalar component and three * imaginary components @@ -378,14 +378,14 @@ impl Index for Quat { } } -impl + Add + Sub + Mul + Div + Neg> Neg> for Quat { +impl + Add + Sub + Mul + Div + Neg> Neg> for Quat { #[inline(always)] fn neg(&self) -> Quat { Quat::new(-self[0], -self[1], -self[2], -self[3]) } } -impl> FuzzyEq for Quat { +impl> FuzzyEq for Quat { #[inline(always)] fn fuzzy_eq(&self, other: &Quat) -> bool { self.fuzzy_eq_eps(other, &num::cast(FUZZY_EPSILON)) diff --git a/src/vec.rs b/src/vec.rs index 46f9e9c..ec64337 100644 --- a/src/vec.rs +++ b/src/vec.rs @@ -683,7 +683,7 @@ impl ToHomogeneous> for Vec2 { } } -impl + Sub + Mul + Div + Neg> EuclideanVector for Vec2 { +impl + Sub + Mul + Div + Neg> EuclideanVector for Vec2 { #[inline(always)] fn length2(&self) -> T { self.dot(self) @@ -742,7 +742,7 @@ impl + Sub + Mul + Di } } -impl> FuzzyEq for Vec2 { +impl> FuzzyEq for Vec2 { #[inline(always)] fn fuzzy_eq(&self, other: &Vec2) -> bool { self.fuzzy_eq_eps(other, &num::cast(FUZZY_EPSILON)) @@ -1077,7 +1077,7 @@ impl + Sub + Mul + Div + } } -impl + Sub + Mul + Div + Neg> EuclideanVector for Vec3 { +impl + Sub + Mul + Div + Neg> EuclideanVector for Vec3 { #[inline(always)] fn length2(&self) -> T { self.dot(self) @@ -1136,7 +1136,7 @@ impl + Sub + Mul + Di } } -impl> FuzzyEq for Vec3 { +impl> FuzzyEq for Vec3 { #[inline(always)] fn fuzzy_eq(&self, other: &Vec3) -> bool { self.fuzzy_eq_eps(other, &num::cast(FUZZY_EPSILON)) @@ -1464,7 +1464,7 @@ impl NumericVector4 for Vec4 { } } -impl + Sub + Mul + Div + Neg> EuclideanVector for Vec4 { +impl + Sub + Mul + Div + Neg> EuclideanVector for Vec4 { #[inline(always)] fn length2(&self) -> T { self.dot(self) @@ -1523,7 +1523,7 @@ impl + Sub + Mul + Di } } -impl> FuzzyEq for Vec4 { +impl> FuzzyEq for Vec4 { #[inline(always)] fn fuzzy_eq(&self, other: &Vec4) -> bool { self.fuzzy_eq_eps(other, &num::cast(FUZZY_EPSILON))