diff --git a/AssetStudio.PInvoke/AssetStudio.PInvoke.csproj b/AssetStudio.PInvoke/AssetStudio.PInvoke.csproj index f755298..b24e386 100644 --- a/AssetStudio.PInvoke/AssetStudio.PInvoke.csproj +++ b/AssetStudio.PInvoke/AssetStudio.PInvoke.csproj @@ -1,7 +1,7 @@ - net472;netstandard2.0 + net472;netstandard2.0;net5.0 true 0.16.0.0 0.16.0.0 diff --git a/AssetStudio/AssetStudio.csproj b/AssetStudio/AssetStudio.csproj index 7f19213..e540d1f 100644 --- a/AssetStudio/AssetStudio.csproj +++ b/AssetStudio/AssetStudio.csproj @@ -1,7 +1,7 @@ - net472;netstandard2.0 + net472;netstandard2.0;net5.0 0.16.0.0 0.16.0.0 0.16.0.0 diff --git a/AssetStudioFBXWrapper/AssetStudioFBXWrapper.csproj b/AssetStudioFBXWrapper/AssetStudioFBXWrapper.csproj index fac65b0..9622f56 100644 --- a/AssetStudioFBXWrapper/AssetStudioFBXWrapper.csproj +++ b/AssetStudioFBXWrapper/AssetStudioFBXWrapper.csproj @@ -1,7 +1,7 @@ - net472;netstandard2.0 + net472;netstandard2.0;net5.0 true 0.16.0.0 0.16.0.0 diff --git a/AssetStudioGUI/AssetStudioGUI.csproj b/AssetStudioGUI/AssetStudioGUI.csproj index 06b4e38..68d28a0 100644 --- a/AssetStudioGUI/AssetStudioGUI.csproj +++ b/AssetStudioGUI/AssetStudioGUI.csproj @@ -2,7 +2,7 @@ WinExe - net472 + net472;net5.0-windows true Resources\as.ico 0.16.0.0 @@ -51,12 +51,22 @@ - - + + + + Libraries\OpenTK.WinForms.dll + + + + + + + + diff --git a/AssetStudioGUI/AssetStudioGUIForm.Designer.cs b/AssetStudioGUI/AssetStudioGUIForm.Designer.cs index 494880d..5e033a3 100644 --- a/AssetStudioGUI/AssetStudioGUIForm.Designer.cs +++ b/AssetStudioGUI/AssetStudioGUIForm.Designer.cs @@ -819,20 +819,21 @@ // // FMODtimerLabel // + this.FMODtimerLabel.AutoSize = true; this.FMODtimerLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.FMODtimerLabel.Location = new System.Drawing.Point(404, 235); + this.FMODtimerLabel.Location = new System.Drawing.Point(460, 235); this.FMODtimerLabel.Name = "FMODtimerLabel"; - this.FMODtimerLabel.Size = new System.Drawing.Size(155, 12); + this.FMODtimerLabel.Size = new System.Drawing.Size(95, 12); this.FMODtimerLabel.TabIndex = 7; this.FMODtimerLabel.Text = "0:00.0 / 0:00.0"; - this.FMODtimerLabel.TextAlign = System.Drawing.ContentAlignment.TopRight; // // FMODstatusLabel // + this.FMODstatusLabel.AutoSize = true; this.FMODstatusLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight; this.FMODstatusLabel.Location = new System.Drawing.Point(213, 235); this.FMODstatusLabel.Name = "FMODstatusLabel"; - this.FMODstatusLabel.Size = new System.Drawing.Size(50, 12); + this.FMODstatusLabel.Size = new System.Drawing.Size(47, 12); this.FMODstatusLabel.TabIndex = 6; this.FMODstatusLabel.Text = "Stopped"; // @@ -1065,8 +1066,6 @@ // AssetStudioGUIForm // this.AllowDrop = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1264, 681); this.Controls.Add(this.splitContainer1); this.Controls.Add(this.menuStrip1); diff --git a/AssetStudioGUI/AssetStudioGUIForm.cs b/AssetStudioGUI/AssetStudioGUIForm.cs index 4e92f61..014d943 100644 --- a/AssetStudioGUI/AssetStudioGUIForm.cs +++ b/AssetStudioGUI/AssetStudioGUIForm.cs @@ -21,9 +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 { partial class AssetStudioGUIForm : Form diff --git a/AssetStudioGUI/Libraries/OpenTK.WinForms.dll b/AssetStudioGUI/Libraries/OpenTK.WinForms.dll new file mode 100644 index 0000000..6b12706 Binary files /dev/null and b/AssetStudioGUI/Libraries/OpenTK.WinForms.dll differ diff --git a/AssetStudioUtility/AssetStudioUtility.csproj b/AssetStudioUtility/AssetStudioUtility.csproj index 9e045eb..9f39058 100644 --- a/AssetStudioUtility/AssetStudioUtility.csproj +++ b/AssetStudioUtility/AssetStudioUtility.csproj @@ -1,7 +1,7 @@ - net472;netstandard2.0 + net472;netstandard2.0;net5.0 0.16.0.0 0.16.0.0 0.16.0.0 diff --git a/Texture2DDecoderWrapper/Texture2DDecoderWrapper.csproj b/Texture2DDecoderWrapper/Texture2DDecoderWrapper.csproj index 85efe74..3dd9c79 100644 --- a/Texture2DDecoderWrapper/Texture2DDecoderWrapper.csproj +++ b/Texture2DDecoderWrapper/Texture2DDecoderWrapper.csproj @@ -1,7 +1,7 @@ - net472;netstandard2.0 + net472;netstandard2.0;net5.0 true 0.16.0.0 0.16.0.0