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

Add Matrix4::{from_scale, from_uniform_scale} functions

Browse source
This commit is contained in:
Brendan Zabarauskas 2015-12-06 19:48:37 +11:00
parent c85198bf1d
commit 2d6b4e785c
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/matrix.rs
View file

@ -214,7 +214,7 @@ impl<S> Matrix4<S> {
} }
impl<S: BaseNum> Matrix4<S> { impl<S: BaseNum> Matrix4<S> {
/// Create a translation matrix from a Vector3 /// Create a homogeneous transformation matrix from a translation vector.
#[inline] #[inline]
pub fn from_translation(v: Vector3<S>) -> Matrix4<S> { pub fn from_translation(v: Vector3<S>) -> Matrix4<S> {
Matrix4::new(S::one(), S::zero(), S::zero(), S::zero(), Matrix4::new(S::one(), S::zero(), S::zero(), S::zero(),
@ -225,7 +225,22 @@ impl<S: BaseNum> Matrix4<S> {
} }
impl<S: BaseFloat> Matrix4<S> { impl<S: BaseFloat> Matrix4<S> {
/// Create a transformation matrix that will cause a vector to point at /// Create a homogeneous transformation matrix from a set of scale values.
#[inline]
pub fn from_scale(x: S, y: S, z: S) -> Matrix4<S> {
Matrix4::new(x, S::zero(), S::zero(), S::zero(),
S::zero(), y, S::zero(), S::zero(),
S::zero(), S::zero(), z, S::zero(),
S::zero(), S::zero(), S::zero(), S::one())
}
/// Create a homogeneous transformation matrix from a scale value.
#[inline]
pub fn from_uniform_scale(value: S) -> Matrix4<S> {
Matrix4::from_scale(value, value, value)
}
/// Create a homogeneous transformation matrix that will cause a vector to point at
/// `dir`, using `up` for orientation. /// `dir`, using `up` for orientation.
pub fn look_at(eye: Point3<S>, center: Point3<S>, up: Vector3<S>) -> Matrix4<S> { pub fn look_at(eye: Point3<S>, center: Point3<S>, up: Vector3<S>) -> Matrix4<S> {
let f = (center - eye).normalize(); let f = (center - eye).normalize();