mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-07-16 19:14:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Perfare_master' into AssetStudio-mod

Browse Source
This commit is contained in:
VaDiM
2021-12-05 01:32:48 +02:00
parent 571ea2da4a 88c5804586
commit f0b23bbfe7
13 changed files with 63 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AssetStudioGUI/AssetStudioGUIForm.cs
View File

@ -21,8 +21,14 @@ using static AssetStudioGUI.Studio;
using Font = AssetStudio.Font;
using ImageFormat = AssetStudio.ImageFormat;
using PixelFormat = System.Drawing.Imaging.PixelFormat;
#if NET472
using Vector3 = OpenTK.Vector3;
using Vector4 = OpenTK.Vector4;
#else
using Vector3 = OpenTK.Mathematics.Vector3;
using Vector4 = OpenTK.Mathematics.Vector4;
using Matrix4 = OpenTK.Mathematics.Matrix4;
#endif
namespace AssetStudioGUI
{
@ -944,7 +950,7 @@ namespace AssetStudioGUI
if (ERRCHECK(result)) return;
FMODinfoLabel.Text = frequency + " Hz";
FMODtimerLabel.Text = $"0:0.0 / {FMODlenms / 1000 / 60}:{FMODlenms / 1000 % 60}.{FMODlenms / 10 % 100}";
FMODtimerLabel.Text = $"00:00.00 / {(FMODlenms / 1000 / 60):00}:{(FMODlenms / 1000 % 60):00}.{(FMODlenms / 10 % 100):00}";
}
private void PreviewShader(Shader m_Shader)