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

Merge pull request #14 from bpbp-boop/master

Browse source 
Fixed Mat4::look_at
This commit is contained in:
Brendan Zabarauskas 2013-12-06 22:10:26 -08:00
parent 8d4a06005c 3c9a6a531d
commit 604edb2b68
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/cgmath/matrix.rs
View file

@ -226,13 +226,13 @@ impl<S: Primitive> Mat4<S> {
impl<S: Float> Mat4<S> { impl<S: Float> Mat4<S> {
pub fn look_at(eye: &Point3<S>, center: &Point3<S>, up: &Vec3<S>) -> Mat4<S> { pub fn look_at(eye: &Point3<S>, center: &Point3<S>, up: &Vec3<S>) -> Mat4<S> {
let f = center.sub_p(eye).normalize(); let f = center.sub_p(eye).normalize();
let s = f.cross(&up.normalize()); let s = f.cross(up).normalize();
let u = s.cross(&f).normalize(); let u = s.cross(&f);
Mat4::new(s.x.clone(), s.y.clone(), s.z.clone(), zero(), Mat4::new(s.x.clone(), u.x.clone(), -f.x.clone(), zero(),
u.x.clone(), u.y.clone(), u.z.clone(), zero(), s.y.clone(), u.y.clone(), -f.y.clone(), zero(),
-f.x.clone(), -f.y.clone(), -f.z.clone(), zero(), s.z.clone(), u.z.clone(), -f.z.clone(), zero(),
-eye.dot(&s), -eye.dot(&u), -eye.dot(&f), one()) -eye.dot(&s), -eye.dot(&u), eye.dot(&f), one())
} }
} }