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

Rename Dimensioned and Swap traits

Browse source
This commit is contained in:
Brendan Zabarauskas 2013-07-14 13:22:45 +10:00
parent d5514fc982
commit 1810444a0a
12 changed files with 58 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/bounds/frustum.rs
View file

@ -27,7 +27,7 @@ pub struct Frustum<T> {
far: Plane3<T>,
}
impl_dimensional!(Frustum, Plane3<T>, 6)
impl_dimensioned!(Frustum, Plane3<T>, 6)
impl_approx!(Frustum {
left, right,
top, bottom,
@ -46,7 +46,7 @@ pub struct FrustumPoints<T> {
far_bottom_right: Point3<T>,
}
impl_dimensional!(FrustumPoints, Point3<T>, 8)
impl_dimensioned!(FrustumPoints, Point3<T>, 8)
impl_approx!(FrustumPoints {
near_top_left,
near_top_right,

18
src/color/channel.rs
View file

@ -77,11 +77,13 @@ pub trait FloatChannel: Float + Channel {
}
impl FloatChannel for f32 {
#[inline] pub fn normalize_channel(&self) -> f32 {
#[inline]
pub fn normalize_channel(&self) -> f32 {
self.clamp(&0.0, &1.0)
}
#[inline] pub fn normalize_degrees(&self) -> f32 {
#[inline]
pub fn normalize_degrees(&self) -> f32 {
if (*self) < 0.0 {
(*self + 360.0) % 360.0
} else {
@ -89,17 +91,20 @@ impl FloatChannel for f32 {
}
}
#[inline] pub fn invert_degrees(&self) -> f32 {
#[inline]
pub fn invert_degrees(&self) -> f32 {
(*self + 180.0).normalize_degrees()
}
}
impl FloatChannel for f64 {
#[inline] pub fn normalize_channel(&self) -> f64 {
#[inline]
pub fn normalize_channel(&self) -> f64 {
self.clamp(&0.0, &1.0)
}
#[inline] pub fn normalize_degrees(&self) -> f64 {
#[inline]
pub fn normalize_degrees(&self) -> f64 {
if (*self) < 0.0 {
(*self + 360.0) % 360.0
} else {
@ -107,7 +112,8 @@ impl FloatChannel for f64 {
}
}
#[inline] pub fn invert_degrees(&self) -> f64 {
#[inline]
pub fn invert_degrees(&self) -> f64 {
(*self + 180.0).normalize_degrees()
}
}

8
src/color/hsv.rs
View file

@ -25,10 +25,10 @@ use color::{RGB, ToRGB, RGBA, ToRGBA};
#[deriving(Clone, Eq)]
pub struct HSV<T> { h: T, s: T, v: T }
impl_dimensional!(HSV, T, 3)
impl_dimensioned!(HSV, T, 3)
impl_to_vec!(HSV, 3)
impl_as_vec!(HSV, 3)
impl_swap!(HSV)
impl_swap_components!(HSV)
impl_approx!(HSV { h, s, v })
impl<T:FloatChannel> HSV<T> {
@ -128,10 +128,10 @@ impl<T:Clone + FloatChannel> ToRGB for HSV<T> {
#[deriving(Clone, Eq)]
pub struct HSVA<T> { h: T, s: T, v: T, a: T }
impl_dimensional!(HSVA, T, 4)
impl_dimensioned!(HSVA, T, 4)
impl_to_vec!(HSVA, 4)
impl_as_vec!(HSVA, 4)
impl_swap!(HSVA)
impl_swap_components!(HSVA)
impl_approx!(HSVA { h, s, v, a })
impl<T:FloatChannel> HSVA<T> {

8
src/color/rgb.rs
View file

@ -25,10 +25,10 @@ use color::{HSV, ToHSV, HSVA, ToHSVA};
#[deriving(Clone, Eq)]
pub struct RGB<T> { r: T, g: T, b: T }
impl_dimensional!(RGB, T, 3)
impl_dimensioned!(RGB, T, 3)
impl_to_vec!(RGB, 3)
impl_as_vec!(RGB, 3)
impl_swap!(RGB)
impl_swap_components!(RGB)
impl_approx!(RGB { r, g, b })
impl<T:Channel> RGB<T> {
@ -125,10 +125,10 @@ impl<T:Clone + Channel> ToHSV for RGB<T> {
#[deriving(Clone, Eq)]
pub struct RGBA<T> { r: T, g: T, b: T, a: T }
impl_dimensional!(RGBA, T, 4)
impl_dimensioned!(RGBA, T, 4)
impl_to_vec!(RGBA, 4)
impl_as_vec!(RGBA, 4)
impl_swap!(RGBA)
impl_swap_components!(RGBA)
impl_approx!(RGBA { r, g, b, a })
impl<T:Channel> RGBA<T> {

8
src/color/srgb.rs
View file

@ -25,19 +25,19 @@ impl<T> SRGB<T> {
}
}
impl_dimensional!(SRGB, T, 3)
impl_dimensioned!(SRGB, T, 3)
impl_to_vec!(SRGB, 3)
impl_as_vec!(SRGB, 3)
impl_swap!(SRGB)
impl_swap_components!(SRGB)
impl_approx!(SRGB { r, g, b })
#[deriving(Clone, Eq)]
pub struct SRGBA<T> { r: T, g: T, b: T, a: T }
impl_dimensional!(SRGBA, T, 4)
impl_dimensioned!(SRGBA, T, 4)
impl_to_vec!(SRGBA, 4)
impl_as_vec!(SRGBA, 4)
impl_swap!(SRGBA)
impl_swap_components!(SRGBA)
impl_approx!(SRGBA { r, g, b, a })
impl<T> SRGBA<T> {

4
src/color/ycbcr.rs
View file

@ -20,10 +20,10 @@ use math::*;
#[deriving(Clone, Eq)]
pub struct YCbCr<T> { y: T, cb: T, cr: T }
impl_dimensional!(YCbCr, T, 3)
impl_dimensioned!(YCbCr, T, 3)
impl_to_vec!(YCbCr, 3)
impl_as_vec!(YCbCr, 3)
impl_swap!(YCbCr)
impl_swap_components!(YCbCr)
impl_approx!(YCbCr { y, cb, cr })
impl<T> YCbCr<T> {

8
src/math/macros.rs
View file

@ -15,9 +15,9 @@
#[macro_escape];
macro_rules! impl_dimensional(
macro_rules! impl_dimensioned(
($Self:ident, $T:ty, $n:expr) => (
impl<T> Dimensional<$T,[$T,..$n]> for $Self<T> {
impl<T> Dimensioned<$T,[$T,..$n]> for $Self<T> {
#[inline]
pub fn index<'a>(&'a self, i: uint) -> &'a $T {
&'a self.as_slice()[i]
@ -84,9 +84,9 @@ macro_rules! impl_as_vec_helper(
)
)
macro_rules! impl_swap(
macro_rules! impl_swap_components(
($Self:ident) => (
impl<T:Clone> Swap for $Self<T> {
impl<T:Clone> SwapComponents for $Self<T> {
#[inline]
pub fn swap(&mut self, a: uint, b: uint) {
let tmp = self.index(a).clone();

13
src/math/mat.rs
View file

@ -15,11 +15,12 @@
//! Matrix types
use math::{Dimensional, Swap};
use math::{Dimensioned, SwapComponents};
use math::{Quat, ToQuat};
use math::{Vec2, Vec3, Vec4};
pub trait Mat<T,Vec,Slice>: Dimensional<Vec,Slice> + Swap {
pub trait Mat<T,Vec,Slice>: Dimensioned<Vec,Slice>
+ SwapComponents {
pub fn col<'a>(&'a self, i: uint) -> &'a Vec;
pub fn col_mut<'a>(&'a mut self, i: uint) -> &'a mut Vec;
pub fn elem<'a>(&'a self, col: uint, row: uint) -> &'a T;
@ -73,7 +74,7 @@ pub type Mat2f = Mat2<float>;
pub type Mat2f32 = Mat2<f32>;
pub type Mat2f64 = Mat2<f64>;
impl_dimensional!(Mat2, Vec2<T>, 2)
impl_dimensioned!(Mat2, Vec2<T>, 2)
impl_approx!(Mat3 { x, y, z })
pub trait ToMat2<T> {
@ -534,7 +535,7 @@ pub type Mat3f = Mat3<float>;
pub type Mat3f32 = Mat3<f32>;
pub type Mat3f64 = Mat3<f64>;
impl_dimensional!(Mat3, Vec3<T>, 3)
impl_dimensioned!(Mat3, Vec3<T>, 3)
impl_approx!(Mat2 { x, y })
pub trait ToMat3<T> {
@ -1179,7 +1180,7 @@ pub type Mat4f = Mat4<float>;
pub type Mat4f32 = Mat4<f32>;
pub type Mat4f64 = Mat4<f64>;
impl_dimensional!(Mat4, Vec4<T>, 4)
impl_dimensioned!(Mat4, Vec4<T>, 4)
impl_approx!(Mat4 { x, y, z, w })
pub trait ToMat4<T> {
@ -1460,7 +1461,7 @@ impl<T:Clone + Float> FloatMat<T,Vec4<T>,[Vec4<T>,..4]> for Mat4<T> {
}
}
// Swap columns i1 and j in A and I to
// SwapComponents columns i1 and j in A and I to
// put pivot on diagonal
A.swap_cols(i1, j);
I.swap_cols(i1, j);

4
src/math/math.rs
View file

@ -40,14 +40,14 @@ pub mod plane;
pub mod point;
pub mod ray;
pub trait Dimensional<T,Slice> {
pub trait Dimensioned<T,Slice> {
pub fn index<'a>(&'a self, i: uint) -> &'a T;
pub fn index_mut<'a>(&'a mut self, i: uint) -> &'a mut T;
pub fn as_slice<'a>(&'a self) -> &'a Slice;
pub fn as_mut_slice<'a>(&'a mut self) -> &'a mut Slice;
}
pub trait Swap {
pub trait SwapComponents {
pub fn swap(&mut self, a: uint, b: uint);
}

10
src/math/point.rs
View file

@ -22,7 +22,7 @@
use std::cast;
use math::{Dimensional, Swap};
use math::{Dimensioned, SwapComponents};
use math::{Mat2, Mat3, Quat};
use math::{Ray2, Ray3};
use math::{Vec2, ToVec2, AsVec2};
@ -48,10 +48,10 @@ pub trait Point<T, Vec, Ray>: Eq
#[deriving(Clone, Eq)]
pub struct Point2<T> { x: T, y: T }
impl_dimensional!(Point2, T, 2)
impl_dimensioned!(Point2, T, 2)
impl_to_vec!(Point2, 2)
impl_as_vec!(Point2, 2)
impl_swap!(Point2)
impl_swap_components!(Point2)
impl_approx!(Point2 { x, y })
pub trait AsPoint2<T> {
@ -188,10 +188,10 @@ mod test_point2 {
#[deriving(Clone, Eq)]
pub struct Point3<T> { x: T, y: T, z: T }
impl_dimensional!(Point3, T, 3)
impl_dimensioned!(Point3, T, 3)
impl_to_vec!(Point3, 3)
impl_as_vec!(Point3, 3)
impl_swap!(Point3)
impl_swap_components!(Point3)
impl_approx!(Point3 { x, y, z })
pub trait AsPoint3<T> {

6
src/math/quat.rs
View file

@ -15,7 +15,7 @@
//! Quaternion type
use math::{Dimensional, Swap};
use math::{Dimensioned, SwapComponents};
use math::{Mat3, ToMat3};
use math::Vec3;
@ -34,8 +34,8 @@ pub type Quatf64 = Quat<f64>;
#[deriving(Clone, Eq)]
pub struct Quat<T> { s: T, v: Vec3<T> }
impl_dimensional!(Quat, T, 4)
impl_swap!(Quat)
impl_dimensioned!(Quat, T, 4)
impl_swap_components!(Quat)
impl_approx!(Quat { s, v })
pub trait ToQuat<T> {

17
src/math/vec.rs
View file

@ -15,9 +15,10 @@
//! Abstract vector types
use math::{Dimensional, Swap};
use math::{Dimensioned, SwapComponents};
pub trait Vec<T,Slice>: Dimensional<T,Slice> + Swap {}
pub trait Vec<T,Slice>: Dimensioned<T,Slice>
+ SwapComponents {}
/// Vectors with numeric components
pub trait NumVec<T,Slice>: Neg<T> {
@ -119,8 +120,8 @@ pub trait AsVec2<T> {
pub fn as_mut_vec2<'a>(&'a mut self) -> &'a mut Vec2<T>;
}
impl_dimensional!(Vec2, T, 2)
impl_swap!(Vec2)
impl_dimensioned!(Vec2, T, 2)
impl_swap_components!(Vec2)
impl_approx!(Vec2 { x, y })
impl<T> Vec2<T> {
@ -659,8 +660,8 @@ pub trait AsVec3<T> {
pub fn as_mut_vec3<'a>(&'a mut self) -> &'a mut Vec3<T>;
}
impl_dimensional!(Vec3, T, 3)
impl_swap!(Vec3)
impl_dimensioned!(Vec3, T, 3)
impl_swap_components!(Vec3)
impl_approx!(Vec3 { x, y, z })
impl<T> Vec3<T> {
@ -1265,8 +1266,8 @@ pub trait AsVec4<T> {
pub fn as_mut_vec4<'a>(&'a mut self) -> &'a mut Vec4<T>;
}
impl_dimensional!(Vec4, T, 4)
impl_swap!(Vec4)
impl_dimensioned!(Vec4, T, 4)
impl_swap_components!(Vec4)
impl_approx!(Vec4 { x, y, z, w })
impl<T> Vec4<T> {