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

Move methods operating on &mut self to a separate trait

Browse source
This commit is contained in:
Brendan Zabarauskas 2012-12-04 21:42:24 +10:00
parent 0b9af30b38
commit 6c14df7fda
1 changed files with 67 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
src/vec.rs
View file

@ -17,6 +17,13 @@ use num::kinds::Number;
pub trait Vector<T>: Dimensional<T>, ToPtr<T>, Eq, DefaultEq {
/// Construct the vector from a single value, copying it to each component
static pure fn from_value(value: T) -> self;
}
pub trait MutableVector<T>: Vector<T> {
/**
* Get a mutable reference to the component at `i`
*/
fn index_mut(&mut self, i: uint) -> &self/mut T;
/**
* Swap two components of the vector in place
@ -48,7 +55,7 @@ pub trait Vector4<T>: Vector<T> {
/**
* A vector with numeric components
*/
pub trait NumericVector<T>: Vector<T>, Neg<self>{
pub trait NumericVector<T>: Vector<T>, Neg<self> {
/**
* Returns a vector with each component set to one
*/
@ -74,6 +81,11 @@ pub trait NumericVector<T>: Vector<T>, Neg<self>{
*/
pure fn add_v(&self, other: &self) -> self;
/**
* Add the vector `other`
*/
// fn add_v_self(&mut self, other: &self);
/**
* Returns the difference between the vector and `other`
*/
@ -172,24 +184,6 @@ pub impl<T:Copy> Vec2<T>: Vector<T> {
static pure fn from_value(value: T) -> Vec2<T> {
Vec2::new(value, value)
}
#[inline(always)]
fn swap(&mut self, a: uint, b: uint) {
let addr_a =
match a {
0 => &mut self.x,
1 => &mut self.y,
_ => fail(fmt!("index out of bounds: expected an index from 0 to 1, but found %u", a))
};
let addr_b =
match b {
0 => &mut self.x,
1 => &mut self.y,
_ => fail(fmt!("index out of bounds: expected an index from 0 to 3, but found %u", b))
};
util::swap(addr_a, addr_b);
}
}
pub impl<T> Vec2<T>: Dimensional<T> {
@ -217,6 +211,23 @@ pub impl<T:Copy> Vec2<T>: ToPtr<T> {
}
}
}
pub impl<T:Copy> Vec2<T>: MutableVector<T> {
#[inline(always)]
fn index_mut(&mut self, i: uint) -> &self/mut T {
match i {
0 => &mut self.x,
1 => &mut self.y,
_ => fail(fmt!("index out of bounds: expected an index from 0 to 1, but found %u", i))
}
}
#[inline(always)]
fn swap(&mut self, a: uint, b: uint) {
util::swap(self.index_mut(a),
self.index_mut(b));
}
}
pub impl<T:Copy Number> Vec2<T>: NumericVector<T> {
#[inline(always)]
@ -353,26 +364,6 @@ pub impl<T:Copy> Vec3<T>: Vector<T> {
static pure fn from_value(value: T) -> Vec3<T> {
Vec3::new(value, value, value)
}
#[inline(always)]
fn swap(&mut self, a: uint, b: uint) {
let addr_a =
match a {
0 => &mut self.x,
1 => &mut self.y,
2 => &mut self.z,
_ => fail(fmt!("index out of bounds: expected an index from 0 to 2, but found %u", a))
};
let addr_b =
match b {
0 => &mut self.x,
1 => &mut self.y,
2 => &mut self.z,
_ => fail(fmt!("index out of bounds: expected an index from 0 to 2, but found %u", b))
};
util::swap(addr_a, addr_b);
}
}
pub impl<T> Vec3<T>: Dimensional<T> {
@ -401,6 +392,24 @@ pub impl<T:Copy> Vec3<T>: ToPtr<T> {
}
}
pub impl<T:Copy> Vec3<T>: MutableVector<T> {
#[inline(always)]
fn index_mut(&mut self, i: uint) -> &self/mut T {
match i {
0 => &mut self.x,
1 => &mut self.y,
2 => &mut self.z,
_ => fail(fmt!("index out of bounds: expected an index from 0 to 2, but found %u", i))
}
}
#[inline(always)]
fn swap(&mut self, a: uint, b: uint) {
util::swap(self.index_mut(a),
self.index_mut(b));
}
}
pub impl<T:Copy Number> Vec3<T>: NumericVector<T> {
#[inline(always)]
static pure fn identity() -> Vec3<T> {
@ -554,28 +563,6 @@ pub impl<T:Copy> Vec4<T>: Vector<T> {
static pure fn from_value(value: T) -> Vec4<T> {
Vec4::new(value, value, value, value)
}
#[inline(always)]
fn swap(&mut self, a: uint, b: uint) {
let addr_a =
match a {
0 => &mut self.x,
1 => &mut self.y,
2 => &mut self.z,
3 => &mut self.w,
_ => fail(fmt!("index out of bounds: expected an index from 0 to 3 but found %u", a))
};
let addr_b =
match b {
0 => &mut self.x,
1 => &mut self.y,
2 => &mut self.z,
3 => &mut self.w,
_ => fail(fmt!("index out of bounds: expected an index from 0 to 3 but found %u", b))
};
util::swap(addr_a, addr_b);
}
}
pub impl<T> Vec4<T>: Dimensional<T> {
@ -604,6 +591,25 @@ pub impl<T:Copy> Vec4<T>: ToPtr<T> {
}
}
pub impl<T:Copy> Vec4<T>: MutableVector<T> {
#[inline(always)]
fn index_mut(&mut self, i: uint) -> &self/mut T {
match i {
0 => &mut self.x,
1 => &mut self.y,
2 => &mut self.z,
3 => &mut self.w,
_ => fail(fmt!("index out of bounds: expected an index from 0 to 3, but found %u", i))
}
}
#[inline(always)]
fn swap(&mut self, a: uint, b: uint) {
util::swap(self.index_mut(a),
self.index_mut(b));
}
}
pub impl<T:Copy Number> Vec4<T>: NumericVector<T> {
#[inline(always)]
static pure fn identity() -> Vec4<T> {