diff --git a/src/Maths/Silk.NET.Maths/Cube.cs b/src/Maths/Silk.NET.Maths/Cube.cs index c5ef00cca7..f527716518 100644 --- a/src/Maths/Silk.NET.Maths/Cube.cs +++ b/src/Maths/Silk.NET.Maths/Cube.cs @@ -121,7 +121,7 @@ public bool Contains(Cube other) return Scalar.GreaterThanOrEqual(other.Origin.X, this.Origin.X) && Scalar.GreaterThanOrEqual (other.Origin.Y, this.Origin.Y) && Scalar.GreaterThanOrEqual (other.Origin.Z, this.Origin.Z) && Scalar.LessThanOrEqual(oMax.X, tMax.X) && Scalar.LessThanOrEqual - (oMax.Y, tMax.Y) && Scalar.GreaterThanOrEqual(oMax.Y, tMax.Y); + (oMax.Y, tMax.Y) && Scalar.LessThanOrEqual(oMax.Y, tMax.Y); } /// @@ -240,4 +240,4 @@ public Cube As() where TOther : unmanaged, IFormattable, IEquata return new(Origin.As(), Max.As()); } } -} \ No newline at end of file +} diff --git a/src/Maths/Silk.NET.Maths/Matrix2X2.cs b/src/Maths/Silk.NET.Maths/Matrix2X2.cs index 7a8aad8539..a3b2de54e6 100644 --- a/src/Maths/Silk.NET.Maths/Matrix2X2.cs +++ b/src/Maths/Silk.NET.Maths/Matrix2X2.cs @@ -22,6 +22,7 @@ public struct Matrix2X2 : IEquatable> /// [IgnoreDataMember] public Vector2D Row1; + /// /// Row 2 of the matrix. /// @@ -40,7 +41,6 @@ public struct Matrix2X2 : IEquatable> [IgnoreDataMember] public Vector2D Column2 => new(M12, M22); - /// Value at row 1, column 1 of the matrix. [DataMember] public T M11 @@ -130,8 +130,8 @@ public Matrix2X2(Matrix3X2 value) Row2 = new(value.M21, value.M22); } - /// Constructs a from the given Matrix4x3. - /// The source Matrix4x3. + /// Constructs a from the given . + /// The source . public Matrix2X2(Matrix4X3 value) { Row1 = new(value.M11, value.M12); @@ -166,6 +166,7 @@ public Matrix2X2(Matrix4X2 value) public static Matrix2X2 Identity => _identity; /// Returns whether the matrix is the identity matrix. + [IgnoreDataMember] public readonly bool IsIdentity => Scalar.Equal(M11, Scalar.One) && Scalar.Equal(M22, Scalar.One) && // Check diagonal element first for early out. @@ -225,7 +226,7 @@ public readonly bool IsIdentity /// The result of the multiplication. public static unsafe Vector2D operator *(Vector2D value1, Matrix2X2 value2) { - return value1 * value2.Row1 + value1 * value2.Row2; + return value1.X * value2.Row1 + value1.Y * value2.Row2; } /// Multiplies a matrix by a scalar value. diff --git a/src/Maths/Silk.NET.Maths/Matrix2X3.Ops.cs b/src/Maths/Silk.NET.Maths/Matrix2X3.Ops.cs index 242912de0b..a846c2fccd 100644 --- a/src/Maths/Silk.NET.Maths/Matrix2X3.Ops.cs +++ b/src/Maths/Silk.NET.Maths/Matrix2X3.Ops.cs @@ -216,7 +216,7 @@ public static Matrix2X3 Subtract(Matrix2X3 value1, Matrix2X3 value2) public static unsafe Matrix2X3 Lerp(Matrix2X3 matrix1, Matrix2X3 matrix2, T amount) where T : unmanaged, IFormattable, IEquatable, IComparable { - return new(Vector3D.Lerp(matrix1.Row1, matrix2.Row2, amount), Vector3D.Lerp(matrix1.Row2, matrix2.Row2, amount)); + return new(Vector3D.Lerp(matrix1.Row1, matrix2.Row1, amount), Vector3D.Lerp(matrix1.Row2, matrix2.Row2, amount)); } /// Transforms the given matrix by applying the given Quaternion rotation. @@ -260,4 +260,4 @@ public static Matrix2X3 Transform(Matrix2X3 value, Quaternion rotati return new(value.M11 * q1 + value.M12 * q2 + value.M13 * q3, value.M21 * q1 + value.M22 * q2 + value.M23 * q3); } } -} \ No newline at end of file +} diff --git a/src/Maths/Silk.NET.Maths/Matrix2X3.cs b/src/Maths/Silk.NET.Maths/Matrix2X3.cs index 87bdfc4701..63aa9970b7 100644 --- a/src/Maths/Silk.NET.Maths/Matrix2X3.cs +++ b/src/Maths/Silk.NET.Maths/Matrix2X3.cs @@ -78,8 +78,8 @@ public T M13 [DataMember] public T M21 { - readonly get => Row1.X; - set => Row1.X = value; + readonly get => Row2.X; + set => Row2.X = value; } /// Value at row 2, column 2 of the matrix. diff --git a/src/Maths/Silk.NET.Maths/Matrix2X4.cs b/src/Maths/Silk.NET.Maths/Matrix2X4.cs index 7e6f38eabf..c4b7a26716 100644 --- a/src/Maths/Silk.NET.Maths/Matrix2X4.cs +++ b/src/Maths/Silk.NET.Maths/Matrix2X4.cs @@ -156,7 +156,7 @@ static void VerifyBounds(int i) } /// - /// Constructs a from the given rows + /// Constructs a from the given rows. /// public Matrix2X4(Vector4D row1, Vector4D row2) { @@ -179,8 +179,8 @@ public Matrix2X4(Matrix3X2 value) Row2 = new(value.M21, value.M22, default, default); } - /// Constructs a from the given Matrix4x3. - /// The source Matrix4x3. + /// Constructs a from the given . + /// The source . public Matrix2X4(Matrix4X3 value) { Row1 = new(value.M11, value.M12, value.M13, default); @@ -203,7 +203,7 @@ public Matrix2X4(Matrix3X3 value) Row2 = new(value.M21, value.M22, value.M23, default); } - /// Constructs a Matrix2x4 from the given . + /// Constructs a from the given . /// The source . public Matrix2X4(Matrix4X2 value) { diff --git a/src/Maths/Silk.NET.Maths/Matrix3X2.Ops.cs b/src/Maths/Silk.NET.Maths/Matrix3X2.Ops.cs index 20d7ff905a..b122d9529f 100644 --- a/src/Maths/Silk.NET.Maths/Matrix3X2.Ops.cs +++ b/src/Maths/Silk.NET.Maths/Matrix3X2.Ops.cs @@ -471,6 +471,15 @@ public static Matrix2X3 Multiply(Matrix2X3 value1, Matrix3X3 value2) where T : unmanaged, IFormattable, IEquatable, IComparable => value1 * value2; + /// Multiplies two matrices together and returns the resulting matrix. + /// The first source matrix. + /// The second source matrix. + /// The product matrix. + [MethodImpl((MethodImplOptions) 768)] + public static Matrix3X2 Multiply(Matrix3X3 value1, Matrix3X2 value2) + where T : unmanaged, IFormattable, IEquatable, IComparable + => value1 * value2; + /// Scales all elements in a matrix by the given scalar factor. /// The source matrix. /// The scaling value to use. @@ -497,4 +506,4 @@ public static Matrix3X2 Subtract(Matrix3X2 value1, Matrix3X2 value2) where T : unmanaged, IFormattable, IEquatable, IComparable => value1 - value2; } -} \ No newline at end of file +} diff --git a/src/Maths/Silk.NET.Maths/Matrix3X2.cs b/src/Maths/Silk.NET.Maths/Matrix3X2.cs index 8d80e72d79..df3b08a135 100644 --- a/src/Maths/Silk.NET.Maths/Matrix3X2.cs +++ b/src/Maths/Silk.NET.Maths/Matrix3X2.cs @@ -51,7 +51,7 @@ public struct Matrix3X2 [IgnoreDataMember] public Vector3D Column2 => new(Row1.Y, Row2.Y, Row3.Y); - /// The first element of the first row + /// Value at row 1, column 1 of the matrix. [DataMember] public T M11 { @@ -59,7 +59,7 @@ public T M11 set => Row1.X = value; } - /// The second element of the first row + /// Value at row 1, column 2 of the matrix. [DataMember] public T M12 { @@ -67,7 +67,7 @@ public T M12 set => Row1.Y = value; } - /// The first element of the second row + /// Value at row 2, column 1 of the matrix. [DataMember] public T M21 { @@ -75,7 +75,7 @@ public T M21 set => Row2.X = value; } - /// The second element of the second row + /// Value at row 2, column 2 of the matrix. [DataMember] public T M22 { @@ -83,7 +83,7 @@ public T M22 set => Row2.Y = value; } - /// The first element of the third row + /// Value at row 3, column 1 of the matrix. [DataMember] public T M31 { @@ -91,7 +91,7 @@ public T M31 set => Row3.X = value; } - /// The second element of the third row + /// Value at row 3, column 2 of the matrix. [DataMember] public T M32 { @@ -154,8 +154,8 @@ public Matrix3X2(Vector2D row1, Vector2D row2, Vector2D row3) Row3 = row3; } - /// Constructs a from the given Matrix4x3. - /// The source Matrix4x3. + /// Constructs a from the given . + /// The source . public Matrix3X2(Matrix4X3 value) { Row1 = new(value.M11, value.M12); diff --git a/src/Maths/Silk.NET.Maths/Matrix3X3.cs b/src/Maths/Silk.NET.Maths/Matrix3X3.cs index 755697a772..5025b28af0 100644 --- a/src/Maths/Silk.NET.Maths/Matrix3X3.cs +++ b/src/Maths/Silk.NET.Maths/Matrix3X3.cs @@ -45,14 +45,12 @@ public struct Matrix3X3 : IEquatable> [IgnoreDataMember] public Vector3D Column1 => new(Row1.X, Row2.X, Row3.X); - /// /// Column 2 of the matrix. /// [IgnoreDataMember] public Vector3D Column2 => new(Row1.Y, Row2.Y, Row3.Y); - /// /// Column 3 of the matrix. /// diff --git a/src/Maths/Silk.NET.Maths/Matrix3X4.cs b/src/Maths/Silk.NET.Maths/Matrix3X4.cs index ee466c0958..4930344ca0 100644 --- a/src/Maths/Silk.NET.Maths/Matrix3X4.cs +++ b/src/Maths/Silk.NET.Maths/Matrix3X4.cs @@ -194,12 +194,7 @@ static void VerifyBounds(int i) } } - /// - /// Constructs a from the given rows. - /// - /// - /// - /// + /// Constructs a from the given rows. public Matrix3X4(Vector4D row1, Vector4D row2, Vector4D row3) { Row1 = row1; diff --git a/src/Maths/Silk.NET.Maths/Matrix4X2.cs b/src/Maths/Silk.NET.Maths/Matrix4X2.cs index ca60eb79d5..ca39d744b0 100644 --- a/src/Maths/Silk.NET.Maths/Matrix4X2.cs +++ b/src/Maths/Silk.NET.Maths/Matrix4X2.cs @@ -30,25 +30,23 @@ public struct Matrix4X2 : IEquatable> public Vector2D Row1; /// - /// Row 2 of the matrix + /// Row 2 of the matrix. /// [IgnoreDataMember] public Vector2D Row2; /// - /// Row 3 of the matrix + /// Row 3 of the matrix. /// [IgnoreDataMember] public Vector2D Row3; /// - /// Row 4 of the matrix + /// Row 4 of the matrix. /// [IgnoreDataMember] public Vector2D Row4; - - /// /// Column 1 of the matrix. /// @@ -59,7 +57,7 @@ public struct Matrix4X2 : IEquatable> /// Column 2 of the matrix. /// [IgnoreDataMember] - public Vector4D Column2 => new(Row1.Y, Row2.Y, Row3.X, Row4.X); + public Vector4D Column2 => new(Row1.Y, Row2.Y, Row3.Y, Row4.Y); /// Value at row 1, column 1 of the matrix. [DataMember] diff --git a/src/Maths/Silk.NET.Maths/Matrix4X3.cs b/src/Maths/Silk.NET.Maths/Matrix4X3.cs index 57088ec556..3502df0e08 100644 --- a/src/Maths/Silk.NET.Maths/Matrix4X3.cs +++ b/src/Maths/Silk.NET.Maths/Matrix4X3.cs @@ -29,19 +29,19 @@ public struct Matrix4X3 : IEquatable> public Vector3D Row1; /// - /// Row 1 of the matrix. + /// Row 2 of the matrix. /// [IgnoreDataMember] public Vector3D Row2; /// - /// Row 1 of the matrix. + /// Row 3 of the matrix. /// [IgnoreDataMember] public Vector3D Row3; /// - /// Row 1 of the matrix. + /// Row 4 of the matrix. /// [IgnoreDataMember] public Vector3D Row4; diff --git a/src/Maths/Silk.NET.Maths/Matrix4X4.cs b/src/Maths/Silk.NET.Maths/Matrix4X4.cs index 1bc8c0553a..3699b0cca5 100644 --- a/src/Maths/Silk.NET.Maths/Matrix4X4.cs +++ b/src/Maths/Silk.NET.Maths/Matrix4X4.cs @@ -234,7 +234,7 @@ static void VerifyBounds(int i) } /// - /// Constructs a from the given rows + /// Constructs a from the given rows. /// public Matrix4X4(Vector4D row1, Vector4D row2, Vector4D row3, Vector4D row4) { diff --git a/src/Maths/Silk.NET.Maths/Matrix5X4.cs b/src/Maths/Silk.NET.Maths/Matrix5X4.cs index 348ba77941..ead66f9a77 100644 --- a/src/Maths/Silk.NET.Maths/Matrix5X4.cs +++ b/src/Maths/Silk.NET.Maths/Matrix5X4.cs @@ -8,7 +8,7 @@ namespace Silk.NET.Maths { - /// A structure encapsulating a 4x4 matrix. + /// A structure encapsulating a 5x4 matrix. [Serializable] [DataContract] public struct Matrix5X4 : IEquatable> diff --git a/src/Maths/Silk.NET.Maths/PublicAPI/net5.0/PublicAPI.Shipped.txt b/src/Maths/Silk.NET.Maths/PublicAPI/net5.0/PublicAPI.Shipped.txt index 0f725026db..18a89bf5b8 100644 --- a/src/Maths/Silk.NET.Maths/PublicAPI/net5.0/PublicAPI.Shipped.txt +++ b/src/Maths/Silk.NET.Maths/PublicAPI/net5.0/PublicAPI.Shipped.txt @@ -839,6 +839,7 @@ static Silk.NET.Maths.Matrix3X2.Invert(Silk.NET.Maths.Matrix3X2 matrix, ou static Silk.NET.Maths.Matrix3X2.Lerp(Silk.NET.Maths.Matrix3X2 matrix1, Silk.NET.Maths.Matrix3X2 matrix2, T amount) -> Silk.NET.Maths.Matrix3X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix2X3 value1, Silk.NET.Maths.Matrix3X2 value2) -> Silk.NET.Maths.Matrix2X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix2X3 value1, Silk.NET.Maths.Matrix3X3 value2) -> Silk.NET.Maths.Matrix2X3 +static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X3 value1, Silk.NET.Maths.Matrix3X2 value2) -> Silk.NET.Maths.Matrix3X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X2 value1, Silk.NET.Maths.Matrix2X2 value2) -> Silk.NET.Maths.Matrix3X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X2 value1, Silk.NET.Maths.Matrix2X3 value2) -> Silk.NET.Maths.Matrix3X3 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X2 value1, T value2) -> Silk.NET.Maths.Matrix3X2 diff --git a/src/Maths/Silk.NET.Maths/PublicAPI/net6.0-android/PublicAPI.Shipped.txt b/src/Maths/Silk.NET.Maths/PublicAPI/net6.0-android/PublicAPI.Shipped.txt index 0f725026db..18a89bf5b8 100644 --- a/src/Maths/Silk.NET.Maths/PublicAPI/net6.0-android/PublicAPI.Shipped.txt +++ b/src/Maths/Silk.NET.Maths/PublicAPI/net6.0-android/PublicAPI.Shipped.txt @@ -839,6 +839,7 @@ static Silk.NET.Maths.Matrix3X2.Invert(Silk.NET.Maths.Matrix3X2 matrix, ou static Silk.NET.Maths.Matrix3X2.Lerp(Silk.NET.Maths.Matrix3X2 matrix1, Silk.NET.Maths.Matrix3X2 matrix2, T amount) -> Silk.NET.Maths.Matrix3X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix2X3 value1, Silk.NET.Maths.Matrix3X2 value2) -> Silk.NET.Maths.Matrix2X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix2X3 value1, Silk.NET.Maths.Matrix3X3 value2) -> Silk.NET.Maths.Matrix2X3 +static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X3 value1, Silk.NET.Maths.Matrix3X2 value2) -> Silk.NET.Maths.Matrix3X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X2 value1, Silk.NET.Maths.Matrix2X2 value2) -> Silk.NET.Maths.Matrix3X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X2 value1, Silk.NET.Maths.Matrix2X3 value2) -> Silk.NET.Maths.Matrix3X3 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X2 value1, T value2) -> Silk.NET.Maths.Matrix3X2 diff --git a/src/Maths/Silk.NET.Maths/PublicAPI/net6.0-ios/PublicAPI.Shipped.txt b/src/Maths/Silk.NET.Maths/PublicAPI/net6.0-ios/PublicAPI.Shipped.txt index 0f725026db..18a89bf5b8 100644 --- a/src/Maths/Silk.NET.Maths/PublicAPI/net6.0-ios/PublicAPI.Shipped.txt +++ b/src/Maths/Silk.NET.Maths/PublicAPI/net6.0-ios/PublicAPI.Shipped.txt @@ -839,6 +839,7 @@ static Silk.NET.Maths.Matrix3X2.Invert(Silk.NET.Maths.Matrix3X2 matrix, ou static Silk.NET.Maths.Matrix3X2.Lerp(Silk.NET.Maths.Matrix3X2 matrix1, Silk.NET.Maths.Matrix3X2 matrix2, T amount) -> Silk.NET.Maths.Matrix3X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix2X3 value1, Silk.NET.Maths.Matrix3X2 value2) -> Silk.NET.Maths.Matrix2X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix2X3 value1, Silk.NET.Maths.Matrix3X3 value2) -> Silk.NET.Maths.Matrix2X3 +static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X3 value1, Silk.NET.Maths.Matrix3X2 value2) -> Silk.NET.Maths.Matrix3X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X2 value1, Silk.NET.Maths.Matrix2X2 value2) -> Silk.NET.Maths.Matrix3X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X2 value1, Silk.NET.Maths.Matrix2X3 value2) -> Silk.NET.Maths.Matrix3X3 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X2 value1, T value2) -> Silk.NET.Maths.Matrix3X2 diff --git a/src/Maths/Silk.NET.Maths/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt b/src/Maths/Silk.NET.Maths/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt index 0f725026db..18a89bf5b8 100644 --- a/src/Maths/Silk.NET.Maths/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt +++ b/src/Maths/Silk.NET.Maths/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt @@ -839,6 +839,7 @@ static Silk.NET.Maths.Matrix3X2.Invert(Silk.NET.Maths.Matrix3X2 matrix, ou static Silk.NET.Maths.Matrix3X2.Lerp(Silk.NET.Maths.Matrix3X2 matrix1, Silk.NET.Maths.Matrix3X2 matrix2, T amount) -> Silk.NET.Maths.Matrix3X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix2X3 value1, Silk.NET.Maths.Matrix3X2 value2) -> Silk.NET.Maths.Matrix2X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix2X3 value1, Silk.NET.Maths.Matrix3X3 value2) -> Silk.NET.Maths.Matrix2X3 +static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X3 value1, Silk.NET.Maths.Matrix3X2 value2) -> Silk.NET.Maths.Matrix3X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X2 value1, Silk.NET.Maths.Matrix2X2 value2) -> Silk.NET.Maths.Matrix3X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X2 value1, Silk.NET.Maths.Matrix2X3 value2) -> Silk.NET.Maths.Matrix3X3 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X2 value1, T value2) -> Silk.NET.Maths.Matrix3X2 diff --git a/src/Maths/Silk.NET.Maths/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt b/src/Maths/Silk.NET.Maths/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt index 0f725026db..18a89bf5b8 100644 --- a/src/Maths/Silk.NET.Maths/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt +++ b/src/Maths/Silk.NET.Maths/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt @@ -839,6 +839,7 @@ static Silk.NET.Maths.Matrix3X2.Invert(Silk.NET.Maths.Matrix3X2 matrix, ou static Silk.NET.Maths.Matrix3X2.Lerp(Silk.NET.Maths.Matrix3X2 matrix1, Silk.NET.Maths.Matrix3X2 matrix2, T amount) -> Silk.NET.Maths.Matrix3X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix2X3 value1, Silk.NET.Maths.Matrix3X2 value2) -> Silk.NET.Maths.Matrix2X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix2X3 value1, Silk.NET.Maths.Matrix3X3 value2) -> Silk.NET.Maths.Matrix2X3 +static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X3 value1, Silk.NET.Maths.Matrix3X2 value2) -> Silk.NET.Maths.Matrix3X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X2 value1, Silk.NET.Maths.Matrix2X2 value2) -> Silk.NET.Maths.Matrix3X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X2 value1, Silk.NET.Maths.Matrix2X3 value2) -> Silk.NET.Maths.Matrix3X3 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X2 value1, T value2) -> Silk.NET.Maths.Matrix3X2 diff --git a/src/Maths/Silk.NET.Maths/PublicAPI/netstandard2.1/PublicAPI.Shipped.txt b/src/Maths/Silk.NET.Maths/PublicAPI/netstandard2.1/PublicAPI.Shipped.txt index 0f725026db..18a89bf5b8 100644 --- a/src/Maths/Silk.NET.Maths/PublicAPI/netstandard2.1/PublicAPI.Shipped.txt +++ b/src/Maths/Silk.NET.Maths/PublicAPI/netstandard2.1/PublicAPI.Shipped.txt @@ -839,6 +839,7 @@ static Silk.NET.Maths.Matrix3X2.Invert(Silk.NET.Maths.Matrix3X2 matrix, ou static Silk.NET.Maths.Matrix3X2.Lerp(Silk.NET.Maths.Matrix3X2 matrix1, Silk.NET.Maths.Matrix3X2 matrix2, T amount) -> Silk.NET.Maths.Matrix3X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix2X3 value1, Silk.NET.Maths.Matrix3X2 value2) -> Silk.NET.Maths.Matrix2X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix2X3 value1, Silk.NET.Maths.Matrix3X3 value2) -> Silk.NET.Maths.Matrix2X3 +static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X3 value1, Silk.NET.Maths.Matrix3X2 value2) -> Silk.NET.Maths.Matrix3X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X2 value1, Silk.NET.Maths.Matrix2X2 value2) -> Silk.NET.Maths.Matrix3X2 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X2 value1, Silk.NET.Maths.Matrix2X3 value2) -> Silk.NET.Maths.Matrix3X3 static Silk.NET.Maths.Matrix3X2.Multiply(Silk.NET.Maths.Matrix3X2 value1, T value2) -> Silk.NET.Maths.Matrix3X2 diff --git a/src/Maths/Silk.NET.Maths/Sphere.cs b/src/Maths/Silk.NET.Maths/Sphere.cs index 5985308774..29c1f46e53 100644 --- a/src/Maths/Silk.NET.Maths/Sphere.cs +++ b/src/Maths/Silk.NET.Maths/Sphere.cs @@ -69,7 +69,7 @@ public Sphere(T centerX, T centerY, T centerZ, T radius) /// This does consider a point on the edge contained. public bool Contains(Vector3D point) { - return Scalar.LessThanOrEqual(Vector3D.DistanceSquared(point, Center), Radius); + return Scalar.LessThanOrEqual(Vector3D.DistanceSquared(point, Center), SquaredRadius); } /// @@ -173,4 +173,4 @@ public Sphere As() where TOther : unmanaged, IFormattable, IEqua return new(Center.As(), Scalar.As(Radius)); } } -} \ No newline at end of file +}