Skip to content

/ euclid

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various improvements, clean up warnings, restructure constructors #81

Merged
merged 9 commits into from Jun 12, 2015
+209 −206
Merged

Various improvements, clean up warnings, restructure constructors #81

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
db8d8d1
Migrate Matrix4 functions into associated functions
frewsxcv Jun 8, 2015
65f008d
Migrate Matrix4 primary constructor to associated fn
frewsxcv Jun 8, 2015
90bc0ac
Migrate Point2D primary constructor to associated fn
frewsxcv Jun 8, 2015
53f7e51
Remove unused imports
frewsxcv Jun 8, 2015
ed5a723
Migrate Size2D primary constructor to associated fn
frewsxcv Jun 8, 2015
cf0f61d
Remove unnecessary type suffixes on ints in tests
frewsxcv Jun 8, 2015
1c0af83
Migrate Rect primary constructor to associated fn
frewsxcv Jun 8, 2015
5d1b5dd
Migrate TypedSize2D primary constructor to associated fn
frewsxcv Jun 8, 2015
94a3e02
Migrate TypedPoint2D primary constructor to associated fn
frewsxcv Jun 8, 2015
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

1 src/length.rs
View file
Open in desktop
@@ -127,7 +127,6 @@ impl<Unit, T: Zero> Zero for Length<Unit, T> {
mod tests {
use super::Length;
use scale_factor::ScaleFactor;
use num::Zero;

#[derive(Debug)]
enum Inch {}
203 src/matrix.rs
View file
Open in desktop
@@ -10,19 +10,6 @@
use approxeq::ApproxEq;
use point::Point2D;

pub fn Matrix4(
m11: f32, m12: f32, m13: f32, m14: f32,
m21: f32, m22: f32, m23: f32, m24: f32,
m31: f32, m32: f32, m33: f32, m34: f32,
m41: f32, m42: f32, m43: f32, m44: f32)
-> Matrix4 {
Matrix4 {
m11: m11, m12: m12, m13: m13, m14: m14,
m21: m21, m22: m22, m23: m23, m24: m24,
m31: m31, m32: m32, m33: m33, m34: m34,
m41: m41, m42: m42, m43: m43, m44: m44
}
}

#[derive(Debug, Copy, Clone)]
pub struct Matrix4 {
@@ -33,6 +20,55 @@ pub struct Matrix4 {
}

impl Matrix4 {
pub fn new(
m11: f32, m12: f32, m13: f32, m14: f32,
m21: f32, m22: f32, m23: f32, m24: f32,
m31: f32, m32: f32, m33: f32, m34: f32,
m41: f32, m42: f32, m43: f32, m44: f32)
-> Matrix4 {
Matrix4 {
m11: m11, m12: m12, m13: m13, m14: m14,
m21: m21, m22: m22, m23: m23, m24: m24,
m31: m31, m32: m32, m33: m33, m34: m34,
m41: m41, m42: m42, m43: m43, m44: m44
}
}

pub fn ortho(left: f32, right: f32,
bottom: f32, top: f32,
near: f32, far: f32) -> Matrix4 {
let tx = -((right + left) / (right - left));
let ty = -((top + bottom) / (top - bottom));
let tz = -((far + near) / (far - near));

Matrix4::new(2.0 / (right - left),
0.0,
0.0,
0.0,

0.0,
2.0 / (top - bottom),
0.0,
0.0,

0.0,
0.0,
-2.0 / (far - near),
0.0,

tx,
ty,
tz,
1.0)
}

pub fn identity() -> Matrix4 {
Matrix4::new(1.0, 0.0, 0.0, 0.0,
0.0, 1.0, 0.0, 0.0,
0.0, 0.0, 1.0, 0.0,
0.0, 0.0, 0.0, 1.0)
}

pub fn approx_eq(&self, other: &Matrix4) -> bool {
self.m11.approx_eq(&other.m11) && self.m12.approx_eq(&other.m12) &&
self.m13.approx_eq(&other.m13) && self.m14.approx_eq(&other.m14) &&
@@ -45,43 +81,43 @@ impl Matrix4 {
}

pub fn mul(&self, m: &Matrix4) -> Matrix4 {
Matrix4(m.m11*self.m11 + m.m12*self.m21 + m.m13*self.m31 + m.m14*self.m41,
m.m11*self.m12 + m.m12*self.m22 + m.m13*self.m32 + m.m14*self.m42,
m.m11*self.m13 + m.m12*self.m23 + m.m13*self.m33 + m.m14*self.m43,
m.m11*self.m14 + m.m12*self.m24 + m.m13*self.m34 + m.m14*self.m44,
m.m21*self.m11 + m.m22*self.m21 + m.m23*self.m31 + m.m24*self.m41,
m.m21*self.m12 + m.m22*self.m22 + m.m23*self.m32 + m.m24*self.m42,
m.m21*self.m13 + m.m22*self.m23 + m.m23*self.m33 + m.m24*self.m43,
m.m21*self.m14 + m.m22*self.m24 + m.m23*self.m34 + m.m24*self.m44,
m.m31*self.m11 + m.m32*self.m21 + m.m33*self.m31 + m.m34*self.m41,
m.m31*self.m12 + m.m32*self.m22 + m.m33*self.m32 + m.m34*self.m42,
m.m31*self.m13 + m.m32*self.m23 + m.m33*self.m33 + m.m34*self.m43,
m.m31*self.m14 + m.m32*self.m24 + m.m33*self.m34 + m.m34*self.m44,
m.m41*self.m11 + m.m42*self.m21 + m.m43*self.m31 + m.m44*self.m41,
m.m41*self.m12 + m.m42*self.m22 + m.m43*self.m32 + m.m44*self.m42,
m.m41*self.m13 + m.m42*self.m23 + m.m43*self.m33 + m.m44*self.m43,
m.m41*self.m14 + m.m42*self.m24 + m.m43*self.m34 + m.m44*self.m44)
Matrix4::new(m.m11*self.m11 + m.m12*self.m21 + m.m13*self.m31 + m.m14*self.m41,
m.m11*self.m12 + m.m12*self.m22 + m.m13*self.m32 + m.m14*self.m42,
m.m11*self.m13 + m.m12*self.m23 + m.m13*self.m33 + m.m14*self.m43,
m.m11*self.m14 + m.m12*self.m24 + m.m13*self.m34 + m.m14*self.m44,
m.m21*self.m11 + m.m22*self.m21 + m.m23*self.m31 + m.m24*self.m41,
m.m21*self.m12 + m.m22*self.m22 + m.m23*self.m32 + m.m24*self.m42,
m.m21*self.m13 + m.m22*self.m23 + m.m23*self.m33 + m.m24*self.m43,
m.m21*self.m14 + m.m22*self.m24 + m.m23*self.m34 + m.m24*self.m44,
m.m31*self.m11 + m.m32*self.m21 + m.m33*self.m31 + m.m34*self.m41,
m.m31*self.m12 + m.m32*self.m22 + m.m33*self.m32 + m.m34*self.m42,
m.m31*self.m13 + m.m32*self.m23 + m.m33*self.m33 + m.m34*self.m43,
m.m31*self.m14 + m.m32*self.m24 + m.m33*self.m34 + m.m34*self.m44,
m.m41*self.m11 + m.m42*self.m21 + m.m43*self.m31 + m.m44*self.m41,
m.m41*self.m12 + m.m42*self.m22 + m.m43*self.m32 + m.m44*self.m42,
m.m41*self.m13 + m.m42*self.m23 + m.m43*self.m33 + m.m44*self.m43,
m.m41*self.m14 + m.m42*self.m24 + m.m43*self.m34 + m.m44*self.m44)
}

pub fn mul_s(&self, x: f32) -> Matrix4 {
Matrix4(self.m11 * x, self.m12 * x, self.m13 * x, self.m14 * x,
self.m21 * x, self.m22 * x, self.m23 * x, self.m24 * x,
self.m31 * x, self.m32 * x, self.m33 * x, self.m34 * x,
self.m41 * x, self.m42 * x, self.m43 * x, self.m44 * x)
Matrix4::new(self.m11 * x, self.m12 * x, self.m13 * x, self.m14 * x,
self.m21 * x, self.m22 * x, self.m23 * x, self.m24 * x,
self.m31 * x, self.m32 * x, self.m33 * x, self.m34 * x,
self.m41 * x, self.m42 * x, self.m43 * x, self.m44 * x)
}

pub fn scale(&self, x: f32, y: f32, z: f32) -> Matrix4 {
Matrix4(self.m11 * x, self.m12, self.m13, self.m14,
self.m21 , self.m22 * y, self.m23, self.m24,
self.m31 , self.m32, self.m33 * z, self.m34,
self.m41 , self.m42, self.m43, self.m44)
Matrix4::new(self.m11 * x, self.m12, self.m13, self.m14,
self.m21 , self.m22 * y, self.m23, self.m24,
self.m31 , self.m32, self.m33 * z, self.m34,
self.m41 , self.m42, self.m43, self.m44)
}

/// Returns the given point transformed by this matrix.
#[inline]
pub fn transform_point(&self, p: &Point2D<f32>) -> Point2D<f32> {
Point2D(p.x * self.m11 + p.y * self.m21 + self.m41,
p.x * self.m12 + p.y * self.m22 + self.m42)
Point2D::new(p.x * self.m11 + p.y * self.m21 + self.m41,
p.x * self.m12 + p.y * self.m22 + self.m42)
}

pub fn to_array(&self) -> [f32; 16] {
@@ -94,28 +130,28 @@ impl Matrix4 {
}

pub fn translate(&self, x: f32, y: f32, z: f32) -> Matrix4 {
let matrix = Matrix4(1.0, 0.0, 0.0, 0.0,
0.0, 1.0, 0.0, 0.0,
0.0, 0.0, 1.0, 0.0,
x, y, z, 1.0);
let matrix = Matrix4::new(1.0, 0.0, 0.0, 0.0,
0.0, 1.0, 0.0, 0.0,
0.0, 0.0, 1.0, 0.0,
x, y, z, 1.0);

return self.mul(&matrix);
}

/// Create a 3d translation matrix
pub fn create_translation(x: f32, y: f32, z: f32) -> Matrix4 {
Matrix4(1.0, 0.0, 0.0, 0.0,
0.0, 1.0, 0.0, 0.0,
0.0, 0.0, 1.0, 0.0,
x, y, z, 1.0)
Matrix4::new(1.0, 0.0, 0.0, 0.0,
0.0, 1.0, 0.0, 0.0,
0.0, 0.0, 1.0, 0.0,
x, y, z, 1.0)
}

/// Create a 3d scale matrix
pub fn create_scale(x: f32, y: f32, z: f32) -> Matrix4 {
Matrix4( x, 0.0, 0.0, 0.0,
0.0, y, 0.0, 0.0,
0.0, 0.0, z, 0.0,
0.0, 0.0, 0.0, 1.0)
Matrix4::new( x, 0.0, 0.0, 0.0,
0.0, y, 0.0, 0.0,
0.0, 0.0, z, 0.0,
0.0, 0.0, 0.0, 1.0)
}

/// Create a 3d rotation matrix from an angle / axis.
@@ -129,7 +165,7 @@ impl Matrix4 {
let sc = half_theta.sin() * half_theta.cos();
let sq = half_theta.sin() * half_theta.sin();

Matrix4(
Matrix4::new(
1.0 - 2.0 * (yy + zz) * sq,
2.0 * (x * y * sq - z * sc),
2.0 * (x * z * sq + y * sc),
@@ -154,67 +190,30 @@ impl Matrix4 {

/// Create a 2d skew matrix
pub fn create_skew(sx: f32, sy: f32) -> Matrix4 {
Matrix4(1.0, sx, 0.0, 0.0,
sy, 1.0, 0.0, 0.0,
0.0, 0.0, 1.0, 0.0,
0.0, 0.0, 0.0, 1.0)
Matrix4::new(1.0, sx, 0.0, 0.0,
sy, 1.0, 0.0, 0.0,
0.0, 0.0, 1.0, 0.0,
0.0, 0.0, 0.0, 1.0)
}

/// Create a simple perspective projection matrix
pub fn create_perspective(d: f32) -> Matrix4 {
Matrix4(1.0, 0.0, 0.0, 0.0,
0.0, 1.0, 0.0, 0.0,
0.0, 0.0, 1.0, -1.0 / d,
0.0, 0.0, 0.0, 1.0)
Matrix4::new(1.0, 0.0, 0.0, 0.0,
0.0, 1.0, 0.0, 0.0,
0.0, 0.0, 1.0, -1.0 / d,
0.0, 0.0, 0.0, 1.0)
}
}

// TODO(gw): Move ortho and identity into static functions of the Matrix type.
pub fn ortho(left: f32, right: f32,
bottom: f32, top: f32,
near: f32, far: f32) -> Matrix4 {
let tx = -((right + left) / (right - left));
let ty = -((top + bottom) / (top - bottom));
let tz = -((far + near) / (far - near));

Matrix4(2.0 / (right - left),
0.0,
0.0,
0.0,

0.0,
2.0 / (top - bottom),
0.0,
0.0,

0.0,
0.0,
-2.0 / (far - near),
0.0,

tx,
ty,
tz,
1.0)
}

pub fn identity() -> Matrix4 {
Matrix4(1.0, 0.0, 0.0, 0.0,
0.0, 1.0, 0.0, 0.0,
0.0, 0.0, 1.0, 0.0,
0.0, 0.0, 0.0, 1.0)
}

#[test]
pub fn test_ortho() {
let (left, right, bottom, top) = (0.0f32, 1.0f32, 0.1f32, 1.0f32);
let (near, far) = (-1.0f32, 1.0f32);
let result = ortho(left, right, bottom, top, near, far);
let expected = Matrix4(2.0, 0.0, 0.0, 0.0,
0.0, 2.22222222, 0.0, 0.0,
0.0, 0.0, -1.0, 0.0,
-1.0, -1.22222222, -0.0, 1.0);
let result = Matrix4::ortho(left, right, bottom, top, near, far);
let expected = Matrix4::new(2.0, 0.0, 0.0, 0.0,
0.0, 2.22222222, 0.0, 0.0,
0.0, 0.0, -1.0, 0.0,
-1.0, -1.22222222, -0.0, 1.0);
debug!("result={:?} expected={:?}", result, expected);
assert!(result.approx_eq(&expected));
}

8 src/matrix2d.rs
View file
Open in desktop
@@ -77,8 +77,8 @@ impl<T:Add<T, Output=T> +
/// Returns the given point transformed by this matrix.
#[inline]
pub fn transform_point(&self, point: &Point2D<T>) -> Point2D<T> {
Point2D(point.x * self.m11 + point.y * self.m21 + self.m31,
point.x * self.m12 + point.y * self.m22 + self.m32)
Point2D::new(point.x * self.m11 + point.y * self.m21 + self.m31,
point.x * self.m12 + point.y * self.m22 + self.m32)
}

/// Returns a rectangle that encompasses the result of transforming the given rectangle by this
@@ -105,7 +105,7 @@ impl<T:Add<T, Output=T> +
max_y = point.y.clone()
}
}
Rect(Point2D(min_x.clone(), min_y.clone()), Size2D(max_x - min_x, max_y - min_y))
Rect::new(Point2D::new(min_x.clone(), min_y.clone()),
Size2D::new(max_x - min_x, max_y - min_y))
}
}

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.