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

Merge pull request #106 from aepsil0n/fix-nightly 

Update to latest nightly
This commit is contained in:
Eduard Bopp 2015-03-29 13:18:00 +02:00
parent 8776963e91 df93ed2d1c
commit 0362d0d875
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib.rs
View File

@ -24,7 +24,7 @@ The preferred way to use **nalgebra** is to import types and traits explicitly,
free-functions using the `na::` prefix: free-functions using the `na::` prefix:
```.rust ```.rust
extern crate "nalgebra" as na; extern crate nalgebra as na;
use na::{Vec3, Rot3, Rotation}; use na::{Vec3, Rot3, Rotation};
fn main() { fn main() {
@ -371,7 +371,7 @@ pub fn perspective3d<N: BaseFloat + Cast<f64> + Zero + One>(width: N, height: N,
/// Gets the translation applicable by `m`. /// Gets the translation applicable by `m`.
/// ///
/// ```rust /// ```rust
/// extern crate "nalgebra" as na; /// extern crate nalgebra as na;
/// use na::{Vec3, Iso3}; /// use na::{Vec3, Iso3};
/// ///
/// fn main() { /// fn main() {
@ -389,7 +389,7 @@ pub fn translation<V, M: Translation<V>>(m: &M) -> V {
/// Gets the inverse translation applicable by `m`. /// Gets the inverse translation applicable by `m`.
/// ///
/// ```rust /// ```rust
/// extern crate "nalgebra" as na; /// extern crate nalgebra as na;
/// use na::{Vec3, Iso3}; /// use na::{Vec3, Iso3};
/// ///
/// fn main() { /// fn main() {
@ -417,7 +417,7 @@ pub fn append_translation<V, M: Translation<V>>(m: &M, v: &V) -> M {
/// Applies a translation to a point. /// Applies a translation to a point.
/// ///
/// ```rust /// ```rust
/// extern crate "nalgebra" as na; /// extern crate nalgebra as na;
/// use na::{Pnt3, Vec3, Iso3}; /// use na::{Pnt3, Vec3, Iso3};
/// ///
/// fn main() { /// fn main() {
@ -437,7 +437,7 @@ pub fn translate<P, M: Translate<P>>(m: &M, p: &P) -> P {
/// Applies an inverse translation to a point. /// Applies an inverse translation to a point.
/// ///
/// ```rust /// ```rust
/// extern crate "nalgebra" as na; /// extern crate nalgebra as na;
/// use na::{Pnt3, Vec3, Iso3}; /// use na::{Pnt3, Vec3, Iso3};
/// ///
/// fn main() { /// fn main() {
@ -460,7 +460,7 @@ pub fn inv_translate<P, M: Translate<P>>(m: &M, p: &P) -> P {
/// Gets the rotation applicable by `m`. /// Gets the rotation applicable by `m`.
/// ///
/// ```rust /// ```rust
/// extern crate "nalgebra" as na; /// extern crate nalgebra as na;
/// use na::{Vec3, Rot3}; /// use na::{Vec3, Rot3};
/// ///
/// fn main() { /// fn main() {
@ -478,7 +478,7 @@ pub fn rotation<V, M: Rotation<V>>(m: &M) -> V {
/// Gets the inverse rotation applicable by `m`. /// Gets the inverse rotation applicable by `m`.
/// ///
/// ```rust /// ```rust
/// extern crate "nalgebra" as na; /// extern crate nalgebra as na;
/// use na::{Vec3, Rot3}; /// use na::{Vec3, Rot3};
/// ///
/// fn main() { /// fn main() {
@ -496,7 +496,7 @@ pub fn inv_rotation<V, M: Rotation<V>>(m: &M) -> V {
/// Applies the rotation `v` to a copy of `m`. /// Applies the rotation `v` to a copy of `m`.
/// ///
/// ```rust /// ```rust
/// extern crate "nalgebra" as na; /// extern crate nalgebra as na;
/// use na::{Vec3, Rot3}; /// use na::{Vec3, Rot3};
/// ///
/// fn main() { /// fn main() {
@ -516,7 +516,7 @@ pub fn append_rotation<V, M: Rotation<V>>(m: &M, v: &V) -> M {
/// Pre-applies the rotation `v` to a copy of `m`. /// Pre-applies the rotation `v` to a copy of `m`.
/// ///
/// ```rust /// ```rust
/// extern crate "nalgebra" as na; /// extern crate nalgebra as na;
/// use na::{Vec3, Rot3}; /// use na::{Vec3, Rot3};
/// ///
/// fn main() { /// fn main() {
@ -539,7 +539,7 @@ pub fn prepend_rotation<V, M: Rotation<V>>(m: &M, v: &V) -> M {
/// Applies a rotation to a vector. /// Applies a rotation to a vector.
/// ///
/// ```rust /// ```rust
/// extern crate "nalgebra" as na; /// extern crate nalgebra as na;
/// use na::{BaseFloat, Rot3, Vec3}; /// use na::{BaseFloat, Rot3, Vec3};
/// ///
/// fn main() { /// fn main() {
@ -560,7 +560,7 @@ pub fn rotate<V, M: Rotate<V>>(m: &M, v: &V) -> V {
/// Applies an inverse rotation to a vector. /// Applies an inverse rotation to a vector.
/// ///
/// ```rust /// ```rust
/// extern crate "nalgebra" as na; /// extern crate nalgebra as na;
/// use na::{BaseFloat, Rot3, Vec3}; /// use na::{BaseFloat, Rot3, Vec3};
/// ///
/// fn main() { /// fn main() {

14
src/structs/dmat.rs
View File

@ -164,7 +164,7 @@ impl<N> DMat<N> {
/// The returned vector contains the matrix data in column-major order. /// The returned vector contains the matrix data in column-major order.
#[inline] #[inline]
pub fn as_mut_vec(&mut self) -> &mut [N] { pub fn as_mut_vec(&mut self) -> &mut [N] {
self.mij.as_mut_slice() &mut self.mij[..]
} }
} }
@ -217,7 +217,7 @@ impl<N: Copy> Indexable<(usize, usize), N> for DMat<N> {
unsafe fn unsafe_set(&mut self, rowcol: (usize, usize), val: N) { unsafe fn unsafe_set(&mut self, rowcol: (usize, usize), val: N) {
let (row, col) = rowcol; let (row, col) = rowcol;
let offset = self.offset(row, col); let offset = self.offset(row, col);
*self.mij.as_mut_slice().get_unchecked_mut(offset) = val *self.mij[..].get_unchecked_mut(offset) = val
} }
/// Reads the value of a component of the matrix. /// Reads the value of a component of the matrix.
@ -249,7 +249,7 @@ impl<N: Copy> Indexable<(usize, usize), N> for DMat<N> {
let count = self.mij.len(); let count = self.mij.len();
assert!(offset1 < count); assert!(offset1 < count);
assert!(offset2 < count); assert!(offset2 < count);
self.mij.as_mut_slice().swap(offset1, offset2); self.mij[..].swap(offset1, offset2);
} }
} }
@ -282,7 +282,7 @@ impl<N> IndexMut<(usize, usize)> for DMat<N> {
let offset = self.offset(i, j); let offset = self.offset(i, j);
unsafe { unsafe {
self.mij.as_mut_slice().get_unchecked_mut(offset) self.mij[..].get_unchecked_mut(offset)
} }
} }
} }
@ -407,8 +407,8 @@ impl<N: BaseNum + Clone> Inv for DMat<N> {
let off_n0_j = self.offset(n0, j); let off_n0_j = self.offset(n0, j);
let off_k_j = self.offset(k, j); let off_k_j = self.offset(k, j);
self.mij.as_mut_slice().swap(off_n0_j, off_k_j); self.mij[..].swap(off_n0_j, off_k_j);
res.mij.as_mut_slice().swap(off_n0_j, off_k_j); res.mij[..].swap(off_n0_j, off_k_j);
} }
} }
@ -482,7 +482,7 @@ impl<N: Clone + Copy> Transpose for DMat<N> {
let off_i_j = self.offset(i, j); let off_i_j = self.offset(i, j);
let off_j_i = self.offset(j, i); let off_j_i = self.offset(j, i);
self.mij.as_mut_slice().swap(off_i_j, off_j_i); self.mij[..].swap(off_i_j, off_j_i);
} }
} }

2
src/structs/dvec_macros.rs
View File

@ -72,7 +72,7 @@ macro_rules! dvec_impl(
#[inline] #[inline]
unsafe fn unsafe_set(&mut self, i: usize, val: N) { unsafe fn unsafe_set(&mut self, i: usize, val: N) {
*self.at.as_mut_slice().get_unchecked_mut(i) = val *self.at[..].get_unchecked_mut(i) = val
} }
} }