hodasemi/cgmath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Clean up some function calls

Browse source
This commit is contained in:
Brendan Zabarauskas 2016-03-27 16:25:03 +11:00
parent c9155dd7d9
commit fb5228f14f
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/vector.rs
View file

@ -134,7 +134,7 @@ pub trait Vector: Copy + Clone where
} }
/// Dot product of two vectors. /// Dot product of two vectors.
#[inline] pub fn dot<V: Vector>(a: V, b: V) -> V::Scalar { a.dot(b) } #[inline] pub fn dot<V: Vector>(a: V, b: V) -> V::Scalar { V::dot(a, b) }
/// A 2-dimensional vector. /// A 2-dimensional vector.
/// ///
@ -487,7 +487,7 @@ pub trait EuclideanVector: Vector + Sized where
/// Returns `true` if the vector is perpendicular (at right angles) to the /// Returns `true` if the vector is perpendicular (at right angles) to the
/// other vector. /// other vector.
fn is_perpendicular(self, other: Self) -> bool { fn is_perpendicular(self, other: Self) -> bool {
self.dot(other).approx_eq(&Self::Scalar::zero()) Self::dot(self, other).approx_eq(&Self::Scalar::zero())
} }
/// Returns the squared magnitude of the vector. /// Returns the squared magnitude of the vector.
@ -497,14 +497,16 @@ pub trait EuclideanVector: Vector + Sized where
/// efficiently. /// efficiently.
#[inline] #[inline]
fn magnitude2(self) -> Self::Scalar { fn magnitude2(self) -> Self::Scalar {
self.dot(self) Self::dot(self, self)
} }
/// The distance from the tail to the tip of the vector. /// The distance from the tail to the tip of the vector.
#[inline] #[inline]
fn magnitude(self) -> Self::Scalar { fn magnitude(self) -> Self::Scalar {
// FIXME: Not sure why this annotation is needed use rust_num::Float;
<<Self as Vector>::Scalar as ::rust_num::Float>::sqrt(self.dot(self))
// FIXME: Not sure why we can't use method syntax for `sqrt` here...
Float::sqrt(self.magnitude2())
} }
/// The angle between the vector and `other`, in radians. /// The angle between the vector and `other`, in radians.
@ -536,21 +538,21 @@ pub trait EuclideanVector: Vector + Sized where
impl<S: BaseFloat> EuclideanVector for Vector2<S> { impl<S: BaseFloat> EuclideanVector for Vector2<S> {
#[inline] #[inline]
fn angle(self, other: Vector2<S>) -> Rad<S> { fn angle(self, other: Vector2<S>) -> Rad<S> {
Rad::atan2(self.perp_dot(other), self.dot(other)) Rad::atan2(Self::perp_dot(self, other), Self::dot(self, other))
} }
} }
impl<S: BaseFloat> EuclideanVector for Vector3<S> { impl<S: BaseFloat> EuclideanVector for Vector3<S> {
#[inline] #[inline]
fn angle(self, other: Vector3<S>) -> Rad<S> { fn angle(self, other: Vector3<S>) -> Rad<S> {
Rad::atan2(self.cross(other).magnitude(), self.dot(other)) Rad::atan2(self.cross(other).magnitude(), Self::dot(self, other))
} }
} }
impl<S: BaseFloat> EuclideanVector for Vector4<S> { impl<S: BaseFloat> EuclideanVector for Vector4<S> {
#[inline] #[inline]
fn angle(self, other: Vector4<S>) -> Rad<S> { fn angle(self, other: Vector4<S>) -> Rad<S> {
Rad::acos(self.dot(other) / (self.magnitude() * other.magnitude())) Rad::acos(Self::dot(self, other) / (self.magnitude() * other.magnitude()))
} }
} }