From 891736a2d756aaa3a97f529841b15f48d8667ec2 Mon Sep 17 00:00:00 2001 From: Brendan Zabarauskas Date: Tue, 30 Oct 2012 14:35:02 +1000 Subject: [PATCH] improve method names --- src/matrix.rs | 26 ++++++++++++------------ src/quaternion.rs | 10 +++++----- src/test/test_matrix.rs | 6 +++--- src/test/test_vector.rs | 24 +++++++++++----------- src/vector.rs | 44 ++++++++++++++++++++--------------------- 5 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/matrix.rs b/src/matrix.rs index 36cde2a..02d8167 100644 --- a/src/matrix.rs +++ b/src/matrix.rs @@ -15,7 +15,7 @@ pub trait Matrix { pure fn row(i: uint) -> V; pure fn col(i: uint) -> V; - pure fn mul_f(value: T) -> self; + pure fn mul_t(value: T) -> self; pure fn mul_v(other: &V) -> V; pure fn add_m(other: &self) -> self; pure fn sub_m(other: &self) -> self; @@ -112,9 +112,9 @@ pub impl Mat2: Matrix { } #[inline(always)] - pure fn mul_f(value: float) -> Mat2 { - Mat2_v(&self[0].mul_f(value), - &self[1].mul_f(value)) + pure fn mul_t(value: float) -> Mat2 { + Mat2_v(&self[0].mul_t(value), + &self[1].mul_t(value)) } #[inline(always)] @@ -291,10 +291,10 @@ pub impl Mat3: Matrix { } #[inline(always)] - pure fn mul_f(value: float) -> Mat3 { - Mat3_v(&self[0].mul_f(value), - &self[1].mul_f(value), - &self[2].mul_f(value)) + pure fn mul_t(value: float) -> Mat3 { + Mat3_v(&self[0].mul_t(value), + &self[1].mul_t(value), + &self[2].mul_t(value)) } #[inline(always)] @@ -557,11 +557,11 @@ pub impl Mat4: Matrix { } #[inline(always)] - pure fn mul_f(value: float) -> Mat4 { - Mat4_v(&self[0].mul_f(value), - &self[1].mul_f(value), - &self[2].mul_f(value), - &self[3].mul_f(value)) + pure fn mul_t(value: float) -> Mat4 { + Mat4_v(&self[0].mul_t(value), + &self[1].mul_t(value), + &self[2].mul_t(value), + &self[3].mul_t(value)) } #[inline(always)] diff --git a/src/quaternion.rs b/src/quaternion.rs index 5375f0b..a93a574 100644 --- a/src/quaternion.rs +++ b/src/quaternion.rs @@ -13,8 +13,8 @@ use vector::Vec3; pub trait Quaternion { pure fn dim() -> uint; - pure fn mul_f(value: T) -> self; - pure fn div_f(value: T) -> self; + pure fn mul_t(value: T) -> self; + pure fn div_t(value: T) -> self; // pure fn mul_v(other: &Vec3) -> Vec3; @@ -62,7 +62,7 @@ pub impl Quat: Quaternion { pure fn dim() -> uint { 4 } #[inline(always)] - pure fn mul_f(value: float) -> Quat { + pure fn mul_t(value: float) -> Quat { Quat(self[0] * value, self[1] * value, self[2] * value, @@ -70,7 +70,7 @@ pub impl Quat: Quaternion { } #[inline(always)] - pure fn div_f(value: float) -> Quat { + pure fn div_t(value: float) -> Quat { Quat(self[0] / value, self[1] / value, self[2] / value, @@ -108,7 +108,7 @@ pub impl Quat: Quaternion { #[inline(always)] pure fn inverse() -> Quat { - self.conjugate().mul_f((1f / self.magnitude2())) + self.conjugate().mul_t((1f / self.magnitude2())) } #[inline(always)] diff --git a/src/test/test_matrix.rs b/src/test/test_matrix.rs index ce6f957..eb1c473 100644 --- a/src/test/test_matrix.rs +++ b/src/test/test_matrix.rs @@ -31,7 +31,7 @@ fn test_Mat2() { -2f, -4f); assert -a == a.neg(); - assert a.mul_f(f1) == Mat2(0.5f, 1.5f, + assert a.mul_t(f1) == Mat2(0.5f, 1.5f, 1.0f, 2.0f); assert a.mul_v(&v1) == Vec2(5f, 11f); @@ -103,7 +103,7 @@ fn test_Mat3() { -3f, -6f, -9f); assert -a == a.neg(); - assert a.mul_f(f1) == Mat3(0.5f, 2.0f, 3.5f, + assert a.mul_t(f1) == Mat3(0.5f, 2.0f, 3.5f, 1.0f, 2.5f, 4.0f, 1.5f, 3.0f, 4.5f); assert a.mul_v(&v1) == Vec3(14f, 32f, 50f); @@ -196,7 +196,7 @@ fn test_Mat4() { -4f, -8f, -12f, -16f); assert -a == a.neg(); - assert a.mul_f(f1) == Mat4(0.5f, 2.5f, 4.5f, 6.5f, + assert a.mul_t(f1) == Mat4(0.5f, 2.5f, 4.5f, 6.5f, 1.0f, 3.0f, 5.0f, 7.0f, 1.5f, 3.5f, 5.5f, 7.5f, 2.0f, 4.0f, 6.0f, 8.0f); diff --git a/src/test/test_vector.rs b/src/test/test_vector.rs index 6e402ff..8412a71 100644 --- a/src/test/test_vector.rs +++ b/src/test/test_vector.rs @@ -27,10 +27,10 @@ fn test_Vec2() { assert -a == Vec2(-1f, -2f); assert a.neg() == Vec2(-1f, -2f); - assert a.add_f(f1) == Vec2( 2.5f, 3.5f); - assert a.sub_f(f1) == Vec2(-0.5f, 0.5f); - assert a.mul_f(f1) == Vec2( 1.5f, 3.0f); - assert a.div_f(f2) == Vec2( 2.0f, 4.0f); + assert a.add_t(f1) == Vec2( 2.5f, 3.5f); + assert a.sub_t(f1) == Vec2(-0.5f, 0.5f); + assert a.mul_t(f1) == Vec2( 1.5f, 3.0f); + assert a.div_t(f2) == Vec2( 2.0f, 4.0f); assert a.add_v(&b) == Vec2( 4f, 6f); assert a.sub_v(&b) == Vec2(-2f, -2f); @@ -81,10 +81,10 @@ fn test_Vec3() { assert -a == Vec3(-1f, -2f, -3f); assert a.neg() == Vec3(-1f, -2f, -3f); - assert a.add_f(f1) == Vec3( 2.5f, 3.5f, 4.5f); - assert a.sub_f(f1) == Vec3(-0.5f, 0.5f, 1.5f); - assert a.mul_f(f1) == Vec3( 1.5f, 3.0f, 4.5f); - assert a.div_f(f2) == Vec3( 2.0f, 4.0f, 6.0f); + assert a.add_t(f1) == Vec3( 2.5f, 3.5f, 4.5f); + assert a.sub_t(f1) == Vec3(-0.5f, 0.5f, 1.5f); + assert a.mul_t(f1) == Vec3( 1.5f, 3.0f, 4.5f); + assert a.div_t(f2) == Vec3( 2.0f, 4.0f, 6.0f); assert a.add_v(&b) == Vec3( 5f, 7f, 9f); assert a.sub_v(&b) == Vec3(-3f, -3f, -3f); @@ -136,10 +136,10 @@ fn test_Vec4() { assert -a == Vec4(-1f, -2f, -3f, -4f); assert a.neg() == Vec4(-1f, -2f, -3f, -4f); - assert a.add_f(f1) == Vec4( 2.5f, 3.5f, 4.5f, 5.5f); - assert a.sub_f(f1) == Vec4(-0.5f, 0.5f, 1.5f, 2.5f); - assert a.mul_f(f1) == Vec4( 1.5f, 3.0f, 4.5f, 6.0f); - assert a.div_f(f2) == Vec4( 2.0f, 4.0f, 6.0f, 8.0f); + assert a.add_t(f1) == Vec4( 2.5f, 3.5f, 4.5f, 5.5f); + assert a.sub_t(f1) == Vec4(-0.5f, 0.5f, 1.5f, 2.5f); + assert a.mul_t(f1) == Vec4( 1.5f, 3.0f, 4.5f, 6.0f); + assert a.div_t(f2) == Vec4( 2.0f, 4.0f, 6.0f, 8.0f); assert a.add_v(&b) == Vec4( 6f, 8f, 10f, 12f); assert a.sub_v(&b) == Vec4(-4f, -4f, -4f, -4f); diff --git a/src/vector.rs b/src/vector.rs index 45b009c..0d7c953 100644 --- a/src/vector.rs +++ b/src/vector.rs @@ -11,10 +11,10 @@ use math::{ToPtr, Abs, abs, ExactEq, max, min, Sqrt}; pub trait Vector { static pure fn dim() -> uint; - pure fn add_f(value: T) -> self; - pure fn sub_f(value: T) -> self; - pure fn mul_f(value: T) -> self; - pure fn div_f(value: T) -> self; + pure fn add_t(value: T) -> self; + pure fn sub_t(value: T) -> self; + pure fn mul_t(value: T) -> self; + pure fn div_t(value: T) -> self; pure fn add_v(other: &self) -> self; pure fn sub_v(other: &self) -> self; @@ -65,25 +65,25 @@ pub impl Vec2: Vector { static pure fn dim() -> uint { 2 } #[inline(always)] - pure fn add_f(value: float) -> Vec2 { + pure fn add_t(value: float) -> Vec2 { Vec2(self[0] + value, self[1] + value) } #[inline(always)] - pure fn sub_f(value: float) -> Vec2 { + pure fn sub_t(value: float) -> Vec2 { Vec2(self[0] - value, self[1] - value) } #[inline(always)] - pure fn mul_f(value: float) -> Vec2 { + pure fn mul_t(value: float) -> Vec2 { Vec2(self[0] * value, self[1] * value) } #[inline(always)] - pure fn div_f(value: float) -> Vec2 { + pure fn div_t(value: float) -> Vec2 { Vec2(self[0] / value, self[1] / value) } @@ -120,12 +120,12 @@ pub impl Vec2: Vector { #[inline(always)] pure fn normalize() -> Vec2 { let n = 1f / self.magnitude(); - return self.mul_f(n); + return self.mul_t(n); } #[inline(always)] pure fn lerp(other: &Vec2, value: float) -> Vec2 { - self.add_v(&other.sub_v(&self).mul_f(value)) + self.add_v(&other.sub_v(&self).mul_t(value)) } #[inline(always)] @@ -248,28 +248,28 @@ pub impl Vec3: Vector { static pure fn dim() -> uint { 3 } #[inline(always)] - pure fn add_f(value: float) -> Vec3 { + pure fn add_t(value: float) -> Vec3 { Vec3(self[0] + value, self[1] + value, self[2] + value) } #[inline(always)] - pure fn sub_f(value: float) -> Vec3 { + pure fn sub_t(value: float) -> Vec3 { Vec3(self[0] - value, self[1] - value, self[2] - value) } #[inline(always)] - pure fn mul_f(value: float) -> Vec3 { + pure fn mul_t(value: float) -> Vec3 { Vec3(self[0] * value, self[1] * value, self[2] * value) } #[inline(always)] - pure fn div_f(value: float) -> Vec3 { + pure fn div_t(value: float) -> Vec3 { Vec3(self[0] / value, self[1] / value, self[2] / value) @@ -311,12 +311,12 @@ pub impl Vec3: Vector { #[inline(always)] pure fn normalize() -> Vec3 { let n = 1f / self.magnitude(); - return self.mul_f(n); + return self.mul_t(n); } #[inline(always)] pure fn lerp(other: &Vec3, value: float) -> Vec3 { - self.add_v(&other.sub_v(&self).mul_f(value)) + self.add_v(&other.sub_v(&self).mul_t(value)) } #[inline(always)] @@ -435,7 +435,7 @@ pub impl Vec4: Vector { static pure fn dim() -> uint { 4 } #[inline(always)] - pure fn add_f(value: float) -> Vec4 { + pure fn add_t(value: float) -> Vec4 { Vec4(self[0] + value, self[1] + value, self[2] + value, @@ -443,7 +443,7 @@ pub impl Vec4: Vector { } #[inline(always)] - pure fn sub_f(value: float) -> Vec4 { + pure fn sub_t(value: float) -> Vec4 { Vec4(self[0] - value, self[1] - value, self[2] - value, @@ -451,7 +451,7 @@ pub impl Vec4: Vector { } #[inline(always)] - pure fn mul_f(value: float) -> Vec4 { + pure fn mul_t(value: float) -> Vec4 { Vec4(self[0] * value, self[1] * value, self[2] * value, @@ -459,7 +459,7 @@ pub impl Vec4: Vector { } #[inline(always)] - pure fn div_f(value: float) -> Vec4 { + pure fn div_t(value: float) -> Vec4 { Vec4(self[0] / value, self[1] / value, self[2] / value, @@ -506,12 +506,12 @@ pub impl Vec4: Vector { #[inline(always)] pure fn normalize() -> Vec4 { let n = 1f / self.magnitude(); - return self.mul_f(n); + return self.mul_t(n); } #[inline(always)] pure fn lerp(other: &Vec4, value: float) -> Vec4 { - self.add_v(&other.sub_v(&self).mul_f(value)) + self.add_v(&other.sub_v(&self).mul_t(value)) } #[inline(always)]