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

Find more trouble spots where Number::from causes ICEs

Browse source
This commit is contained in:
Brendan Zabarauskas 2012-12-04 14:41:21 +10:00
parent 2ba45477a5
commit 54953a8f01
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/angle.rs
View file

@ -245,6 +245,8 @@ pub impl<T:Copy Float> Rotation<T> {
let s: T = sin(&self.theta); let s: T = sin(&self.theta);
let _0: T = cast(0); let _0: T = cast(0);
let _1: T = cast(1); let _1: T = cast(1);
// let _0: T = Number::from(0); // FIXME: causes ICE
// let _1: T = Number::from(0); // FIXME: causes ICE
let t: T = _1 - c; let t: T = _1 - c;
let x = self.axis.x; let x = self.axis.x;
@ -263,7 +265,7 @@ pub impl<T:Copy Float> Rotation<T> {
#[inline(always)] #[inline(always)]
pure fn to_quat() -> Quat<T> { pure fn to_quat() -> Quat<T> {
let half = self.theta / cast(2); let half = self.theta / Number::from(2);
Quat::from_sv(cos(&half), self.axis.mul_t(sin(&half))) Quat::from_sv(cos(&half), self.axis.mul_t(sin(&half)))
} }
} }

26
src/mat.rs
View file

@ -342,6 +342,7 @@ pub impl<T:Copy Float> Mat2<T>: Matrix<T, Vec2<T>> {
#[inline(always)] #[inline(always)]
pure fn inverse(&self) -> Option<Mat2<T>> { pure fn inverse(&self) -> Option<Mat2<T>> {
let _0 = cast(0); let _0 = cast(0);
// let _0 = Number::from(0); // FIXME: causes ICE
let d = self.determinant(); let d = self.determinant();
if d.fuzzy_eq(&_0) { if d.fuzzy_eq(&_0) {
None None
@ -366,6 +367,7 @@ pub impl<T:Copy Float> Mat2<T>: Matrix<T, Vec2<T>> {
#[inline(always)] #[inline(always)]
pure fn is_diagonal(&self) -> bool { pure fn is_diagonal(&self) -> bool {
let _0 = cast(0); let _0 = cast(0);
// let _0 = Number::from(0); // FIXME: causes ICE
self[0][1].fuzzy_eq(&_0) && self[0][1].fuzzy_eq(&_0) &&
self[1][0].fuzzy_eq(&_0) self[1][0].fuzzy_eq(&_0)
} }
@ -385,6 +387,7 @@ pub impl<T:Copy Float> Mat2<T>: Matrix<T, Vec2<T>> {
#[inline(always)] #[inline(always)]
pure fn is_invertible(&self) -> bool { pure fn is_invertible(&self) -> bool {
let _0 = cast(0); let _0 = cast(0);
// let _0 = Number::from(0); // FIXME: causes ICE
!self.determinant().fuzzy_eq(&_0) !self.determinant().fuzzy_eq(&_0)
} }
} }
@ -523,6 +526,7 @@ pub impl<T:Copy Float> Mat3<T> {
#[inline(always)] #[inline(always)]
static pure fn from_value(value: T) -> Mat3<T> { static pure fn from_value(value: T) -> Mat3<T> {
let _0 = cast(0); let _0 = cast(0);
// let _0 = Number::from(0); // FIXME: causes ICE
Mat3::new(value, _0, _0, Mat3::new(value, _0, _0,
_0, value, _0, _0, value, _0,
_0, _0, value) _0, _0, value)
@ -532,6 +536,8 @@ pub impl<T:Copy Float> Mat3<T> {
static pure fn from_Mat2(m: &Mat2<T>) -> Mat3<T> { static pure fn from_Mat2(m: &Mat2<T>) -> Mat3<T> {
let _0 = cast(0); let _0 = cast(0);
let _1 = cast(1); let _1 = cast(1);
// let _0 = Number::from(0); // FIXME: causes ICE
// let _1 = Number::from(1); // FIXME: causes ICE
Mat3::new(m[0][0], m[0][1], _0, Mat3::new(m[0][0], m[0][1], _0,
m[1][0], m[1][1], _0, m[1][0], m[1][1], _0,
_0, _0, _1) _0, _0, _1)
@ -583,8 +589,10 @@ pub impl<T:Copy Float> Mat3<T>: Matrix<T, Vec3<T>> {
*/ */
#[inline(always)] #[inline(always)]
static pure fn identity() -> Mat3<T> { static pure fn identity() -> Mat3<T> {
let _0 = cast(0); // let _0 = cast(0);
let _1 = cast(1); // let _1 = cast(1);
let _0 = Number::from(0);
let _1 = Number::from(1);
Mat3::new(_1, _0, _0, Mat3::new(_1, _0, _0,
_0, _1, _0, _0, _1, _0,
_0, _0, _1) _0, _0, _1)
@ -610,7 +618,7 @@ pub impl<T:Copy Float> Mat3<T>: Matrix<T, Vec3<T>> {
*/ */
#[inline(always)] #[inline(always)]
static pure fn zero() -> Mat3<T> { static pure fn zero() -> Mat3<T> {
let _0 = cast(0); let _0 = Number::from(0);
Mat3::new(_0, _0, _0, Mat3::new(_0, _0, _0,
_0, _0, _0, _0, _0, _0,
_0, _0, _0) _0, _0, _0)
@ -672,6 +680,7 @@ pub impl<T:Copy Float> Mat3<T>: Matrix<T, Vec3<T>> {
pure fn inverse(&self) -> Option<Mat3<T>> { pure fn inverse(&self) -> Option<Mat3<T>> {
let d = self.determinant(); let d = self.determinant();
let _0 = cast(0); let _0 = cast(0);
// let _0 = Number::from(0); // FIXME: causes ICE
if d.fuzzy_eq(&_0) { if d.fuzzy_eq(&_0) {
None None
} else { } else {
@ -698,6 +707,7 @@ pub impl<T:Copy Float> Mat3<T>: Matrix<T, Vec3<T>> {
#[inline(always)] #[inline(always)]
pure fn is_diagonal(&self) -> bool { pure fn is_diagonal(&self) -> bool {
let _0 = cast(0); let _0 = cast(0);
// let _0 = Number::from(0); // FIXME: causes ICE
self[0][1].fuzzy_eq(&_0) && self[0][1].fuzzy_eq(&_0) &&
self[0][2].fuzzy_eq(&_0) && self[0][2].fuzzy_eq(&_0) &&
@ -729,6 +739,7 @@ pub impl<T:Copy Float> Mat3<T>: Matrix<T, Vec3<T>> {
#[inline(always)] #[inline(always)]
pure fn is_invertible(&self) -> bool { pure fn is_invertible(&self) -> bool {
let _0 = cast(0); let _0 = cast(0);
// let _0 = Number::from(0); // FIXME: causes ICE
!self.determinant().fuzzy_eq(&_0) !self.determinant().fuzzy_eq(&_0)
} }
} }
@ -752,7 +763,7 @@ pub impl<T:Copy Float Exp> Mat3<T>: ToQuat<T> {
let _1: T = Number::from(1.0); let _1: T = Number::from(1.0);
let half: T = Number::from(0.5); let half: T = Number::from(0.5);
if trace >= cast(0) { if trace >= Number::from(0) {
s = (_1 + trace).sqrt(); s = (_1 + trace).sqrt();
w = half * s; w = half * s;
s = half / s; s = half / s;
@ -996,8 +1007,8 @@ pub impl<T:Copy Float Sign> Mat4<T>: Matrix<T, Vec4<T>> {
*/ */
#[inline(always)] #[inline(always)]
static pure fn identity() -> Mat4<T> { static pure fn identity() -> Mat4<T> {
let _0 = cast(0); let _0 = Number::from(0);
let _1 = cast(1); let _1 = Number::from(1);
Mat4::new(_1, _0, _0, _0, Mat4::new(_1, _0, _0, _0,
_0, _1, _0, _0, _0, _1, _0, _0,
_0, _0, _1, _0, _0, _0, _1, _0,
@ -1026,7 +1037,7 @@ pub impl<T:Copy Float Sign> Mat4<T>: Matrix<T, Vec4<T>> {
*/ */
#[inline(always)] #[inline(always)]
static pure fn zero() -> Mat4<T> { static pure fn zero() -> Mat4<T> {
let _0 = cast(0); let _0 = Number::from(0);
Mat4::new(_0, _0, _0, _0, Mat4::new(_0, _0, _0, _0,
_0, _0, _0, _0, _0, _0, _0, _0,
_0, _0, _0, _0, _0, _0, _0, _0,
@ -1106,6 +1117,7 @@ pub impl<T:Copy Float Sign> Mat4<T>: Matrix<T, Vec4<T>> {
pure fn inverse(&self) -> Option<Mat4<T>> { pure fn inverse(&self) -> Option<Mat4<T>> {
let d = self.determinant(); let d = self.determinant();
// let _0 = Number::from(0); // FIXME: Triggers ICE
let _0 = cast(0); let _0 = cast(0);
if d.fuzzy_eq(&_0) { if d.fuzzy_eq(&_0) {
None None