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

lol I didn't commit CUE4Parse last time

Browse Source
This commit is contained in:
iAmAsval 2021-12-04 00:13:49 +01:00
parent e085b09bb9
commit 9581ca7a12
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CUE4Parse

@ -1 +1 @@
Subproject commit 20b76090cb5309be5623082eaef801791ef8ae18
Subproject commit 2f2e881f50ce8b1fb27b5831227169df1720e436

8
FModel/ViewModels/Commands/MenuCommand.cs
View File

@ -47,6 +47,10 @@ namespace FModel.ViewModels.Commands
case "Settings":
Helper.OpenWindow<AdonisWindow>("Settings", () => new SettingsView().Show());
break;
case "ModelSettings":
UserSettings.Default.LastOpenedSettingTab = contextViewModel.CUE4Parse.Game == FGame.FortniteGame ? 2 : 1;
Helper.OpenWindow<AdonisWindow>("Settings", () => new SettingsView().Show());
break;
case "Help_About":
Helper.OpenWindow<AdonisWindow>("About", () => new About().Show());
break;
@ -101,9 +105,9 @@ namespace FModel.ViewModels.Commands
parent.IsExpanded = isExpanded;
Thread.Sleep(10);
}
cancellationToken.ThrowIfCancellationRequested();
foreach (var f in parent.Folders) LoopFolders(cancellationToken, f, isExpanded);
}
}
}
}

4
FModel/ViewModels/ModelViewerViewModel.cs
View File

@ -321,7 +321,7 @@ namespace FModel.ViewModels
var isRendering = !parameters.IsNull;
if (isRendering)
{
if (parameters.HasNoTopDiffuseTexture && parameters.DiffuseColor is { A: > 0 } diffuseColor)
if (!parameters.HasTopDiffuseTexture && parameters.DiffuseColor is { A: > 0 } diffuseColor)
{
Application.Current.Dispatcher.Invoke(() => m.AlbedoColor = new Color4(diffuseColor.R, diffuseColor.G, diffuseColor.B, diffuseColor.A));
}
@ -451,7 +451,7 @@ namespace FModel.ViewModels
});
}
if (parameters.Emissive is UTexture2D emissive && parameters.EmissiveColor is { A: > 0 } emissiveColor)
if (parameters.HasTopEmissiveTexture && parameters.Emissive is UTexture2D emissive && parameters.EmissiveColor is { A: > 0 } emissiveColor)
{
var s = emissive.Decode()?.Encode().AsStream();
var c = new Color4(emissiveColor.R, emissiveColor.G, emissiveColor.B, emissiveColor.A);