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

Merge pull request #35 from aepsil0n/to_homogeneous_self

Browse Source 
Have ToHomogeneous use &self in method signature
This commit is contained in:
Sébastien Crozet 2014-11-22 16:50:31 +01:00
commit b1a58e9ebe
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/structs/iso_macros.rs
View File

@ -318,13 +318,13 @@ macro_rules! inv_impl(
macro_rules! to_homogeneous_impl( macro_rules! to_homogeneous_impl(
($t: ident, $th: ident) => ( ($t: ident, $th: ident) => (
impl<N: BaseNum + Clone> ToHomogeneous<$th<N>> for $t<N> { impl<N: BaseNum + Clone> ToHomogeneous<$th<N>> for $t<N> {
fn to_homogeneous(m: &$t<N>) -> $th<N> { fn to_homogeneous(&self) -> $th<N> {
let mut res = ToHomogeneous::to_homogeneous(&m.rotation); let mut res = self.rotation.to_homogeneous();
// copy the translation // copy the translation
let dim = Dim::dim(None::<$th<N>>); let dim = Dim::dim(None::<$th<N>>);
res.set_col(dim - 1, ToHomogeneous::to_homogeneous(m.translation.as_pnt()).to_vec()); res.set_col(dim - 1, self.translation.as_pnt().to_homogeneous().to_vec());
res res
} }

4
src/structs/mat_macros.rs
View File

@ -645,12 +645,12 @@ macro_rules! to_homogeneous_impl(
($t: ident, $t2: ident, $dim: expr, $dim2: expr) => ( ($t: ident, $t2: ident, $dim: expr, $dim2: expr) => (
impl<N: BaseNum + Clone> ToHomogeneous<$t2<N>> for $t<N> { impl<N: BaseNum + Clone> ToHomogeneous<$t2<N>> for $t<N> {
#[inline] #[inline]
fn to_homogeneous(m: &$t<N>) -> $t2<N> { fn to_homogeneous(&self) -> $t2<N> {
let mut res: $t2<N> = ::one(); let mut res: $t2<N> = ::one();
for i in range(0u, $dim) { for i in range(0u, $dim) {
for j in range(0u, $dim) { for j in range(0u, $dim) {
res.set((i, j), m.at((i, j))) res.set((i, j), self.at((i, j)))
} }
} }

6
src/structs/pnt_macros.rs
View File

@ -101,11 +101,11 @@ macro_rules! pnt_as_vec_impl(
macro_rules! pnt_to_homogeneous_impl( macro_rules! pnt_to_homogeneous_impl(
($t: ident, $t2: ident, $extra: ident, $comp0: ident $(,$compN: ident)*) => ( ($t: ident, $t2: ident, $extra: ident, $comp0: ident $(,$compN: ident)*) => (
impl<N: Clone + One + Zero> ToHomogeneous<$t2<N>> for $t<N> { impl<N: Clone + One + Zero> ToHomogeneous<$t2<N>> for $t<N> {
fn to_homogeneous(v: &$t<N>) -> $t2<N> { fn to_homogeneous(&self) -> $t2<N> {
let mut res: $t2<N> = Orig::orig(); let mut res: $t2<N> = Orig::orig();
res.$comp0 = v.$comp0.clone(); res.$comp0 = self.$comp0.clone();
$( res.$compN = v.$compN.clone(); )* $( res.$compN = self.$compN.clone(); )*
res.$extra = ::one(); res.$extra = ::one();
res res

4
src/structs/rot_macros.rs
View File

@ -283,8 +283,8 @@ macro_rules! to_homogeneous_impl(
($t: ident, $tm: ident) => ( ($t: ident, $tm: ident) => (
impl<N: BaseNum + Clone> ToHomogeneous<$tm<N>> for $t<N> { impl<N: BaseNum + Clone> ToHomogeneous<$tm<N>> for $t<N> {
#[inline] #[inline]
fn to_homogeneous(m: &$t<N>) -> $tm<N> { fn to_homogeneous(&self) -> $tm<N> {
ToHomogeneous::to_homogeneous(&m.submat) self.submat.to_homogeneous()
} }
} }
) )

6
src/structs/vec_macros.rs
View File

@ -696,11 +696,11 @@ macro_rules! bounded_impl(
macro_rules! vec_to_homogeneous_impl( macro_rules! vec_to_homogeneous_impl(
($t: ident, $t2: ident, $extra: ident, $comp0: ident $(,$compN: ident)*) => ( ($t: ident, $t2: ident, $extra: ident, $comp0: ident $(,$compN: ident)*) => (
impl<N: Clone + One + Zero> ToHomogeneous<$t2<N>> for $t<N> { impl<N: Clone + One + Zero> ToHomogeneous<$t2<N>> for $t<N> {
fn to_homogeneous(v: &$t<N>) -> $t2<N> { fn to_homogeneous(&self) -> $t2<N> {
let mut res: $t2<N> = ::zero(); let mut res: $t2<N> = ::zero();
res.$comp0 = v.$comp0.clone(); res.$comp0 = self.$comp0.clone();
$( res.$compN = v.$compN.clone(); )* $( res.$compN = self.$compN.clone(); )*
res res
} }

2
src/traits/geometry.rs
View File

@ -244,7 +244,7 @@ pub trait CrossMatrix<M> {
/// Traits of objects which can be put in homogeneous coordinates form. /// Traits of objects which can be put in homogeneous coordinates form.
pub trait ToHomogeneous<U> { pub trait ToHomogeneous<U> {
/// Gets the homogeneous coordinates form of this object. /// Gets the homogeneous coordinates form of this object.
fn to_homogeneous(&Self) -> U; fn to_homogeneous(&self) -> U;
} }
/// Traits of objects which can be build from an homogeneous coordinate form. /// Traits of objects which can be build from an homogeneous coordinate form.