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

fixed rare overwrite material index error

Browse Source
This commit is contained in:
iAmAsval 2021-12-11 14:49:30 +01:00
parent 98b4da93a5
commit 40715b4c12
5 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CUE4Parse

@ -1 +1 @@
Subproject commit 3dbe09d4a83b9b3628a2a340394628c39a954eb9
Subproject commit 763aca666c1782ce51287100641bc31d9fce0d41

1
FModel/Enums.cs
View File

@ -20,6 +20,7 @@ namespace FModel
{
Restart,
ReloadLocres,
CheckForUpdates,
Nothing
}

58
FModel/ViewModels/ModelViewerViewModel.cs
View File

@ -288,34 +288,30 @@ namespace FModel.ViewModels
public async Task<bool> TryOverwriteMaterial(UMaterialInstance materialInstance)
{
if (SelectedModel is not { SelectedGeometry: {} geometry } model)
return false;
if (SelectedModel?.SelectedGeometry == null) return false;
PBRMaterial m = null;
await _threadWorkerView.Begin(_ =>
{
var (material, _, _) = LoadMaterial(materialInstance);
m = material;
(m, var _, var _) = LoadMaterial(materialInstance);
var obj = new ResolvedLoadedObject(materialInstance);
switch (SelectedModel.Export)
{
case UStaticMesh { Materials: { } } st:
st.Materials[SelectedModel.SelectedGeometry.MaterialIndex] = obj;
break;
case USkeletalMesh sk:
sk.Materials[SelectedModel.SelectedGeometry.MaterialIndex].Material = obj;
break;
case UMaterialInstance:
SelectedModel.SwapExport(materialInstance);
break;
}
});
if (m == null) return false;
var index = geometry.MaterialIndex;
var obj = new ResolvedLoadedObject(materialInstance);
switch (model.Export)
{
case UStaticMesh { Materials: { } } st:
st.Materials[index] = obj;
break;
case USkeletalMesh sk:
sk.Materials[index].Material = obj;
break;
case UMaterialInstance:
model.SwapExport(materialInstance);
break;
}
geometry.Material = m;
return true;
SelectedModel.SelectedGeometry.Material = m;
return m != null;
}
#endregion
@ -330,11 +326,10 @@ namespace FModel.ViewModels
Application.Current.Dispatcher.Invoke(() =>
{
var s = FixName(materialInstance.Name);
cam.Group3d.Add(new CustomMeshGeometryModel3D
{
Transform = new RotateTransform3D(new AxisAngleRotation3D(new Vector3D(1,0,0), -90)),
DisplayName = s, Geometry = builder.ToMeshGeometry3D(), MaterialIndex = 0,
DisplayName = materialInstance.Name, Geometry = builder.ToMeshGeometry3D(), MaterialIndex = 0,
Material = m, IsTransparent = isTransparent, IsRendering = isRendering
});
});
@ -403,7 +398,7 @@ namespace FModel.ViewModels
{
cam.Group3d.Add(new CustomMeshGeometryModel3D
{
DisplayName = FixName(section.MaterialName ?? material.Name), MaterialIndex = i,
DisplayName = section.MaterialName ?? material.Name, MaterialIndex = section.MaterialIndex,
Geometry = builder.ToMeshGeometry3D(), Material = m, IsTransparent = isTransparent,
IsRendering = isRendering
});
@ -413,7 +408,7 @@ namespace FModel.ViewModels
private (PBRMaterial material, bool isRendering, bool isTransparent) LoadMaterial(UMaterialInterface unrealMaterial)
{
var m = new PBRMaterial {RenderShadowMap = true, EnableAutoTangent = true, RenderEnvironmentMap = true}; // default
PBRMaterial m = null; // default
Application.Current.Dispatcher.Invoke(() => // tweak this later
{
m = new PBRMaterial // recreate on ui thread
@ -596,17 +591,6 @@ namespace FModel.ViewModels
cam.LookDirection = new Vector3D(-cam.Position.X + center.X, 0, -cam.Position.Z + center.Y);
}
private string FixName(string input)
{
if (input.Length < 1)
return "Material_Has_No_Name";
if (int.TryParse(input[0].ToString(), out _))
input = input[1..];
return input;
}
private bool CheckIfSaved(string path)
{
if (File.Exists(path))

3
FModel/ViewModels/SettingsViewModel.cs
View File

@ -250,6 +250,9 @@ namespace FModel.ViewModels
if (_assetLanguageSnapshot != SelectedAssetLanguage)
ret = SettingsOut.ReloadLocres;
if (_updateModeSnapshot != SelectedUpdateMode)
ret = SettingsOut.CheckForUpdates;
UserSettings.Default.UpdateMode = SelectedUpdateMode;
UserSettings.Default.Presets[_game] = SelectedPreset;
UserSettings.Default.OverridedGame[_game] = SelectedUeGame;

11
FModel/Views/SettingsView.xaml.cs
View File

@ -43,10 +43,15 @@ namespace FModel.Views
Close();
if (whatShouldIDo == SettingsOut.ReloadLocres)
switch (whatShouldIDo)
{
_applicationView.CUE4Parse.LocalizedResourcesCount = 0;
await _applicationView.CUE4Parse.LoadLocalizedResources();
case SettingsOut.ReloadLocres:
_applicationView.CUE4Parse.LocalizedResourcesCount = 0;
await _applicationView.CUE4Parse.LoadLocalizedResources();
break;
case SettingsOut.CheckForUpdates:
ApplicationService.ApiEndpointView.FModelApi.CheckForUpdates(UserSettings.Default.UpdateMode);
break;
}
}