Optimized Matrix4.Mult by unrolling the multiplications.

This commit is contained in:
the_fiddler 2009-06-19 13:41:32 +00:00
parent 65500986a2
commit 402e0e6714

View file

@ -641,36 +641,43 @@ namespace OpenTK.Math
#region Multiply Functions #region Multiply Functions
/// <summary> /// <summary>
/// Post multiply this matrix by another matrix /// Multiplies two instances.
/// </summary> /// </summary>
/// <param name="left">The left operand of the multiplication.</param> /// <param name="left">The left operand of the multiplication.</param>
/// <param name="right">The right 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> /// <returns>A new instance that is the result of the multiplication</returns>
public static Matrix4 Mult(Matrix4 left, Matrix4 right) public static Matrix4 Mult(Matrix4 left, Matrix4 right)
{ {
Vector4 col0 = right.Column0; Matrix4 result;
Vector4 col1 = right.Column1; Matrix4.Mult(ref left, ref right, out result);
Vector4 col2 = right.Column2; return result;
Vector4 col3 = right.Column3;
left.Row0 = new Vector4(Vector4.Dot(left.Row0, col0), Vector4.Dot(left.Row0, col1), Vector4.Dot(left.Row0, col2), Vector4.Dot(left.Row0, col3));
left.Row1 = new Vector4(Vector4.Dot(left.Row1, col0), Vector4.Dot(left.Row1, col1), Vector4.Dot(left.Row1, col2), Vector4.Dot(left.Row1, col3));
left.Row2 = new Vector4(Vector4.Dot(left.Row2, col0), Vector4.Dot(left.Row2, col1), Vector4.Dot(left.Row2, col2), Vector4.Dot(left.Row2, col3));
left.Row3 = new Vector4(Vector4.Dot(left.Row3, col0), Vector4.Dot(left.Row3, col1), Vector4.Dot(left.Row3, col2), Vector4.Dot(left.Row3, col3));
return left;
} }
/// <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 Matrix4 left, ref Matrix4 right, out Matrix4 result) public static void Mult(ref Matrix4 left, ref Matrix4 right, out Matrix4 result)
{ {
Vector4 col0 = right.Column0; result = new Matrix4();
Vector4 col1 = right.Column1; result.M11 = left.M11 * right.M11 + left.M12 * right.M21 + left.M13 * right.M31 + left.M14 * right.M41;
Vector4 col2 = right.Column2; result.M12 = left.M11 * right.M12 + left.M12 * right.M22 + left.M13 * right.M32 + left.M14 * right.M42;
Vector4 col3 = right.Column3; result.M13 = left.M11 * right.M13 + left.M12 * right.M23 + left.M13 * right.M33 + left.M14 * right.M43;
result.M14 = left.M11 * right.M14 + left.M12 * right.M24 + left.M13 * right.M34 + left.M14 * right.M44;
result.Row0 = new Vector4(Vector4.Dot(left.Row0, col0), Vector4.Dot(left.Row0, col1), Vector4.Dot(left.Row0, col2), Vector4.Dot(left.Row0, col3)); result.M21 = left.M21 * right.M11 + left.M22 * right.M21 + left.M23 * right.M31 + left.M24 * right.M41;
result.Row1 = new Vector4(Vector4.Dot(left.Row1, col0), Vector4.Dot(left.Row1, col1), Vector4.Dot(left.Row1, col2), Vector4.Dot(left.Row1, col3)); result.M22 = left.M21 * right.M12 + left.M22 * right.M22 + left.M23 * right.M32 + left.M24 * right.M42;
result.Row2 = new Vector4(Vector4.Dot(left.Row2, col0), Vector4.Dot(left.Row2, col1), Vector4.Dot(left.Row2, col2), Vector4.Dot(left.Row2, col3)); result.M23 = left.M21 * right.M13 + left.M22 * right.M23 + left.M23 * right.M33 + left.M24 * right.M43;
result.Row3 = new Vector4(Vector4.Dot(left.Row3, col0), Vector4.Dot(left.Row3, col1), Vector4.Dot(left.Row3, col2), Vector4.Dot(left.Row3, col3)); result.M24 = left.M21 * right.M14 + left.M22 * right.M24 + left.M23 * right.M34 + left.M24 * right.M44;
result.M31 = left.M31 * right.M11 + left.M32 * right.M21 + left.M33 * right.M31 + left.M34 * right.M41;
result.M32 = left.M31 * right.M12 + left.M32 * right.M22 + left.M33 * right.M32 + left.M34 * right.M42;
result.M33 = left.M31 * right.M13 + left.M32 * right.M23 + left.M33 * right.M33 + left.M34 * right.M43;
result.M34 = left.M31 * right.M14 + left.M32 * right.M24 + left.M33 * right.M34 + left.M34 * right.M44;
result.M41 = left.M41 * right.M11 + left.M42 * right.M21 + left.M43 * right.M31 + left.M44 * right.M41;
result.M42 = left.M41 * right.M12 + left.M42 * right.M22 + left.M43 * right.M32 + left.M44 * right.M42;
result.M43 = left.M41 * right.M13 + left.M42 * right.M23 + left.M43 * right.M33 + left.M44 * right.M43;
result.M44 = left.M41 * right.M14 + left.M42 * right.M24 + left.M43 * right.M34 + left.M44 * right.M44;
} }
#endregion #endregion
@ -877,7 +884,7 @@ namespace OpenTK.Math
/// <summary> /// <summary>
/// Indicates whether this instance and a specified object are equal. /// Indicates whether this instance and a specified object are equal.
/// </summary> /// </summary>
/// <param name="obj">The object to compare to.</param> /// <param name="obj">The object to compare tresult.</param>
/// <returns>True if the instances are equal; false otherwise.</returns> /// <returns>True if the instances are equal; false otherwise.</returns>
public override bool Equals(object obj) public override bool Equals(object obj)
{ {