Matrix4x2 implementation and documenting the other matrix classes.

This commit is contained in:
Robert Rouhani 2013-01-20 16:38:25 -05:00
parent df78210bc5
commit 31ba0a36b9
10 changed files with 436 additions and 27 deletions

View file

@ -105,7 +105,7 @@ namespace OpenTK
} }
/// <summary> /// <summary>
/// Gets the first column of this matrix. /// Gets or sets the first column of this matrix.
/// </summary> /// </summary>
public Vector2 Column0 public Vector2 Column0
{ {
@ -114,7 +114,7 @@ namespace OpenTK
} }
/// <summary> /// <summary>
/// Gets the second column of this matrix. /// Gets or sets the second column of this matrix.
/// </summary> /// </summary>
public Vector2 Column1 public Vector2 Column1
{ {

View file

@ -88,7 +88,7 @@ namespace OpenTK
#region Properties #region Properties
/// <summary> /// <summary>
/// Gets the first column of this matrix. /// Gets or sets the first column of this matrix.
/// </summary> /// </summary>
public Vector2 Column0 public Vector2 Column0
{ {
@ -97,7 +97,7 @@ namespace OpenTK
} }
/// <summary> /// <summary>
/// Gets the second column of this matrix. /// Gets or sets the second column of this matrix.
/// </summary> /// </summary>
public Vector2 Column1 public Vector2 Column1
{ {
@ -106,7 +106,7 @@ namespace OpenTK
} }
/// <summary> /// <summary>
/// Gets the third column of this matrix. /// Gets or sets the third column of this matrix.
/// </summary> /// </summary>
public Vector2 Column2 public Vector2 Column2
{ {
@ -499,10 +499,6 @@ namespace OpenTK
#endregion #endregion
#region Invert Functions
#endregion
#region Transpose #region Transpose
/// <summary> /// <summary>
@ -690,7 +686,9 @@ namespace OpenTK
#region IEquatable<Matrix2x3> Members #region IEquatable<Matrix2x3> Members
/// <summary>Indicates whether the current matrix is equal to another matrix.</summary> /// <summary>
/// Indicates whether the current matrix is equal to another matrix.
/// </summary>
/// <param name="other">An matrix to compare with this matrix.</param> /// <param name="other">An matrix to compare with this matrix.</param>
/// <returns>true if the current matrix is equal to the matrix parameter; otherwise, false.</returns> /// <returns>true if the current matrix is equal to the matrix parameter; otherwise, false.</returns>
public bool Equals(Matrix2x3 other) public bool Equals(Matrix2x3 other)

View file

@ -27,6 +27,9 @@ using System.Runtime.InteropServices;
namespace OpenTK namespace OpenTK
{ {
/// <summary>
/// Represents a 2x4 matrix.
/// </summary>
public struct Matrix2x4 : IEquatable<Matrix2x4> public struct Matrix2x4 : IEquatable<Matrix2x4>
{ {
#region Fields #region Fields
@ -86,37 +89,80 @@ namespace OpenTK
#region Properties #region Properties
/// <summary>
/// Gets or sets the first column of the matrix.
/// </summary>
public Vector2 Column0 public Vector2 Column0
{ {
get { return new Vector2(Row0.X, Row1.X); } get { return new Vector2(Row0.X, Row1.X); }
set { Row0.X = value.X; Row1.X = value.Y; } set { Row0.X = value.X; Row1.X = value.Y; }
} }
/// <summary>
/// Gets or sets the second column of the matrix.
/// </summary>
public Vector2 Column1 public Vector2 Column1
{ {
get { return new Vector2(Row0.Y, Row1.Y); } get { return new Vector2(Row0.Y, Row1.Y); }
set { Row0.Y = value.X; Row1.Y = value.Y; } set { Row0.Y = value.X; Row1.Y = value.Y; }
} }
/// <summary>
/// Gets or sets the third column of the matrix.
/// </summary>
public Vector2 Column2 public Vector2 Column2
{ {
get { return new Vector2(Row0.Z, Row1.Z); } get { return new Vector2(Row0.Z, Row1.Z); }
set { Row0.Z = value.X; Row1.Z = value.Y; } set { Row0.Z = value.X; Row1.Z = value.Y; }
} }
/// <summary>
/// Gets or sets the fourth column of the matrix.
/// </summary>
public Vector2 Column3 public Vector2 Column3
{ {
get { return new Vector2(Row0.W, Row1.W); } get { return new Vector2(Row0.W, Row1.W); }
set { Row0.W = value.X; Row1.W = value.Y; } set { Row0.W = value.X; Row1.W = value.Y; }
} }
/// <summary>
/// Gets or sets the value at row 1, column 1 of this instance.
/// </summary>
public float M11 { get { return Row0.X; } set { Row0.X = value; } } public float M11 { get { return Row0.X; } set { Row0.X = value; } }
/// <summary>
/// Gets or sets the value at row 1, column 2 of this instance.
/// </summary>
public float M12 { get { return Row0.Y; } set { Row0.Y = value; } } public float M12 { get { return Row0.Y; } set { Row0.Y = value; } }
/// <summary>
/// Gets or sets the value at row 1, column 3 of this instance.
/// </summary>
public float M13 { get { return Row0.Z; } set { Row0.Z = value; } } public float M13 { get { return Row0.Z; } set { Row0.Z = value; } }
/// <summary>
/// Gets or sets the value at row 1, column 4 of this instance.
/// </summary>
public float M14 { get { return Row0.W; } set { Row0.W = value; } } public float M14 { get { return Row0.W; } set { Row0.W = value; } }
/// <summary>
/// Gets or sets the value at row 2, column 1 of this instance.
/// </summary>
public float M21 { get { return Row1.X; } set { Row1.X = value; } } public float M21 { get { return Row1.X; } set { Row1.X = value; } }
/// <summary>
/// Gets or sets the value at row 2, column 2 of this instance.
/// </summary>
public float M22 { get { return Row1.Y; } set { Row1.Y = value; } } public float M22 { get { return Row1.Y; } set { Row1.Y = value; } }
/// <summary>
/// Gets or sets the value at row 2, column 3 of this instance.
/// </summary>
public float M23 { get { return Row1.Z; } set { Row1.Z = value; } } public float M23 { get { return Row1.Z; } set { Row1.Z = value; } }
/// <summary>
/// Gets or sets the value at row 2, column 4 of this instance.
/// </summary>
public float M24 { get { return Row1.W; } set { Row1.W = value; } } public float M24 { get { return Row1.W; } set { Row1.W = value; } }
#endregion #endregion
@ -488,10 +534,6 @@ namespace OpenTK
#endregion #endregion
#region Invert Functions
#endregion
#region Transpose #region Transpose
/// <summary> /// <summary>
@ -681,6 +723,11 @@ namespace OpenTK
#region IEquatable<Matrix2x4> Members #region IEquatable<Matrix2x4> Members
/// <summary>
/// Indicates whether the current matrix is equal to another matrix.
/// </summary>
/// <param name="other">An matrix to compare with this matrix.</param>
/// <returns>true if the current matrix is equal to the matrix parameter; otherwise, false.</returns>
public bool Equals(Matrix2x4 other) public bool Equals(Matrix2x4 other)
{ {
return return

View file

@ -439,7 +439,7 @@ namespace OpenTK
/// <param name="x">Scale factor for the x axis.</param> /// <param name="x">Scale factor for the x axis.</param>
/// <param name="y">Scale factor for the y axis.</param> /// <param name="y">Scale factor for the y axis.</param>
/// <param name="z">Scale factor for the z axis.</param> /// <param name="z">Scale factor for the z axis.</param>
/// <param name="result">A scale matrix.</returns> /// <param name="result">A scale matrix.</param>
public static void CreateScale(float x, float y, float z, out Matrix3 result) public static void CreateScale(float x, float y, float z, out Matrix3 result)
{ {
result = Identity; result = Identity;

View file

@ -435,7 +435,7 @@ namespace OpenTK
/// <param name="x">Scale factor for the x axis.</param> /// <param name="x">Scale factor for the x axis.</param>
/// <param name="y">Scale factor for the y axis.</param> /// <param name="y">Scale factor for the y axis.</param>
/// <param name="z">Scale factor for the z axis.</param> /// <param name="z">Scale factor for the z axis.</param>
/// <param name="result">A scale matrix.</returns> /// <param name="result">A scale matrix.</param>
public static void CreateScale(double x, double y, double z, out Matrix3d result) public static void CreateScale(double x, double y, double z, out Matrix3d result)
{ {
result = Identity; result = Identity;

View file

@ -27,6 +27,9 @@ using System.Runtime.InteropServices;
namespace OpenTK namespace OpenTK
{ {
/// <summary>
/// Represents a 3x2 matrix.
/// </summary>
public struct Matrix3x2 : IEquatable<Matrix3x2> public struct Matrix3x2 : IEquatable<Matrix3x2>
{ {
#region Fields #region Fields
@ -93,23 +96,52 @@ namespace OpenTK
#region Properties #region Properties
/// <summary>
/// Gets or sets the first column of this matrix.
/// </summary>
public Vector3 Column0 public Vector3 Column0
{ {
get { return new Vector3(Row0.X, Row1.X, Row2.X); } get { return new Vector3(Row0.X, Row1.X, Row2.X); }
set { Row0.X = value.X; Row1.X = value.Y; Row2.X = value.Z; } set { Row0.X = value.X; Row1.X = value.Y; Row2.X = value.Z; }
} }
/// <summary>
/// Gets or sets the second column of this matrix.
/// </summary>
public Vector3 Column1 public Vector3 Column1
{ {
get { return new Vector3(Row0.Y, Row1.Y, Row2.Y); } get { return new Vector3(Row0.Y, Row1.Y, Row2.Y); }
set { Row0.Y = value.X; Row1.Y = value.Y; Row2.Y = value.Z; } set { Row0.Y = value.X; Row1.Y = value.Y; Row2.Y = value.Z; }
} }
/// <summary>
/// Gets or sets the value at row 1, column 1 of this instance.
/// </summary>
public float M11 { get { return Row0.X; } set { Row0.X = value; } } public float M11 { get { return Row0.X; } set { Row0.X = value; } }
/// <summary>
/// Gets or sets the value at row 1, column 2 of this instance.
/// </summary>
public float M12 { get { return Row0.Y; } set { Row0.Y = value; } } public float M12 { get { return Row0.Y; } set { Row0.Y = value; } }
/// <summary>
/// Gets or sets the value at row 2, column 1 of this instance.
/// </summary>
public float M21 { get { return Row1.X; } set { Row1.X = value; } } public float M21 { get { return Row1.X; } set { Row1.X = value; } }
/// <summary>
/// Gets or sets the value at row 2, column 2 of this instance.
/// </summary>
public float M22 { get { return Row1.Y; } set { Row1.Y = value; } } public float M22 { get { return Row1.Y; } set { Row1.Y = value; } }
/// <summary>
/// Gets or sets the value at row 3, column 1 of this instance.
/// </summary>
public float M31 { get { return Row2.X; } set { Row2.X = value; } } public float M31 { get { return Row2.X; } set { Row2.X = value; } }
/// <summary>
/// Gets or sets the value at row 3, column 2 of this instance.
/// </summary>
public float M32 { get { return Row2.Y; } set { Row2.Y = value; } } public float M32 { get { return Row2.Y; } set { Row2.Y = value; } }
#endregion #endregion
@ -478,10 +510,6 @@ namespace OpenTK
#endregion #endregion
#region Invert Functions
#endregion
#region Transpose #region Transpose
/// <summary> /// <summary>
@ -669,6 +697,11 @@ namespace OpenTK
#region IEquatable<Matrix3x2> Members #region IEquatable<Matrix3x2> Members
/// <summary>
/// Indicates whether the current matrix is equal to another matrix.
/// </summary>
/// <param name="other">An matrix to compare with this matrix.</param>
/// <returns>true if the current matrix is equal to the matrix parameter; otherwise, false.</returns>
public bool Equals(Matrix3x2 other) public bool Equals(Matrix3x2 other)
{ {
return return

View file

@ -832,7 +832,9 @@ namespace OpenTK
#region IEquatable<Matrix3x4> Members #region IEquatable<Matrix3x4> Members
/// <summary>Indicates whether the current matrix is equal to another matrix.</summary> /// <summary>
/// Indicates whether the current matrix is equal to another matrix.
/// </summary>
/// <param name="other">An matrix to compare with this matrix.</param> /// <param name="other">An matrix to compare with this matrix.</param>
/// <returns>true if the current matrix is equal to the matrix parameter; otherwise, false.</returns> /// <returns>true if the current matrix is equal to the matrix parameter; otherwise, false.</returns>
public bool Equals(Matrix3x4 other) public bool Equals(Matrix3x4 other)

View file

@ -630,7 +630,7 @@ namespace OpenTK
/// <param name="x">Scale factor for the x axis.</param> /// <param name="x">Scale factor for the x axis.</param>
/// <param name="y">Scale factor for the y axis.</param> /// <param name="y">Scale factor for the y axis.</param>
/// <param name="z">Scale factor for the z axis.</param> /// <param name="z">Scale factor for the z axis.</param>
/// <param name="result">A scale matrix.</returns> /// <param name="result">A scale matrix.</param>
public static void CreateScale(float x, float y, float z, out Matrix4 result) public static void CreateScale(float x, float y, float z, out Matrix4 result)
{ {
result = Identity; result = Identity;

View file

@ -108,25 +108,62 @@ namespace OpenTK
#region Properties #region Properties
/// <summary>
/// Gets or sets the first column of this matrix.
/// </summary>
public Vector4 Column0 public Vector4 Column0
{ {
get { return new Vector4(Row0.X, Row1.X, Row2.X, Row3.X); } get { return new Vector4(Row0.X, Row1.X, Row2.X, Row3.X); }
set { Row0.X = value.X; Row1.X = value.Y; Row2.X = value.Z; Row3.X = value.W; } set { Row0.X = value.X; Row1.X = value.Y; Row2.X = value.Z; Row3.X = value.W; }
} }
/// <summary>
/// Gets or sets the second column of this matrix.
/// </summary>
public Vector4 Column1 public Vector4 Column1
{ {
get { return new Vector4(Row0.Y, Row1.Y, Row2.Y, Row3.X); } get { return new Vector4(Row0.Y, Row1.Y, Row2.Y, Row3.X); }
set { Row0.Y = value.X; Row1.Y = value.Y; Row2.Y = value.Z; Row3.Y = value.W; } set { Row0.Y = value.X; Row1.Y = value.Y; Row2.Y = value.Z; Row3.Y = value.W; }
} }
/// <summary>
/// Gets or sets the value at row 1, column 1 of this instance.
/// </summary>
public float M11 { get { return Row0.X; } set { Row0.X = value; } } public float M11 { get { return Row0.X; } set { Row0.X = value; } }
/// <summary>
/// Gets or sets the value at row 1, column 2 of this instance.
/// </summary>
public float M12 { get { return Row0.Y; } set { Row0.Y = value; } } public float M12 { get { return Row0.Y; } set { Row0.Y = value; } }
/// <summary>
/// Gets or sets the value at row 2, column 1 of this instance.
/// </summary>
public float M21 { get { return Row1.X; } set { Row1.X = value; } } public float M21 { get { return Row1.X; } set { Row1.X = value; } }
/// <summary>
/// Gets or sets the value at row 2, column 2 of this instance.
/// </summary>
public float M22 { get { return Row1.Y; } set { Row1.Y = value; } } public float M22 { get { return Row1.Y; } set { Row1.Y = value; } }
/// <summary>
/// Gets or sets the value at row 3, column 1 of this instance.
/// </summary>
public float M31 { get { return Row2.X; } set { Row2.X = value; } } public float M31 { get { return Row2.X; } set { Row2.X = value; } }
/// <summary>
/// Gets or sets the value at row 3, column 2 of this instance.
/// </summary>
public float M32 { get { return Row2.Y; } set { Row2.Y = value; } } public float M32 { get { return Row2.Y; } set { Row2.Y = value; } }
/// <summary>
/// Gets or sets the value at row 4, column 1 of this instance.
/// </summary>
public float M41 { get { return Row3.X; } set { Row3.X = value; } } public float M41 { get { return Row3.X; } set { Row3.X = value; } }
/// <summary>
/// Gets or sets the value at row 4, column 2 of this instance.
/// </summary>
public float M42 { get { return Row3.Y; } set { Row3.Y = value; } } public float M42 { get { return Row3.Y; } set { Row3.Y = value; } }
#endregion #endregion
@ -360,28 +397,302 @@ namespace OpenTK
return result; return result;
} }
/// <summary>
/// Multiplies two instances.
/// </summary>
/// <param name="left">The left operand of the multiplication.</param>
/// <param name="right">The right operand of the multiplication.</param>
/// <param name="result">A new instance that is the result of the multiplication.</param>
public static void Mult(ref Matrix4x2 left, ref Matrix2x3 right, out Matrix4x3 result)
{
float lM11 = left.Row0.X, lM12 = left.Row0.Y,
lM21 = left.Row1.X, lM22 = left.Row1.Y,
lM31 = left.Row2.X, lM32 = left.Row2.Y,
lM41 = left.Row3.X, lM42 = left.Row3.Y,
rM11 = right.Row0.X, rM12 = right.Row0.Y, rM13 = right.Row0.Z,
rM21 = right.Row1.X, rM22 = right.Row1.Y, rM23 = right.Row1.Z;
result.Row0.X = (lM11 * rM11) + (lM12 * rM21);
result.Row0.Y = (lM11 * rM12) + (lM12 * rM22);
result.Row0.Z = (lM11 * rM13) + (lM12 * rM23);
result.Row1.X = (lM21 * rM11) + (lM22 * rM21);
result.Row1.Y = (lM21 * rM12) + (lM22 * rM22);
result.Row1.Z = (lM21 * rM13) + (lM22 * rM23);
result.Row2.X = (lM31 * rM11) + (lM32 * rM21);
result.Row2.Y = (lM31 * rM12) + (lM32 * rM22);
result.Row2.Z = (lM31 * rM13) + (lM32 * rM23);
result.Row3.X = (lM41 * rM11) + (lM42 * rM21);
result.Row3.Y = (lM41 * rM12) + (lM42 * rM22);
result.Row3.Z = (lM41 * rM13) + (lM42 * rM23);
}
/// <summary>
/// Multiplies two instances.
/// </summary>
/// <param name="left">The left operand of the multiplication.</param>
/// <param name="right">The right operand of the multiplication.</param>
/// <returns>A new instance that is the result of the multiplication.</returns>
public static Matrix4x3 Mult(Matrix4x2 left, Matrix2x3 right)
{
Matrix4x3 result;
Mult(ref left, ref right, out result);
return result;
}
/// <summary>
/// Multiplies two instances.
/// </summary>
/// <param name="left">The left operand of the multiplication.</param>
/// <param name="right">The right operand of the multiplication.</param>
/// <param name="result">A new instance that is the result of the multiplication.</param>
public static void Mult(ref Matrix4x2 left, ref Matrix2x4 right, out Matrix4 result)
{
float lM11 = left.Row0.X, lM12 = left.Row0.Y,
lM21 = left.Row1.X, lM22 = left.Row1.Y,
lM31 = left.Row2.X, lM32 = left.Row2.Y,
lM41 = left.Row3.X, lM42 = left.Row3.Y,
rM11 = right.Row0.X, rM12 = right.Row0.Y, rM13 = right.Row0.Z, rM14 = right.Row0.W,
rM21 = right.Row1.X, rM22 = right.Row1.Y, rM23 = right.Row1.Z, rM24 = right.Row1.W;
result.Row0.X = (lM11 * rM11) + (lM12 * rM21);
result.Row0.Y = (lM11 * rM12) + (lM12 * rM22);
result.Row0.Z = (lM11 * rM13) + (lM12 * rM23);
result.Row0.W = (lM11 * rM14) + (lM12 * rM24);
result.Row1.X = (lM21 * rM11) + (lM22 * rM21);
result.Row1.Y = (lM21 * rM12) + (lM22 * rM22);
result.Row1.Z = (lM21 * rM13) + (lM22 * rM23);
result.Row1.W = (lM21 * rM14) + (lM22 * rM24);
result.Row2.X = (lM31 * rM11) + (lM32 * rM21);
result.Row2.Y = (lM31 * rM12) + (lM32 * rM22);
result.Row2.Z = (lM31 * rM13) + (lM32 * rM23);
result.Row2.W = (lM31 * rM14) + (lM32 * rM24);
result.Row3.X = (lM41 * rM11) + (lM42 * rM21);
result.Row3.Y = (lM41 * rM12) + (lM42 * rM22);
result.Row3.Z = (lM41 * rM13) + (lM42 * rM23);
result.Row3.W = (lM41 * rM14) + (lM42 * rM24);
}
/// <summary>
/// Multiplies two instances.
/// </summary>
/// <param name="left">The left operand of the multiplication.</param>
/// <param name="right">The right operand of the multiplication.</param>
/// <returns>A new instance that is the result of the multiplication.</returns>
public static Matrix4 Mult(Matrix4x2 left, Matrix2x4 right)
{
Matrix4 result;
Mult(ref left, ref right, out result);
return result;
}
#endregion #endregion
#region Add #region Add
#endregion /// <summary>
/// Adds two instances.
/// </summary>
/// <param name="left">The left operand of the addition.</param>
/// <param name="right">The right operand of the addition.</param>
/// <param name="result">A new instance that is the result of the addition.</param>
public static void Add(ref Matrix4x2 left, ref Matrix4x2 right, out Matrix4x2 result)
{
result.Row0.X = left.Row0.X + right.Row0.X;
result.Row0.Y = left.Row0.Y + right.Row0.Y;
result.Row1.X = left.Row1.X + right.Row1.X;
result.Row1.Y = left.Row1.Y + right.Row1.Y;
result.Row2.X = left.Row2.X + right.Row2.X;
result.Row2.Y = left.Row2.Y + right.Row2.Y;
result.Row3.X = left.Row3.X + right.Row3.X;
result.Row3.Y = left.Row3.Y + right.Row3.Y;
}
#region Subtact /// <summary>
/// Adds two instances.
/// </summary>
/// <param name="left">The left operand of the addition.</param>
/// <param name="right">The right operand of the addition.</param>
/// <returns>A new instance that is the result of the addition.</returns>
public static Matrix4x2 Add(Matrix4x2 left, Matrix4x2 right)
{
Matrix4x2 result;
Add(ref left, ref right, out result);
return result;
}
#endregion #endregion
#region Invert Functions #region Subtract
/// <summary>
/// Subtracts two instances.
/// </summary>
/// <param name="left">The left operand of the subtraction.</param>
/// <param name="right">The right operand of the subtraction.</param>
/// <param name="result">A new instance that is the result of the subtraction.</param>
public static void Subtract(ref Matrix4x2 left, ref Matrix4x2 right, out Matrix4x2 result)
{
result.Row0.X = left.Row0.X - right.Row0.X;
result.Row0.Y = left.Row0.Y - right.Row0.Y;
result.Row1.X = left.Row1.X - right.Row1.X;
result.Row1.Y = left.Row1.Y - right.Row1.Y;
result.Row2.X = left.Row2.X - right.Row2.X;
result.Row2.Y = left.Row2.Y - right.Row2.Y;
result.Row3.X = left.Row3.X - right.Row3.X;
result.Row3.Y = left.Row3.Y - right.Row3.Y;
}
/// <summary>
/// Subtracts two instances.
/// </summary>
/// <param name="left">The left operand of the subtraction.</param>
/// <param name="right">The right operand of the subtraction.</param>
/// <returns>A new instance that is the result of the subtraction.</returns>
public static Matrix4x2 Subtract(Matrix4x2 left, Matrix4x2 right)
{
Matrix4x2 result;
Subtract(ref left, ref right, out result);
return result;
}
#endregion #endregion
#region Transpose #region Transpose
/// <summary>
/// Calculate the transpose of the given matrix.
/// </summary>
/// <param name="mat">The matrix to transpose.</param>
/// <param name="result">The transpose of the given matrix.</param>
public static void Transpose(ref Matrix4x2 mat, out Matrix2x4 result)
{
result.Row0.X = mat.Row0.X;
result.Row0.Y = mat.Row1.X;
result.Row0.Z = mat.Row2.X;
result.Row0.W = mat.Row3.X;
result.Row1.X = mat.Row0.Y;
result.Row1.Y = mat.Row1.Y;
result.Row1.Z = mat.Row2.Y;
result.Row1.W = mat.Row3.Y;
}
/// <summary>
/// Calculate the transpose of the given matrix.
/// </summary>
/// <param name="mat">The matrix to transpose.</param>
/// <returns>The transpose of the given matrix.</returns>
public static Matrix2x4 Transpose(Matrix4x2 mat)
{
Matrix2x4 result;
Transpose(ref mat, out result);
return result;
}
#endregion #endregion
#endregion #endregion
#region Operators #region Operators
/// <summary>
/// Scalar multiplication.
/// </summary>
/// <param name="left">left-hand operand</param>
/// <param name="right">right-hand operand</param>
/// <returns>A new Matrix4x2 which holds the result of the multiplication</returns>
public static Matrix4x2 operator *(float left, Matrix4x2 right)
{
return Mult(right, left);
}
/// <summary>
/// Scalar multiplication.
/// </summary>
/// <param name="left">left-hand operand</param>
/// <param name="right">right-hand operand</param>
/// <returns>A new Matrix4x2 which holds the result of the multiplication</returns>
public static Matrix4x2 operator *(Matrix4x2 left, float right)
{
return Mult(left, right);
}
/// <summary>
/// Matrix multiplication
/// </summary>
/// <param name="left">left-hand operand</param>
/// <param name="right">right-hand operand</param>
/// <returns>A new Matrix2 which holds the result of the multiplication</returns>
public static Matrix4x2 operator *(Matrix4x2 left, Matrix2 right)
{
return Mult(left, right);
}
/// <summary>
/// Matrix multiplication
/// </summary>
/// <param name="left">left-hand operand</param>
/// <param name="right">right-hand operand</param>
/// <returns>A new Matrix4x3 which holds the result of the multiplication</returns>
public static Matrix4x3 operator *(Matrix4x2 left, Matrix2x3 right)
{
return Mult(left, right);
}
/// <summary>
/// Matrix multiplication
/// </summary>
/// <param name="left">left-hand operand</param>
/// <param name="right">right-hand operand</param>
/// <returns>A new Matrix4 which holds the result of the multiplication</returns>
public static Matrix4 operator *(Matrix4x2 left, Matrix2x4 right)
{
return Mult(left, right);
}
/// <summary>
/// Matrix addition
/// </summary>
/// <param name="left">left-hand operand</param>
/// <param name="right">right-hand operand</param>
/// <returns>A new Matrix4x2 which holds the result of the addition</returns>
public static Matrix4x2 operator +(Matrix4x2 left, Matrix4x2 right)
{
return Add(left, right);
}
/// <summary>
/// Matrix subtraction
/// </summary>
/// <param name="left">left-hand operand</param>
/// <param name="right">right-hand operand</param>
/// <returns>A new Matrix4x2 which holds the result of the subtraction</returns>
public static Matrix4x2 operator -(Matrix4x2 left, Matrix4x2 right)
{
return Subtract(left, right);
}
/// <summary>
/// Compares two instances for equality.
/// </summary>
/// <param name="left">The first instance.</param>
/// <param name="right">The second instance.</param>
/// <returns>True, if left equals right; false otherwise.</returns>
public static bool operator ==(Matrix4x2 left, Matrix4x2 right)
{
return left.Equals(right);
}
/// <summary>
/// Compares two instances for inequality.
/// </summary>
/// <param name="left">The first instance.</param>
/// <param name="right">The second instance.</param>
/// <returns>True, if left does not equal right; false otherwise.</returns>
public static bool operator !=(Matrix4x2 left, Matrix4x2 right)
{
return !left.Equals(right);
}
#endregion #endregion
#region Overrides #region Overrides
@ -435,6 +746,11 @@ namespace OpenTK
#region IEquatable<Matrix4x2> Members #region IEquatable<Matrix4x2> Members
/// <summary>
/// Indicates whether the current matrix is equal to another matrix.
/// </summary>
/// <param name="other">An matrix to compare with this matrix.</param>
/// <returns>true if the current matrix is equal to the matrix parameter; otherwise, false.</returns>
public bool Equals(Matrix4x2 other) public bool Equals(Matrix4x2 other)
{ {
return return

View file

@ -28,7 +28,7 @@ using System.Runtime.InteropServices;
namespace OpenTK namespace OpenTK
{ {
/// <summary> /// <summary>
/// Represents a 3x4 Matrix /// Represents a 3x4 matrix.
/// </summary> /// </summary>
[Serializable] [Serializable]
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
@ -70,7 +70,7 @@ namespace OpenTK
/// </summary> /// </summary>
/// <param name="row0">Top row of the matrix</param> /// <param name="row0">Top row of the matrix</param>
/// <param name="row1">Second row of the matrix</param> /// <param name="row1">Second row of the matrix</param>
/// <param name="row1">Third row of the matrix</param> /// <param name="row2">Third row of the matrix</param>
/// <param name="row3">Bottom row of the matrix</param> /// <param name="row3">Bottom row of the matrix</param>
public Matrix4x3(Vector3 row0, Vector3 row1, Vector3 row2, Vector3 row3) public Matrix4x3(Vector3 row0, Vector3 row1, Vector3 row2, Vector3 row3)
{ {
@ -804,6 +804,10 @@ namespace OpenTK
#region public override string ToString() #region public override string ToString()
/// <summary>
/// Returns a System.String that represents the current Matrix4x3.
/// </summary>
/// <returns>The string representation of the matrix.</returns>
public override string ToString() public override string ToString()
{ {
return string.Format("{0}\n{1}\n{2}", Row0, Row1, Row2); return string.Format("{0}\n{1}\n{2}", Row0, Row1, Row2);
@ -813,6 +817,10 @@ namespace OpenTK
#region public override int GetHashCode() #region public override int GetHashCode()
/// <summary>
/// Returns the hashcode for this instance.
/// </summary>
/// <returns>A System.Int32 containing the unique hashcode for this instance.</returns>
public override int GetHashCode() public override int GetHashCode()
{ {
return Row0.GetHashCode() ^ Row1.GetHashCode() ^ Row2.GetHashCode(); return Row0.GetHashCode() ^ Row1.GetHashCode() ^ Row2.GetHashCode();
@ -822,6 +830,11 @@ namespace OpenTK
#region public override bool Equals(object obj) #region public override bool Equals(object obj)
/// <summary>
/// Indicates whether this instance and a specified object are equal.
/// </summary>
/// <param name="obj">The object to compare tresult.</param>
/// <returns>True if the instances are equal; false otherwise.</returns>
public override bool Equals(object obj) public override bool Equals(object obj)
{ {
if (!(obj is Matrix4x3)) if (!(obj is Matrix4x3))