Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-08-25 19:04:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to be inline with CUE4Parse changes

Browse Source
This commit is contained in:
GMatrixGames
2021-07-31 15:40:09 -04:00
parent 6672c9f10a
commit c082463722
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CUE4Parse

Submodule CUE4Parse updated: 071e458907...ced99f105f

2
FModel/Creator/Bases/FN/BaseMaterialInstance.cs
View File

@@ -22,7 +22,7 @@ namespace FModel.Creator.Bases.FN
texture_finding:
foreach (var textureParameter in material.TextureParameterValues) // get texture from base material
{
if (textureParameter.ParameterValue is not UTexture2D texture || Preview != null) continue;
if (!textureParameter.ParameterValue.TryLoad<UTexture2D>(out var texture) || Preview != null) continue;
switch (textureParameter.ParameterInfo.Name.Text)
{
case "SeriesTexture":

2
FModel/Creator/Utils.cs
View File

@@ -85,7 +85,7 @@ namespace FModel.Creator
if (material == null) return null;
foreach (var textureParameter in material.TextureParameterValues)
{
if (textureParameter.ParameterValue is not UTexture2D texture) continue;
if (!textureParameter.ParameterValue.TryLoad<UTexture2D>(out var texture)) continue;
switch (textureParameter.ParameterInfo.Name.Text)
{
case "MainTex":

4
FModel/ViewModels/ModelViewerViewModel.cs
View File

@@ -183,13 +183,13 @@ namespace FModel.ViewModels
{
for (var j = 0; j < sections.Length; j++)
{
if (sections[j].Material?.Value is not { } unrealMaterial)
if (sections[j].Material == null || !sections[j].Material.TryLoad<UMaterialInterface>(out var unrealMaterial))
continue;
var parameters = new CMaterialParams();
unrealMaterial.GetParams(parameters);
if (parameters.Diffuse is not UTexture2D diffuse) continue;
MeshMat = new DiffuseMaterial {DiffuseMap = new TextureModel(diffuse.Decode().Encode().AsStream())};
MeshMat = new DiffuseMaterial {DiffuseMap = new TextureModel(diffuse.Decode()?.Encode().AsStream())};
break;
}
}