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

Implement min and max methods for vectors

Browse source
This commit is contained in:
Brendan Zabarauskas 2013-07-14 19:00:36 +10:00
parent 4008cf8121
commit d700a7b35f
2 changed files with 90 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/math/math.rs
View file

@ -50,10 +50,3 @@ pub trait Dimensioned<T,Slice> {
pub trait SwapComponents {
pub fn swap(&mut self, a: uint, b: uint);
}
pub trait ComponentWise<T> {
pub fn component_add(&self) -> T;
pub fn component_mul(&self) -> T;
pub fn component_min(&self) -> T;
pub fn component_max(&self) -> T;
}

90
src/math/vec.rs
View file

@ -78,6 +78,12 @@ pub trait OrdVec<T,Slice,BV>: Vec<T,Slice> {
pub fn ge_v(&self, other: &Self) -> BV;
pub fn gt_v(&self, other: &Self) -> BV;
pub fn min_t(&self, other: T) -> Self;
pub fn max_t(&self, other: T) -> Self;
pub fn min_v(&self, other: &Self) -> Self;
pub fn max_v(&self, other: &Self) -> Self;
pub fn comp_min(&self) -> T;
pub fn comp_max(&self) -> T;
}
@ -473,6 +479,30 @@ impl<T:Orderable> OrdVec<T,[T,..2],Vec2<bool>> for Vec2<T> {
*self.index(1) > *other.index(1))
}
#[inline]
pub fn min_t(&self, value: T) -> Vec2<T> {
Vec2::new(self.index(0).min(&value),
self.index(1).min(&value))
}
#[inline]
pub fn max_t(&self, value: T) -> Vec2<T> {
Vec2::new(self.index(0).max(&value),
self.index(1).max(&value))
}
#[inline]
pub fn min_v(&self, other: &Vec2<T>) -> Vec2<T> {
Vec2::new(self.index(0).min(other.index(0)),
self.index(1).min(other.index(1)))
}
#[inline]
pub fn max_v(&self, other: &Vec2<T>) -> Vec2<T> {
Vec2::new(self.index(0).max(other.index(0)),
self.index(1).max(other.index(1)))
}
/// Returns the smallest component of the vector.
#[inline]
pub fn comp_min(&self) -> T {
@ -1107,6 +1137,34 @@ impl<T:Orderable> OrdVec<T,[T,..3],Vec3<bool>> for Vec3<T> {
*self.index(2) > *other.index(2))
}
#[inline]
pub fn min_t(&self, value: T) -> Vec3<T> {
Vec3::new(self.index(0).min(&value),
self.index(1).min(&value),
self.index(2).min(&value))
}
#[inline]
pub fn max_t(&self, value: T) -> Vec3<T> {
Vec3::new(self.index(0).max(&value),
self.index(1).max(&value),
self.index(2).max(&value))
}
#[inline]
pub fn min_v(&self, other: &Vec3<T>) -> Vec3<T> {
Vec3::new(self.index(0).min(other.index(0)),
self.index(1).min(other.index(1)),
self.index(2).min(other.index(2)))
}
#[inline]
pub fn max_v(&self, other: &Vec3<T>) -> Vec3<T> {
Vec3::new(self.index(0).max(other.index(0)),
self.index(1).max(other.index(1)),
self.index(2).max(other.index(2)))
}
/// Returns the smallest component of the vector.
#[inline]
pub fn comp_min(&self) -> T {
@ -1771,6 +1829,38 @@ impl<T:Orderable> OrdVec<T,[T,..4],Vec4<bool>> for Vec4<T> {
*self.index(3) > *other.index(3))
}
#[inline]
pub fn min_t(&self, value: T) -> Vec4<T> {
Vec4::new(self.index(0).min(&value),
self.index(1).min(&value),
self.index(2).min(&value),
self.index(3).min(&value))
}
#[inline]
pub fn max_t(&self, value: T) -> Vec4<T> {
Vec4::new(self.index(0).max(&value),
self.index(1).max(&value),
self.index(2).max(&value),
self.index(3).max(&value))
}
#[inline]
pub fn min_v(&self, other: &Vec4<T>) -> Vec4<T> {
Vec4::new(self.index(0).min(other.index(0)),
self.index(1).min(other.index(1)),
self.index(2).min(other.index(2)),
self.index(3).min(other.index(3)))
}
#[inline]
pub fn max_v(&self, other: &Vec4<T>) -> Vec4<T> {
Vec4::new(self.index(0).max(other.index(0)),
self.index(1).max(other.index(1)),
self.index(2).max(other.index(2)),
self.index(3).max(other.index(3)))
}
/// Returns the smallest component of the vector.
#[inline]
pub fn comp_min(&self) -> T {