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

Fix ambiguous trait call; Remove deprecated Float calls.

Browse source
This commit is contained in:
Jameson Ernst 2014-11-24 20:04:34 -08:00
parent 23f14b701b
commit 08f9354efc
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/angle.rs
View file

@ -16,6 +16,7 @@
//! Angle units for type-safe, self-documenting code. //! Angle units for type-safe, self-documenting code.
use std::fmt; use std::fmt;
use std::f64;
use std::num::{cast, Float}; use std::num::{cast, Float};
use approx::ApproxEq; use approx::ApproxEq;
@ -212,7 +213,7 @@ Equiv<Deg<S>> for Deg<S> {
impl<S: BaseFloat> impl<S: BaseFloat>
Angle<S> for Rad<S> { Angle<S> for Rad<S> {
#[inline] fn from<A: Angle<S>>(theta: A) -> Rad<S> { theta.to_rad() } #[inline] fn from<A: Angle<S>>(theta: A) -> Rad<S> { theta.to_rad() }
#[inline] fn full_turn() -> Rad<S> { rad(Float::two_pi()) } #[inline] fn full_turn() -> Rad<S> { rad(cast(f64::consts::PI_2).unwrap()) }
} }
impl<S: BaseFloat> impl<S: BaseFloat>

5
src/quaternion.rs
View file

@ -15,6 +15,7 @@
use std::fmt; use std::fmt;
use std::mem; use std::mem;
use std::f64;
use std::num::{cast, Float}; use std::num::{cast, Float};
use angle::{Angle, Rad, acos, sin, sin_cos, rad}; use angle::{Angle, Rad, acos, sin, sin_cos, rad};
@ -284,11 +285,11 @@ impl<S: BaseFloat> Quaternion<S> {
if test > sig * unit { if test > sig * unit {
( (
rad(zero::<S>()), rad(zero::<S>()),
rad(Float::frac_pi_2()), rad(cast(f64::consts::FRAC_PI_2).unwrap()),
rad(two * qx.atan2(qw)), rad(two * qx.atan2(qw)),
) )
} else if test < -sig * unit { } else if test < -sig * unit {
let y: S = Float::frac_pi_2(); let y: S = cast(f64::consts::FRAC_PI_2).unwrap();
( (
rad(zero::<S>()), rad(zero::<S>()),
rad(-y), rad(-y),

2
src/rotation.rs
View file

@ -63,7 +63,7 @@ pub trait Rotation<S: BaseNum, V: Vector<S>, P: Point<S, V>>: PartialEq + Approx
/// Modify this rotation in-place by combining it with another. /// Modify this rotation in-place by combining it with another.
#[inline] #[inline]
fn concat_self(&mut self, other: &Self) { fn concat_self(&mut self, other: &Self) {
*self = self.concat(other); *self = Rotation::concat(self, other);
} }
/// Invert this rotation in-place. /// Invert this rotation in-place.

2
src/transform.rs
View file

@ -63,7 +63,7 @@ pub trait Transform<S: BaseNum, V: Vector<S>, P: Point<S,V>> {
/// Combine this transform with another, in-place. /// Combine this transform with another, in-place.
#[inline] #[inline]
fn concat_self(&mut self, other: &Self) { fn concat_self(&mut self, other: &Self) {
*self = self.concat(other); *self = Transform::concat(self, other);
} }
/// Invert this transform in-place, failing if the transformation is not /// Invert this transform in-place, failing if the transformation is not