Skip to content

Speed up Matrix4x4.CreateScale #79172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EgorBo merged 1 commit into from
Dec 5, 2022
Merged

Speed up Matrix4x4.CreateScale #79172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 28 additions & 18 deletions src/libraries/System.Private.CoreLib/src/System/Numerics/Matrix4x4.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1202,10 +1202,13 @@ public static Matrix4x4 CreateRotationZ(float radians, Vector3 centerPoint)
/// <returns>The scaling matrix.</returns>
public static Matrix4x4 CreateScale(float xScale, float yScale, float zScale)
{
Matrix4x4 result = Identity;
Matrix4x4 result = default;

result.M11 = xScale;
result.M22 = yScale;
result.M33 = zScale;
result.M44 = 1;

return result;
}

Expand All @@ -1217,7 +1220,7 @@ public static Matrix4x4 CreateScale(float xScale, float yScale, float zScale)
/// <returns>The scaling matrix.</returns>
public static Matrix4x4 CreateScale(float xScale, float yScale, float zScale, Vector3 centerPoint)
{
Matrix4x4 result = Identity;
Matrix4x4 result = default;

float tx = centerPoint.X * (1 - xScale);
float ty = centerPoint.Y * (1 - yScale);
Expand All @@ -1226,9 +1229,12 @@ public static Matrix4x4 CreateScale(float xScale, float yScale, float zScale, Ve
result.M11 = xScale;
result.M22 = yScale;
result.M33 = zScale;
result.M44 = 1;

result.M41 = tx;
result.M42 = ty;
result.M43 = tz;

return result;
}

Expand All @@ -1237,10 +1243,13 @@ public static Matrix4x4 CreateScale(float xScale, float yScale, float zScale, Ve
/// <returns>The scaling matrix.</returns>
public static Matrix4x4 CreateScale(Vector3 scales)
{
Matrix4x4 result = Identity;
Matrix4x4 result = default;

result.M11 = scales.X;
result.M22 = scales.Y;
result.M33 = scales.Z;
result.M44 = 1;

return result;
}

Expand All @@ -1250,18 +1259,19 @@ public static Matrix4x4 CreateScale(Vector3 scales)
/// <returns>The scaling matrix.</returns>
public static Matrix4x4 CreateScale(Vector3 scales, Vector3 centerPoint)
{
Matrix4x4 result = Identity;
Matrix4x4 result = default;

float tx = centerPoint.X * (1 - scales.X);
float ty = centerPoint.Y * (1 - scales.Y);
float tz = centerPoint.Z * (1 - scales.Z);
Vector3 t = centerPoint * (Vector3.One - scales);

result.M11 = scales.X;
result.M22 = scales.Y;
result.M33 = scales.Z;
result.M41 = tx;
result.M42 = ty;
result.M43 = tz;
result.M44 = 1;

result.M41 = t.X;
result.M42 = t.Y;
result.M43 = t.Z;

return result;
}

Expand All @@ -1270,11 +1280,12 @@ public static Matrix4x4 CreateScale(Vector3 scales, Vector3 centerPoint)
/// <returns>The scaling matrix.</returns>
public static Matrix4x4 CreateScale(float scale)
{
Matrix4x4 result = Identity;
Matrix4x4 result = default;

result.M11 = scale;
result.M22 = scale;
result.M33 = scale;
result.M44 = 1;

return result;
}
Expand All @@ -1285,19 +1296,18 @@ public static Matrix4x4 CreateScale(float scale)
/// <returns>The scaling matrix.</returns>
public static Matrix4x4 CreateScale(float scale, Vector3 centerPoint)
{
Matrix4x4 result = Identity;
Matrix4x4 result = default;

float tx = centerPoint.X * (1 - scale);
float ty = centerPoint.Y * (1 - scale);
float tz = centerPoint.Z * (1 - scale);
Vector3 t = centerPoint * (Vector3.One - new Vector3(scale));

result.M11 = scale;
result.M22 = scale;
result.M33 = scale;
result.M44 = 1;

result.M41 = tx;
result.M42 = ty;
result.M43 = tz;
result.M41 = t.X;
result.M42 = t.Y;
result.M43 = t.Z;

return result;
}
Expand Down