Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-03-21 17:24:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes for texture refactor

Browse Source
This commit is contained in:
GMatrixGames 2023-06-05 17:39:52 -04:00
parent 6dce30b33f
commit 84f5d4d605
No known key found for this signature in database
GPG Key ID: 685EB7EF9A26807C
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CUE4Parse

@ -1 +1 @@
Subproject commit a5aa9a7551440ce4cd9a0147dbf8757701cae23c
Subproject commit 5b38fc685da2f574262d54639f687945660cdf00

4
FModel/ViewModels/CUE4ParseViewModel.cs
View File

@ -759,7 +759,7 @@ public class CUE4ParseViewModel : ViewModel
break;
}
case "bin" when fileName.Contains("AssetRegistry"):
case "bin" when fileName.Contains("AssetRegistry", StringComparison.OrdinalIgnoreCase):
{
if (Provider.TryCreateReader(fullPath, out var archive))
{
@ -892,7 +892,7 @@ public class CUE4ParseViewModel : ViewModel
TabControl.SelectedTab.SetDocumentText(verseDigest.ReadableCode, false, false);
return true;
}
case UTexture2D { IsVirtual: false } texture when isNone || saveTextures:
case UTexture { IsVirtual: false } texture when isNone || saveTextures:
{
TabControl.SelectedTab.AddImage(texture, saveTextures, updateUi);
return false;

4
FModel/ViewModels/TabControlViewModel.cs
View File

@ -228,8 +228,8 @@ public class TabItem : ViewModel
});
}
public void AddImage(UTexture2D texture, bool save, bool updateUi)
=> AddImage(texture.Name, texture.bRenderNearestNeighbor, texture.Decode(UserSettings.Default.OverridedPlatform), save, updateUi);
public void AddImage(UTexture texture, bool save, bool updateUi)
=> AddImage(texture.Name, texture.RenderNearestNeighbor, texture.Decode(UserSettings.Default.OverridedPlatform), save, updateUi);
public void AddImage(string name, bool rnn, SKBitmap[] img, bool save, bool updateUi)
{

8
FModel/Views/Snooper/Models/Model.cs
View File

@ -440,10 +440,10 @@ public class Model : IDisposable
public void Dispose()
{
_ebo.Dispose();
_vbo.Dispose();
_matrixVbo.Dispose();
_vao.Dispose();
_ebo?.Dispose();
_vbo?.Dispose();
_matrixVbo?.Dispose();
_vao?.Dispose();
Skeleton?.Dispose();
for (int socket = 0; socket < Sockets.Count; socket++)
{

2
FModel/Views/Snooper/Options.cs
View File

@ -182,7 +182,7 @@ public class Options
var guid = o.LightingGuid;
if (!Textures.TryGetValue(guid, out texture) && o.GetMipByMaxSize(UserSettings.Default.PreviewMaxTextureSize) is { } mip)
{
TextureDecoder.DecodeTexture(mip, o.Format, o.isNormalMap, _platform, out var data, out _);
TextureDecoder.DecodeTexture(mip, o.Format, o.IsNormalMap, _platform, out var data, out _);
texture = new Texture(data, mip.SizeX, mip.SizeY, o);
if (fix) TextureHelper.FixChannels(_game, texture);