M-Labs
/
nalgebra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to the last Rust. 

Version of rustc: 0.10-pre (4243cad 2014-02-24 22:17:02 -0800)
This commit is contained in:
Sébastien Crozet 2014-02-25 09:41:41 +01:00
parent c834439009
commit 57dfc14139
7 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/structs/dmat.rs
View File

@ -629,21 +629,3 @@ scalar_sub_impl!(i16)
scalar_sub_impl!(i8)
scalar_sub_impl!(uint)
scalar_sub_impl!(int)
impl<N: ToStr + Clone> ToStr for DMat<N> {
fn to_str(&self) -> ~str {
let mut res = ~"DMat ";
res = res + self.nrows.to_str() + " " + self.ncols.to_str() + " {\n";
for i in range(0u, self.nrows) {
for j in range(0u, self.ncols) {
res = res + " " + unsafe { self.at_fast(i, j).to_str() };
}
res = res + "\n";
}
res = res + "}";
res
}
}

2
src/structs/dvec.rs
View File

@ -16,7 +16,7 @@ use traits::structure::{Iterable, IterableMut};
mod metal;
/// Vector with a dimension unknown at compile-time.
#[deriving(Eq, Show, ToStr, Clone)]
#[deriving(Eq, Show, Clone)]
pub struct DVec<N> {
/// Components of the vector. Contains as much elements as the vector dimension.
at: ~[N]

6
src/structs/iso.rs
View File

@ -20,7 +20,7 @@ mod iso_macros;
///
/// This is the composition of a rotation followed by a translation.
/// Isometries conserve angles and distances, hence do not allow shearing nor scaling.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Show, ToStr)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Show)]
pub struct Iso2<N> {
/// The rotation applicable by this isometry.
rotation: Rot2<N>,
@ -32,7 +32,7 @@ pub struct Iso2<N> {
///
/// This is the composition of a rotation followed by a translation.
/// Isometries conserve angles and distances, hence do not allow shearing nor scaling.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Show, ToStr)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Show)]
pub struct Iso3<N> {
/// The rotation applicable by this isometry.
rotation: Rot3<N>,
@ -43,7 +43,7 @@ pub struct Iso3<N> {
/// Four dimensional isometry.
///
/// Isometries conserve angles and distances, hence do not allow shearing nor scaling.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Show, ToStr)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Show)]
pub struct Iso4<N> {
/// The rotation applicable by this isometry.
rotation: Rot4<N>,

14
src/structs/mat.rs
View File

@ -17,7 +17,7 @@ mod metal;
mod mat_macros;
/// Special identity matrix. All its operation are no-ops.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Rand, Show, ToStr)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Rand, Show)]
pub struct Identity;
impl Identity {
@ -29,7 +29,7 @@ impl Identity {
}
/// Square matrix of dimension 1.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show, ToStr)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show)]
pub struct Mat1<N> {
m11: N
}
@ -121,7 +121,7 @@ from_homogeneous_impl!(Mat1, Mat2, 1, 2)
outer_impl!(Vec1, Mat1)
/// Square matrix of dimension 2.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show, ToStr)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show)]
pub struct Mat2<N> {
m11: N, m21: N,
m12: N, m22: N
@ -218,7 +218,7 @@ from_homogeneous_impl!(Mat2, Mat3, 2, 3)
outer_impl!(Vec2, Mat2)
/// Square matrix of dimension 3.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show, ToStr)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show)]
pub struct Mat3<N> {
m11: N, m21: N, m31: N,
m12: N, m22: N, m32: N,
@ -329,7 +329,7 @@ from_homogeneous_impl!(Mat3, Mat4, 3, 4)
outer_impl!(Vec3, Mat3)
/// Square matrix of dimension 4.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show, ToStr)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show)]
pub struct Mat4<N> {
m11: N, m21: N, m31: N, m41: N,
m12: N, m22: N, m32: N, m42: N,
@ -492,7 +492,7 @@ from_homogeneous_impl!(Mat4, Mat5, 4, 5)
outer_impl!(Vec4, Mat4)
/// Square matrix of dimension 5.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show, ToStr)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show)]
pub struct Mat5<N> {
m11: N, m21: N, m31: N, m41: N, m51: N,
m12: N, m22: N, m32: N, m42: N, m52: N,
@ -671,7 +671,7 @@ from_homogeneous_impl!(Mat5, Mat6, 5, 6)
outer_impl!(Vec5, Mat5)
/// Square matrix of dimension 6.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show, ToStr)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show)]
pub struct Mat6<N> {
m11: N, m21: N, m31: N, m41: N, m51: N, m61: N,
m12: N, m22: N, m32: N, m42: N, m52: N, m62: N,

6
src/structs/rot.rs
View File

@ -15,7 +15,7 @@ mod metal;
mod rot_macros;
/// Two dimensional rotation matrix.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Show, ToStr, Hash)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Show, Hash)]
pub struct Rot2<N> {
priv submat: Mat2<N>
}
@ -93,7 +93,7 @@ impl<N: Signed> AbsoluteRotate<Vec2<N>> for Rot2<N> {
* 3d rotation
*/
/// Three dimensional rotation matrix.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Show, ToStr, Hash)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Show, Hash)]
pub struct Rot3<N> {
priv submat: Mat3<N>
}
@ -264,7 +264,7 @@ impl<N: Signed> AbsoluteRotate<Vec3<N>> for Rot3<N> {
}
/// Four dimensional rotation matrix.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Show, ToStr, Hash)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Show, Hash)]
pub struct Rot4<N> {
priv submat: Mat4<N>
}

14
src/structs/vec.rs
View File

@ -17,11 +17,11 @@ mod metal;
mod vec_macros;
/// Vector of dimension 0.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Rand, Zero, Show, ToStr)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Rand, Zero, Show)]
pub struct Vec0<N>;
/// Vector of dimension 1.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show, ToStr)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show)]
pub struct Vec1<N> {
/// First component of the vector.
x: N
@ -117,7 +117,7 @@ rotate_impl!(Vec1)
transform_impl!(Vec1)
/// Vector of dimension 2.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show, ToStr)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show)]
pub struct Vec2<N> {
/// First component of the vector.
x: N,
@ -215,7 +215,7 @@ rotate_impl!(Vec2)
transform_impl!(Vec2)
/// Vector of dimension 3.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show, ToStr)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show)]
pub struct Vec3<N> {
/// First component of the vector.
x: N,
@ -319,7 +319,7 @@ transform_impl!(Vec3)
/// Vector of dimension 4.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show, ToStr)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show)]
pub struct Vec4<N> {
/// First component of the vector.
x: N,
@ -421,7 +421,7 @@ rotate_impl!(Vec4)
transform_impl!(Vec4)
/// Vector of dimension 5.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show, ToStr)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show)]
pub struct Vec5<N> {
/// First component of the vector.
x: N,
@ -525,7 +525,7 @@ rotate_impl!(Vec5)
transform_impl!(Vec5)
/// Vector of dimension 6.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show, ToStr)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Hash, Rand, Zero, Show)]
pub struct Vec6<N> {
/// First component of the vector.
x: N,

2
src/traits/operations.rs
View File

@ -4,7 +4,7 @@ use std::cmp;
/// Result of a partial ordering.
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Show, ToStr)]
#[deriving(Eq, Encodable, Decodable, Clone, DeepClone, Show)]
pub enum PartialOrdering {
/// Result of a strict comparison.
Less,