chizui/AssetStudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace Math with MathF

Browse Source
This commit is contained in:
VaDiM
2025-01-31 17:55:10 +03:00
parent a8bb6c714b
commit 185348d9b8
10 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AssetStudio/AssetStudio.csproj
View File

@@ -15,6 +15,7 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
<PackageReference Include="System.Text.Json" Version="9.0.0" />
<PackageReference Include="Microsoft.Bcl.Numerics" Version="9.0.1" />
</ItemGroup>
</Project>

2
AssetStudio/Classes/AnimationClip.cs
View File

@@ -256,7 +256,7 @@ namespace AssetStudio
}
int lastComponent = (int)(flags & 3);
q[lastComponent] = (float)Math.Sqrt(1 - sum);
q[lastComponent] = MathF.Sqrt(1 - sum);
if ((flags & 4) != 0u)
q[lastComponent] = -q[lastComponent];
data[i] = q;

4
AssetStudio/Classes/Mesh.cs
View File

@@ -1006,7 +1006,7 @@ namespace AssetStudio
var zsqr = 1 - x * x - y * y;
float z;
if (zsqr >= 0f)
z = (float)Math.Sqrt(zsqr);
z = MathF.Sqrt(zsqr);
else
{
z = 0;
@@ -1036,7 +1036,7 @@ namespace AssetStudio
var zsqr = 1 - x * x - y * y;
float z;
if (zsqr >= 0f)
z = (float)Math.Sqrt(zsqr);
z = MathF.Sqrt(zsqr);
else
{
z = 0;

10
AssetStudio/Classes/Texture2D.cs
View File

@@ -181,19 +181,19 @@ namespace AssetStudio
{
case TextureFormat.ASTC_RGBA_5x5:
// https://registry.khronos.org/webgl/extensions/WEBGL_compressed_texture_astc/
imgDataSize = (int)(Math.Floor((m_Width + 4) / 5f) * Math.Floor((m_Height + 4) / 5f) * 16);
imgDataSize = (int)(MathF.Floor((m_Width + 4) / 5f) * MathF.Floor((m_Height + 4) / 5f) * 16);
break;
case TextureFormat.ASTC_RGBA_6x6:
imgDataSize = (int)(Math.Floor((m_Width + 5) / 6f) * Math.Floor((m_Height + 5) / 6f) * 16);
imgDataSize = (int)(MathF.Floor((m_Width + 5) / 6f) * MathF.Floor((m_Height + 5) / 6f) * 16);
break;
case TextureFormat.ASTC_RGBA_8x8:
imgDataSize = (int)(Math.Floor((m_Width + 7) / 8f) * Math.Floor((m_Height + 7) / 8f) * 16);
imgDataSize = (int)(MathF.Floor((m_Width + 7) / 8f) * MathF.Floor((m_Height + 7) / 8f) * 16);
break;
case TextureFormat.ASTC_RGBA_10x10:
imgDataSize = (int)(Math.Floor((m_Width + 9) / 10f) * Math.Floor((m_Height + 9) / 10f) * 16);
imgDataSize = (int)(MathF.Floor((m_Width + 9) / 10f) * MathF.Floor((m_Height + 9) / 10f) * 16);
break;
case TextureFormat.ASTC_RGBA_12x12:
imgDataSize = (int)(Math.Floor((m_Width + 11) / 12f) * Math.Floor((m_Height + 11) / 12f) * 16);
imgDataSize = (int)(MathF.Floor((m_Width + 11) / 12f) * MathF.Floor((m_Height + 11) / 12f) * 16);
break;
case TextureFormat.DXT1:
case TextureFormat.EAC_R:

6
AssetStudio/Math/Vector2.cs
View File

@@ -45,9 +45,9 @@ namespace AssetStudio
public override bool Equals(object other)
{
if (!(other is Vector2))
if (!(other is Vector2 vector2))
return false;
return Equals((Vector2)other);
return Equals(vector2);
}
public bool Equals(Vector2 other)
@@ -73,7 +73,7 @@ namespace AssetStudio
public float Length()
{
return (float)Math.Sqrt(LengthSquared());
return MathF.Sqrt(LengthSquared());
}
public float LengthSquared()

6
AssetStudio/Math/Vector3.cs
View File

@@ -49,9 +49,9 @@ namespace AssetStudio
public override bool Equals(object other)
{
if (!(other is Vector3))
if (!(other is Vector3 vector3))
return false;
return Equals((Vector3)other);
return Equals(vector3);
}
public bool Equals(Vector3 other)
@@ -79,7 +79,7 @@ namespace AssetStudio
public float Length()
{
return (float)Math.Sqrt(LengthSquared());
return MathF.Sqrt(LengthSquared());
}
public float LengthSquared()

6
AssetStudio/Math/Vector4.cs
View File

@@ -61,9 +61,9 @@ namespace AssetStudio
public override bool Equals(object other)
{
if (!(other is Vector4))
if (!(other is Vector4 vector4))
return false;
return Equals((Vector4)other);
return Equals(vector4);
}
public bool Equals(Vector4 other)
@@ -93,7 +93,7 @@ namespace AssetStudio
public float Length()
{
return (float)Math.Sqrt(LengthSquared());
return MathF.Sqrt(LengthSquared());
}
public float LengthSquared()