зеркало из https://github.com/stride3d/opentk.git
Merge branch 'master' of github.com:andykorth/opentk
Conflicts: Source/OpenTK/Math/Matrix3.cs Source/OpenTK/Math/Matrix3d.cs
This commit is contained in:
Robert Rouhani
Коммит
920d683954
|
|
@ -322,9 +322,9 @@ namespace OpenTK
|
|||
#region GetDisplay
|
||||
|
||||
/// <summary>
|
||||
/// Gets the <see cref="DisplayDevice"/> for the specified <see cref="DeviceIndex"/>.
|
||||
/// Gets the <see cref="DisplayDevice"/> for the specified <see cref="DisplayIndex"/>.
|
||||
/// </summary>
|
||||
/// <param name="index">The <see cref="DeviceIndex"/> that defines the desired display.</param>
|
||||
/// <param name="index">The <see cref="DisplayIndex"/> that defines the desired display.</param>
|
||||
/// <returns>A <see cref="DisplayDevice"/> or null, if no device corresponds to the specified index.</returns>
|
||||
public static DisplayDevice GetDisplay(DisplayIndex index)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -233,6 +233,9 @@ namespace OpenTK
|
|||
|
||||
#region public void Invert()
|
||||
|
||||
/// <summary>
|
||||
/// Converts this instance into its inverse.
|
||||
/// </summary>
|
||||
public void Invert()
|
||||
{
|
||||
this = Matrix3.Invert(this);
|
||||
|
|
@ -241,7 +244,10 @@ namespace OpenTK
|
|||
#endregion
|
||||
|
||||
#region public void Transpose()
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Converts this instance into its transpose.
|
||||
/// </summary>
|
||||
public void Transpose()
|
||||
{
|
||||
this = Matrix3.Transpose(this);
|
||||
|
|
@ -254,7 +260,13 @@ namespace OpenTK
|
|||
#region Static
|
||||
|
||||
#region CreateFromAxisAngle
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Build a rotation matrix from the specified axis/angle rotation.
|
||||
/// </summary>
|
||||
/// <param name="axis">The axis to rotate about.</param>
|
||||
/// <param name="angle">Angle in radians to rotate counter-clockwise (looking in the direction of the given axis).</param>
|
||||
/// <param name="result">A matrix instance.</param>
|
||||
public static void CreateFromAxisAngle(Vector3 axis, float angle, out Matrix3 result)
|
||||
{
|
||||
//normalize and create a local copy of the vector.
|
||||
|
|
@ -288,7 +300,13 @@ namespace OpenTK
|
|||
result.Row2.Y = tYZ + sinX;
|
||||
result.Row2.Z = tZZ + cos;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Build a rotation matrix from the specified axis/angle rotation.
|
||||
/// </summary>
|
||||
/// <param name="axis">The axis to rotate about.</param>
|
||||
/// <param name="angle">Angle in radians to rotate counter-clockwise (looking in the direction of the given axis).</param>
|
||||
/// <returns>A matrix instance.</returns>
|
||||
public static Matrix3 CreateFromAxisAngle(Vector3 axis, float angle)
|
||||
{
|
||||
Matrix3 result;
|
||||
|
|
@ -299,7 +317,12 @@ namespace OpenTK
|
|||
#endregion
|
||||
|
||||
#region CreateFromQuaternion
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Build a rotation matrix from the specified quaternion.
|
||||
/// </summary>
|
||||
/// <param name="q">Quaternion to translate.</param>
|
||||
/// <param name="result">Matrix result.</param>
|
||||
public static void CreateFromQuaternion(ref Quaternion q, out Matrix3 result)
|
||||
{
|
||||
Vector3 axis;
|
||||
|
|
@ -307,7 +330,12 @@ namespace OpenTK
|
|||
q.ToAxisAngle(out axis, out angle);
|
||||
CreateFromAxisAngle(axis, angle, out result);
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Build a rotation matrix from the specified quaternion.
|
||||
/// </summary>
|
||||
/// <param name="q">Quaternion to translate.</param>
|
||||
/// <returns>A matrix instance.</returns>
|
||||
public static Matrix3 CreateFromQuaternion(Quaternion q)
|
||||
{
|
||||
Matrix3 result;
|
||||
|
|
@ -318,7 +346,12 @@ namespace OpenTK
|
|||
#endregion
|
||||
|
||||
#region CreateRotation[XYZ]
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Builds a rotation matrix for a rotation around the x-axis.
|
||||
/// </summary>
|
||||
/// <param name="angle">The counter-clockwise angle in radians.</param>
|
||||
/// <param name="result">The resulting Matrix3 instance.</param>
|
||||
public static void CreateRotationX(float angle, out Matrix3 result)
|
||||
{
|
||||
float cos = (float)System.Math.Cos(angle);
|
||||
|
|
@ -330,14 +363,24 @@ namespace OpenTK
|
|||
result.Row2.Y = -sin;
|
||||
result.Row2.Z = cos;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Builds a rotation matrix for a rotation around the x-axis.
|
||||
/// </summary>
|
||||
/// <param name="angle">The counter-clockwise angle in radians.</param>
|
||||
/// <returns>The resulting Matrix3 instance.</returns>
|
||||
public static Matrix3 CreateRotationX(float angle)
|
||||
{
|
||||
Matrix3 result;
|
||||
CreateRotationX(angle, out result);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Builds a rotation matrix for a rotation around the y-axis.
|
||||
/// </summary>
|
||||
/// <param name="angle">The counter-clockwise angle in radians.</param>
|
||||
/// <param name="result">The resulting Matrix3 instance.</param>
|
||||
public static void CreateRotationY(float angle, out Matrix3 result)
|
||||
{
|
||||
float cos = (float)System.Math.Cos(angle);
|
||||
|
|
@ -349,14 +392,24 @@ namespace OpenTK
|
|||
result.Row2.X = sin;
|
||||
result.Row2.Z = cos;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Builds a rotation matrix for a rotation around the y-axis.
|
||||
/// </summary>
|
||||
/// <param name="angle">The counter-clockwise angle in radians.</param>
|
||||
/// <returns>The resulting Matrix3 instance.</returns>
|
||||
public static Matrix3 CreateRotationY(float angle)
|
||||
{
|
||||
Matrix3 result;
|
||||
CreateRotationY(angle, out result);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Builds a rotation matrix for a rotation around the z-axis.
|
||||
/// </summary>
|
||||
/// <param name="angle">The counter-clockwise angle in radians.</param>
|
||||
/// <param name="result">The resulting Matrix3 instance.</param>
|
||||
public static void CreateRotationZ(float angle, out Matrix3 result)
|
||||
{
|
||||
float cos = (float)System.Math.Cos(angle);
|
||||
|
|
@ -368,7 +421,12 @@ namespace OpenTK
|
|||
result.Row1.X = -sin;
|
||||
result.Row1.Y = cos;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Builds a rotation matrix for a rotation around the z-axis.
|
||||
/// </summary>
|
||||
/// <param name="angle">The counter-clockwise angle in radians.</param>
|
||||
/// <returns>The resulting Matrix3 instance.</returns>
|
||||
public static Matrix3 CreateRotationZ(float angle)
|
||||
{
|
||||
Matrix3 result;
|
||||
|
|
@ -462,14 +520,26 @@ namespace OpenTK
|
|||
#endregion
|
||||
|
||||
#region Multiply Functions
|
||||
|
||||
|
||||
/// <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 Matrix3 Mult(Matrix3 left, Matrix3 right)
|
||||
{
|
||||
Matrix3 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 Matrix3 left, ref Matrix3 right, out Matrix3 result)
|
||||
{
|
||||
float lM11 = left.Row0.X, lM12 = left.Row0.Y, lM13 = left.Row0.Z,
|
||||
|
|
@ -618,12 +688,22 @@ namespace OpenTK
|
|||
#endregion
|
||||
|
||||
#region Transpose
|
||||
|
||||
|
||||
/// <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 Matrix3 Transpose(Matrix3 mat)
|
||||
{
|
||||
return new Matrix3(mat.Column0, mat.Column1, mat.Column2);
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Calculate the transpose of the given matrix
|
||||
/// </summary>
|
||||
/// <param name="mat">The matrix to transpose</param>
|
||||
/// <param name="result">The result of the calculation</param>
|
||||
public static void Transpose(ref Matrix3 mat, out Matrix3 result)
|
||||
{
|
||||
result.Row0.X = mat.Row0.X;
|
||||
|
|
@ -642,17 +722,35 @@ namespace OpenTK
|
|||
#endregion
|
||||
|
||||
#region Operators
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Matrix multiplication
|
||||
/// </summary>
|
||||
/// <param name="left">left-hand operand</param>
|
||||
/// <param name="right">right-hand operand</param>
|
||||
/// <returns>A new Matrix3d which holds the result of the multiplication</returns>
|
||||
public static Matrix3 operator *(Matrix3 left, Matrix3 right)
|
||||
{
|
||||
return Matrix3.Mult(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 ==(Matrix3 left, Matrix3 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 !=(Matrix3 left, Matrix3 right)
|
||||
{
|
||||
return !left.Equals(right);
|
||||
|
|
@ -710,7 +808,10 @@ namespace OpenTK
|
|||
#endregion
|
||||
|
||||
#region IEquatable<Matrix3> Members
|
||||
|
||||
|
||||
/// <summary>Indicates whether the current matrix is equal to another matrix.</summary>
|
||||
/// <param name="other">A 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(Matrix3 other)
|
||||
{
|
||||
return
|
||||
|
|
|
|||
|
|
@ -229,6 +229,9 @@ namespace OpenTK
|
|||
|
||||
#region public void Invert()
|
||||
|
||||
/// <summary>
|
||||
/// Converts this instance into its inverse.
|
||||
/// </summary>
|
||||
public void Invert()
|
||||
{
|
||||
this = Matrix3d.Invert(this);
|
||||
|
|
@ -237,7 +240,10 @@ namespace OpenTK
|
|||
#endregion
|
||||
|
||||
#region public void Transpose()
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Converts this instance into its transpose.
|
||||
/// </summary>
|
||||
public void Transpose()
|
||||
{
|
||||
this = Matrix3d.Transpose(this);
|
||||
|
|
@ -250,7 +256,13 @@ namespace OpenTK
|
|||
#region Static
|
||||
|
||||
#region CreateFromAxisAngle
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Build a rotation matrix from the specified axis/angle rotation.
|
||||
/// </summary>
|
||||
/// <param name="axis">The axis to rotate about.</param>
|
||||
/// <param name="angle">Angle in radians to rotate counter-clockwise (looking in the direction of the given axis).</param>
|
||||
/// <param name="result">A matrix instance.</param>
|
||||
public static void CreateFromAxisAngle(Vector3d axis, double angle, out Matrix3d result)
|
||||
{
|
||||
//normalize and create a local copy of the vector.
|
||||
|
|
@ -284,7 +296,13 @@ namespace OpenTK
|
|||
result.Row2.Y = tYZ + sinX;
|
||||
result.Row2.Z = tZZ + cos;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Build a rotation matrix from the specified axis/angle rotation.
|
||||
/// </summary>
|
||||
/// <param name="axis">The axis to rotate about.</param>
|
||||
/// <param name="angle">Angle in radians to rotate counter-clockwise (looking in the direction of the given axis).</param>
|
||||
/// <returns>A matrix instance.</returns>
|
||||
public static Matrix3d CreateFromAxisAngle(Vector3d axis, double angle)
|
||||
{
|
||||
Matrix3d result;
|
||||
|
|
@ -295,7 +313,12 @@ namespace OpenTK
|
|||
#endregion
|
||||
|
||||
#region CreateFromQuaternion
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Build a rotation matrix from the specified quaternion.
|
||||
/// </summary>
|
||||
/// <param name="q">Quaternion to translate.</param>
|
||||
/// <param name="result">Matrix result.</param>
|
||||
public static void CreateFromQuaternion(ref Quaterniond q, out Matrix3d result)
|
||||
{
|
||||
Vector3d axis;
|
||||
|
|
@ -303,7 +326,12 @@ namespace OpenTK
|
|||
q.ToAxisAngle(out axis, out angle);
|
||||
CreateFromAxisAngle(axis, angle, out result);
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Build a rotation matrix from the specified quaternion.
|
||||
/// </summary>
|
||||
/// <param name="q">Quaternion to translate.</param>
|
||||
/// <returns>A matrix instance.</returns>
|
||||
public static Matrix3d CreateFromQuaternion(Quaterniond q)
|
||||
{
|
||||
Matrix3d result;
|
||||
|
|
@ -314,7 +342,12 @@ namespace OpenTK
|
|||
#endregion
|
||||
|
||||
#region CreateRotation[XYZ]
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Builds a rotation matrix for a rotation around the x-axis.
|
||||
/// </summary>
|
||||
/// <param name="angle">The counter-clockwise angle in radians.</param>
|
||||
/// <param name="result">The resulting Matrix3d instance.</param>
|
||||
public static void CreateRotationX(double angle, out Matrix3d result)
|
||||
{
|
||||
double cos = System.Math.Cos(angle);
|
||||
|
|
@ -326,14 +359,24 @@ namespace OpenTK
|
|||
result.Row2.Y = -sin;
|
||||
result.Row2.Z = cos;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Builds a rotation matrix for a rotation around the x-axis.
|
||||
/// </summary>
|
||||
/// <param name="angle">The counter-clockwise angle in radians.</param>
|
||||
/// <returns>The resulting Matrix3d instance.</returns>
|
||||
public static Matrix3d CreateRotationX(double angle)
|
||||
{
|
||||
Matrix3d result;
|
||||
CreateRotationX(angle, out result);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Builds a rotation matrix for a rotation around the y-axis.
|
||||
/// </summary>
|
||||
/// <param name="angle">The counter-clockwise angle in radians.</param>
|
||||
/// <param name="result">The resulting Matrix3d instance.</param>
|
||||
public static void CreateRotationY(double angle, out Matrix3d result)
|
||||
{
|
||||
double cos = System.Math.Cos(angle);
|
||||
|
|
@ -345,14 +388,24 @@ namespace OpenTK
|
|||
result.Row2.X = sin;
|
||||
result.Row2.Z = cos;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Builds a rotation matrix for a rotation around the y-axis.
|
||||
/// </summary>
|
||||
/// <param name="angle">The counter-clockwise angle in radians.</param>
|
||||
/// <returns>The resulting Matrix3d instance.</returns>
|
||||
public static Matrix3d CreateRotationY(double angle)
|
||||
{
|
||||
Matrix3d result;
|
||||
CreateRotationY(angle, out result);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Builds a rotation matrix for a rotation around the z-axis.
|
||||
/// </summary>
|
||||
/// <param name="angle">The counter-clockwise angle in radians.</param>
|
||||
/// <param name="result">The resulting Matrix3d instance.</param>
|
||||
public static void CreateRotationZ(double angle, out Matrix3d result)
|
||||
{
|
||||
double cos = System.Math.Cos(angle);
|
||||
|
|
@ -364,7 +417,12 @@ namespace OpenTK
|
|||
result.Row1.X = -sin;
|
||||
result.Row1.Y = cos;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Builds a rotation matrix for a rotation around the z-axis.
|
||||
/// </summary>
|
||||
/// <param name="angle">The counter-clockwise angle in radians.</param>
|
||||
/// <returns>The resulting Matrix3d instance.</returns>
|
||||
public static Matrix3d CreateRotationZ(double angle)
|
||||
{
|
||||
Matrix3d result;
|
||||
|
|
@ -458,14 +516,26 @@ namespace OpenTK
|
|||
#endregion
|
||||
|
||||
#region Multiply Functions
|
||||
|
||||
|
||||
/// <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 Matrix3d Mult(Matrix3d left, Matrix3d right)
|
||||
{
|
||||
Matrix3d 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 Matrix3d left, ref Matrix3d right, out Matrix3d result)
|
||||
{
|
||||
double lM11 = left.Row0.X, lM12 = left.Row0.Y, lM13 = left.Row0.Z,
|
||||
|
|
@ -614,12 +684,22 @@ namespace OpenTK
|
|||
#endregion
|
||||
|
||||
#region Transpose
|
||||
|
||||
|
||||
/// <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 Matrix3d Transpose(Matrix3d mat)
|
||||
{
|
||||
return new Matrix3d(mat.Column0, mat.Column1, mat.Column2);
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Calculate the transpose of the given matrix
|
||||
/// </summary>
|
||||
/// <param name="mat">The matrix to transpose</param>
|
||||
/// <param name="result">The result of the calculation</param>
|
||||
public static void Transpose(ref Matrix3d mat, out Matrix3d result)
|
||||
{
|
||||
result.Row0 = mat.Column0;
|
||||
|
|
@ -632,17 +712,35 @@ namespace OpenTK
|
|||
#endregion
|
||||
|
||||
#region Operators
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Matrix multiplication
|
||||
/// </summary>
|
||||
/// <param name="left">left-hand operand</param>
|
||||
/// <param name="right">right-hand operand</param>
|
||||
/// <returns>A new Matrix3d which holds the result of the multiplication</returns>
|
||||
public static Matrix3d operator *(Matrix3d left, Matrix3d right)
|
||||
{
|
||||
return Matrix3d.Mult(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 ==(Matrix3d left, Matrix3d 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 !=(Matrix3d left, Matrix3d right)
|
||||
{
|
||||
return !left.Equals(right);
|
||||
|
|
@ -700,7 +798,10 @@ namespace OpenTK
|
|||
#endregion
|
||||
|
||||
#region IEquatable<Matrix3d> Members
|
||||
|
||||
|
||||
/// <summary>Indicates whether the current matrix is equal to another matrix.</summary>
|
||||
/// <param name="other">A 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(Matrix3d other)
|
||||
{
|
||||
return
|
||||
|
|
|
|||
|
|
@ -345,7 +345,7 @@ namespace OpenTK
|
|||
/// Builds a rotation matrix for a rotation around the x-axis.
|
||||
/// </summary>
|
||||
/// <param name="angle">The counter-clockwise angle in radians.</param>
|
||||
/// <param name="result">The resulting Matrix4 instance.</param>
|
||||
/// <param name="result">The resulting Matrix4d instance.</param>
|
||||
public static void CreateRotationX(double angle, out Matrix4d result)
|
||||
{
|
||||
double cos = System.Math.Cos(angle);
|
||||
|
|
@ -361,7 +361,7 @@ namespace OpenTK
|
|||
/// Builds a rotation matrix for a rotation around the x-axis.
|
||||
/// </summary>
|
||||
/// <param name="angle">The counter-clockwise angle in radians.</param>
|
||||
/// <returns>The resulting Matrix4 instance.</returns>
|
||||
/// <returns>The resulting Matrix4d instance.</returns>
|
||||
public static Matrix4d CreateRotationX(double angle)
|
||||
{
|
||||
Matrix4d result;
|
||||
|
|
@ -373,7 +373,7 @@ namespace OpenTK
|
|||
/// Builds a rotation matrix for a rotation around the y-axis.
|
||||
/// </summary>
|
||||
/// <param name="angle">The counter-clockwise angle in radians.</param>
|
||||
/// <param name="result">The resulting Matrix4 instance.</param>
|
||||
/// <param name="result">The resulting Matrix4d instance.</param>
|
||||
public static void CreateRotationY(double angle, out Matrix4d result)
|
||||
{
|
||||
double cos = System.Math.Cos(angle);
|
||||
|
|
@ -389,7 +389,7 @@ namespace OpenTK
|
|||
/// Builds a rotation matrix for a rotation around the y-axis.
|
||||
/// </summary>
|
||||
/// <param name="angle">The counter-clockwise angle in radians.</param>
|
||||
/// <returns>The resulting Matrix4 instance.</returns>
|
||||
/// <returns>The resulting Matrix4d instance.</returns>
|
||||
public static Matrix4d CreateRotationY(double angle)
|
||||
{
|
||||
Matrix4d result;
|
||||
|
|
@ -401,7 +401,7 @@ namespace OpenTK
|
|||
/// Builds a rotation matrix for a rotation around the z-axis.
|
||||
/// </summary>
|
||||
/// <param name="angle">The counter-clockwise angle in radians.</param>
|
||||
/// <param name="result">The resulting Matrix4 instance.</param>
|
||||
/// <param name="result">The resulting Matrix4d instance.</param>
|
||||
public static void CreateRotationZ(double angle, out Matrix4d result)
|
||||
{
|
||||
double cos = System.Math.Cos(angle);
|
||||
|
|
@ -417,7 +417,7 @@ namespace OpenTK
|
|||
/// Builds a rotation matrix for a rotation around the z-axis.
|
||||
/// </summary>
|
||||
/// <param name="angle">The counter-clockwise angle in radians.</param>
|
||||
/// <returns>The resulting Matrix4 instance.</returns>
|
||||
/// <returns>The resulting Matrix4d instance.</returns>
|
||||
public static Matrix4d CreateRotationZ(double angle)
|
||||
{
|
||||
Matrix4d result;
|
||||
|
|
@ -1229,7 +1229,7 @@ namespace OpenTK
|
|||
/// </summary>
|
||||
/// <param name="left">left-hand operand</param>
|
||||
/// <param name="right">right-hand operand</param>
|
||||
/// <returns>A new Matrix44 which holds the result of the multiplication</returns>
|
||||
/// <returns>A new Matrix4d which holds the result of the multiplication</returns>
|
||||
public static Matrix4d operator *(Matrix4d left, Matrix4d right)
|
||||
{
|
||||
return Matrix4d.Mult(left, right);
|
||||
|
|
@ -1311,7 +1311,7 @@ namespace OpenTK
|
|||
#region IEquatable<Matrix4d> Members
|
||||
|
||||
/// <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">A 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(Matrix4d other)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -821,7 +821,7 @@ namespace OpenTK
|
|||
/// <summary>
|
||||
/// Called when a keybord key is released.
|
||||
/// </summary>
|
||||
/// <param name="e">The <see cref="OpenTK.KeyboardKeyEventArgs"/> for this event.</param>
|
||||
/// <param name="e">The <see cref="OpenTK.Input.KeyboardKeyEventArgs"/> for this event.</param>
|
||||
protected virtual void OnKeyUp(KeyboardKeyEventArgs e)
|
||||
{
|
||||
KeyUp(this, e);
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ namespace OpenTK.Platform.Windows
|
|||
string deviceClassGUID = (string)regkey.GetValue("ClassGUID"); // for windows 8 support via OpenTK issue 3198
|
||||
|
||||
// making a guess at backwards compatability. Not sure what older windows returns in these cases...
|
||||
if(deviceClass != null || deviceClass.Equals(string.Empty)){
|
||||
if(deviceClass == null || deviceClass.Equals(string.Empty)){
|
||||
RegistryKey classGUIDKey = Registry.LocalMachine.OpenSubKey(@"SYSTEM\CurrentControlSet\Control\Class\" + deviceClassGUID);
|
||||
deviceClass = classGUIDKey != null ? (string) classGUIDKey.GetValue("Class") : string.Empty;
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче