瀏覽代碼

Fix some method names

Daniele Bartolini 12 年之前
父節點
當前提交
9ecf8e6430

+ 2 - 2
engine/core/math/Matrix3x3.cpp

@@ -558,7 +558,7 @@ const float* Matrix3x3::to_float_ptr() const
 }
 
 //-----------------------------------------------------------------------------
-Matrix4x4 Matrix3x3::to_mat4() const
+Matrix4x4 Matrix3x3::to_matrix4x4() const
 {
 	Matrix4x4 tmp;
 
@@ -583,7 +583,7 @@ Matrix4x4 Matrix3x3::to_mat4() const
 }
 
 //-----------------------------------------------------------------------------
-Quaternion Matrix3x3::to_quat() const
+Quaternion Matrix3x3::to_quaternion() const
 {
 	Quaternion tmp;
 

+ 2 - 2
engine/core/math/Matrix3x3.h

@@ -151,10 +151,10 @@ public:
 	const float*		to_float_ptr() const;
 
 	/// Returns a 4x4 matrix according to the matrix's rotation portion						
-	Matrix4x4			to_mat4() const;
+	Matrix4x4			to_matrix4x4() const;
 
 	/// Returns a quaternion according to the matrix's rotation portion							
-	Quaternion			to_quat() const;							
+	Quaternion			to_quaternion() const;							
 
 	static const Matrix3x3	IDENTITY;
 };

+ 2 - 2
engine/core/math/Matrix4x4.cpp

@@ -935,7 +935,7 @@ const float* Matrix4x4::to_float_ptr() const
 }
 
 //-----------------------------------------------------------------------------
-Matrix3x3 Matrix4x4::to_mat3() const
+Matrix3x3 Matrix4x4::to_matrix3x3() const
 {
 	Matrix3x3 tmp;
 
@@ -953,7 +953,7 @@ Matrix3x3 Matrix4x4::to_mat3() const
 }
 
 //-----------------------------------------------------------------------------
-Quaternion Matrix4x4::to_quat() const
+Quaternion Matrix4x4::to_quaternion() const
 {
 	Quaternion tmp;
 	float fourWSquaredMinusOne = m[0] + m[5] + m[10];

+ 5 - 5
engine/core/math/Matrix4x4.h

@@ -177,14 +177,14 @@ public:
 	/// Returns the pointer to the matrix's data
 	float*				to_float_ptr();
 
-	/// Returns the pointer to the matrix's data								
+	/// Returns the pointer to the matrix's data
 	const float*		to_float_ptr() const;
 
-	/// Returns a 3x3 matrix according to the matrix's rotation portion						
-	Matrix3x3			to_mat3() const;
+	/// Returns a 3x3 matrix according to the matrix's rotation portion
+	Matrix3x3			to_matrix3x3() const;
 
-	/// Returns a quaternion according to the matrix's rotation portion							
-	Quaternion			to_quat() const;							
+	/// Returns a quaternion according to the matrix's rotation portion
+	Quaternion			to_quaternion() const;
 
 	static const Matrix4x4	IDENTITY;
 };

+ 8 - 8
engine/core/math/Quaternion.cpp

@@ -96,11 +96,11 @@ Quaternion Quaternion::get_inverse() const
 }
 
 //-----------------------------------------------------------------------------
-Matrix3x3 Quaternion::to_mat3() const
+Matrix3x3 Quaternion::to_matrix3x3() const
 {
-	const float& x = v.x;
-	const float& y = v.y;
-	const float& z = v.z;
+	const float x = v.x;
+	const float y = v.y;
+	const float z = v.z;
 
 	Matrix3x3 tmp;
 
@@ -118,11 +118,11 @@ Matrix3x3 Quaternion::to_mat3() const
 }
 
 //-----------------------------------------------------------------------------
-Matrix4x4 Quaternion::to_mat4() const
+Matrix4x4 Quaternion::to_matrix4x4() const
 {
-	const float& x = v.x;
-	const float& y = v.y;
-	const float& z = v.z;
+	const float x = v.x;
+	const float y = v.y;
+	const float z = v.z;
 
 	Matrix4x4 tmp;
 

+ 7 - 7
engine/core/math/Quaternion.h

@@ -77,21 +77,21 @@ public:
 	void				conjugate();
 
 	/// Returns the quaternion's conjugate.
-	Quaternion				get_conjugate() const;
+	Quaternion			get_conjugate() const;
 
 	/// Quaternion's inverse				
-	Quaternion				get_inverse() const;
+	Quaternion			get_inverse() const;
 
-	Matrix3x3				to_mat3() const;
-	Matrix4x4				to_mat4() const;
+	Matrix3x3			to_matrix3x3() const;
+	Matrix4x4			to_matrix4x4() const;
 
 	/// Cross product
-	Quaternion				operator*(const Quaternion& b) const;
+	Quaternion			operator*(const Quaternion& b) const;
 
 	/// Multiplication by a scalar		
-	Quaternion				operator*(const float& k) const;
+	Quaternion			operator*(const float& k) const;
 
-	Quaternion				power(float exp);
+	Quaternion			power(float exp);
 
 public: