diff --git a/src/adaptors/rotmat.rs b/src/adaptors/rotmat.rs index 955ebe14..6d678639 100644 --- a/src/adaptors/rotmat.rs +++ b/src/adaptors/rotmat.rs @@ -3,6 +3,7 @@ use std::rand::{Rand, Rng, RngUtil}; use std::cmp::ApproxEq; use traits::division_ring::DivisionRing; use traits::rlmul::{RMul, LMul}; +use traits::cross::Cross; use traits::dim::Dim; use traits::inv::Inv; use traits::transpose::Transpose; @@ -25,50 +26,68 @@ impl Rotmat { self.submat.clone() } } -pub fn rotmat2>(angle: N) -> Rotmat> +impl> Rotmat> { - let (sia, coa) = angle.sin_cos(); + pub fn from_angle(angle: N) -> Rotmat> + { + let (sia, coa) = angle.sin_cos(); - Rotmat - { submat: Mat2::new(coa.clone(), -sia, sia.clone(), coa) } + Rotmat { submat: Mat2::new(coa.clone(), -sia, sia.clone(), coa) } + } } -pub fn rotmat3 -(axisangle: Vec3) -> Rotmat> +impl Rotmat> { - if axisangle.sqnorm().is_zero() - { One::one() } - else + pub fn from_axis_angle(axisangle: Vec3) -> Rotmat> { - let mut axis = axisangle; - let angle = axis.normalize(); - let _1 = One::one::(); - let ux = axis.x.clone(); - let uy = axis.y.clone(); - let uz = axis.z.clone(); - let sqx = ux * ux; - let sqy = uy * uy; - let sqz = uz * uz; - let (sin, cos) = angle.sin_cos(); - let one_m_cos = _1 - cos; + if axisangle.sqnorm().is_zero() + { One::one() } + else + { + let mut axis = axisangle; + let angle = axis.normalize(); + let _1 = One::one::(); + let ux = axis.x.clone(); + let uy = axis.y.clone(); + let uz = axis.z.clone(); + let sqx = ux * ux; + let sqy = uy * uy; + let sqz = uz * uz; + let (sin, cos) = angle.sin_cos(); + let one_m_cos = _1 - cos; - Rotmat { - submat: Mat3::new( - (sqx + (_1 - sqx) * cos), - (ux * uy * one_m_cos - uz * sin), - (ux * uz * one_m_cos + uy * sin), + Rotmat { + submat: Mat3::new( + (sqx + (_1 - sqx) * cos), + (ux * uy * one_m_cos - uz * sin), + (ux * uz * one_m_cos + uy * sin), - (ux * uy * one_m_cos + uz * sin), - (sqy + (_1 - sqy) * cos), - (uy * uz * one_m_cos - ux * sin), + (ux * uy * one_m_cos + uz * sin), + (sqy + (_1 - sqy) * cos), + (uy * uz * one_m_cos - ux * sin), - (ux * uz * one_m_cos - uy * sin), - (uy * uz * one_m_cos + ux * sin), - (sqz + (_1 - sqz) * cos)) + (ux * uz * one_m_cos - uy * sin), + (uy * uz * one_m_cos + ux * sin), + (sqz + (_1 - sqz) * cos)) + } } } } +impl Rotmat> +{ + pub fn look_at(&mut self, at: &Vec3, up: &Vec3) + { + let zaxis = at.normalized(); + let xaxis = up.cross(&zaxis).normalized(); + let yaxis = zaxis.cross(&xaxis); + + self.submat = Mat3::new(xaxis.x.clone(), yaxis.x.clone(), zaxis.x.clone(), + xaxis.y.clone(), yaxis.y.clone(), zaxis.y.clone(), + xaxis.z , yaxis.z , zaxis.z) + } +} + impl Rotation> for Rotmat> { @@ -90,7 +109,7 @@ Rotatable, Rotmat>> for Rotmat> { #[inline] fn rotated(&self, rot: &Vec1) -> Rotmat> - { rotmat2(rot.x.clone()) * *self } + { Rotmat::from_angle(rot.x.clone()) * *self } } impl @@ -115,14 +134,14 @@ Rotatable, Rotmat>> for Rotmat> { #[inline] fn rotated(&self, axisangle: &Vec3) -> Rotmat> - { rotmat3(axisangle.clone()) * *self } + { Rotmat::from_axis_angle(axisangle.clone()) * *self } } impl> Rand for Rotmat> { #[inline] fn rand(rng: &mut R) -> Rotmat> - { rotmat2(rng.gen()) } + { Rotmat::from_angle(rng.gen()) } } impl + LMul, V> Rotate for Rotmat @@ -152,7 +171,7 @@ Rand for Rotmat> { #[inline] fn rand(rng: &mut R) -> Rotmat> - { rotmat3(rng.gen()) } + { Rotmat::from_axis_angle(rng.gen()) } } impl Dim for Rotmat diff --git a/src/adaptors/transform.rs b/src/adaptors/transform.rs index 98654c66..48d58aa5 100644 --- a/src/adaptors/transform.rs +++ b/src/adaptors/transform.rs @@ -3,6 +3,7 @@ use std::rand::{Rand, Rng, RngUtil}; use std::cmp::ApproxEq; use traits::dim::Dim; use traits::inv::Inv; +use traits::division_ring::DivisionRing; use traits::rotation::{Rotation, Rotate, Rotatable}; use traits::translation::{Translation, Translate, Translatable}; use Ts = traits::transformation::Transform; @@ -10,6 +11,9 @@ use traits::transformation::{Transformation, Transformable}; use traits::rlmul::{RMul, LMul}; use traits::homogeneous::{ToHomogeneous, FromHomogeneous}; use traits::column::Column; +use adaptors::rotmat::Rotmat; +use vec::Vec3; +use mat::Mat3; #[deriving(Eq, ToStr, Clone)] pub struct Transform @@ -36,7 +40,16 @@ impl Transform { self.subtrans.clone() } } -impl Dim for Transform +impl Transform>, Vec3> +{ + pub fn look_at(&mut self, eye: &Vec3, at: &Vec3, up: &Vec3) + { + self.submat.look_at(&(*at - *eye), up); + self.subtrans = self.submat.rotate(&-eye); + } +} + +impl Dim for Transform { #[inline] fn dim() -> uint